@codingame/monaco-vscode-api 20.4.1 → 21.0.0

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.d.ts

@@ -22,6 +22,7 @@ export declare class InlineEditsLineReplacementView extends Disposable implement
     private readonly _viewZoneInfo;
     private readonly _div;
     readonly isHovered: IObservable<boolean>;
+    readonly minEditorScrollHeight: import("../../../../../../../base/common/observable.js").IObservableWithChange<number, void>;
     constructor(_editor: ObservableCodeEditor, _edit: IObservable<{
         originalRange: LineRange;
         modifiedRange: LineRange;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.js

@@ -47,7 +47,7 @@ let InlineEditsLineReplacementView = class InlineEditsLineReplacementView extend
         this._maxPrefixTrim = ( this._edit.map(
             e => e ? getPrefixTrim(e.replacements.flatMap(r => [r.originalRange, r.modifiedRange]), e.originalRange, e.modifiedLines, this._editor.editor) : undefined
         ));
-        this._modifiedLineElements = derived(reader => {
+        this._modifiedLineElements = derived(this, reader => {
             const lines = [];
             let requiredWidth = 0;
             const prefixTrim = this._maxPrefixTrim.read(reader);
@@ -151,10 +151,17 @@ let InlineEditsLineReplacementView = class InlineEditsLineReplacementView extend
             const viewZoneLineNumber = edit.originalRange.endLineNumberExclusive;
             return { height: viewZoneHeight, lineNumber: viewZoneLineNumber };
         });
+        this.minEditorScrollHeight = derived(this, reader => {
+            const layout = mapOutFalsy(this._layout).read(reader);
+            if (!layout || this._viewZoneInfo.read(reader) !== undefined) {
+                return 0;
+            }
+            return layout.read(reader).lowerText.bottom + this._editor.editor.getScrollTop();
+        });
         this._div = n.div({
             class: 'line-replacement',
         }, [
-            derived(reader => {
+            derived(this, reader => {
                 const layout = mapOutFalsy(this._layout).read(reader);
                 const modifiedLineElements = this._modifiedLineElements.read(reader);
                 if (!layout || !modifiedLineElements) {
@@ -264,7 +271,7 @@ let InlineEditsLineReplacementView = class InlineEditsLineReplacementView extend
         }));
         this._register(this._editor.createOverlayWidget({
             domNode: this._div.element,
-            minContentWidthInPx: derived(reader => {
+            minContentWidthInPx: derived(this, reader => {
                 return this._layout.read(reader)?.minContentWidthRequired ?? 0;
             }),
             position: constObservable({ preference: { top: 0, left: 0 } }),

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.js

@@ -126,7 +126,7 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
         }, this._editor));
         this._previewEditorObs = observableCodeEditor(this.previewEditor);
         this._activeViewZones = [];
-        this._updatePreviewEditor = derived(reader => {
+        this._updatePreviewEditor = derived(this, reader => {
             this._editorContainer.readEffect(reader);
             this._previewEditorObs.model.read(reader);
             this._display.read(reader);
@@ -280,7 +280,7 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
         });
         this._stickyScrollController = StickyScrollController.get(this._editorObs.editor);
         this._stickyScrollHeight = this._stickyScrollController ? observableFromEvent(this._stickyScrollController.onDidChangeStickyScrollHeight, () => this._stickyScrollController.stickyScrollWidgetHeight) : constObservable(0);
-        this._shouldOverflow = derived(reader => {
+        this._shouldOverflow = derived(this, reader => {
             {
                 return false;
             }
@@ -294,7 +294,7 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
         }, [
             n.svgElem('path', {
                 class: 'rightOfModifiedBackgroundCoverUp',
-                d: derived(reader => {
+                d: derived(this, reader => {
                     const layoutInfo = this._previewEditorLayoutInfo.read(reader);
                     if (!layoutInfo) {
                         return undefined;
@@ -317,7 +317,7 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
         ]).keepUpdated(this._store);
         this._originalOverlay = n.div({
             style: { pointerEvents: 'none', display: ( this._previewEditorLayoutInfo.map(layoutInfo => layoutInfo?.isInsertion ? 'none' : 'block')) },
-        }, derived(reader => {
+        }, derived(this, reader => {
             const layoutInfoObs = mapOutFalsy(this._previewEditorLayoutInfo).read(reader);
             if (!layoutInfoObs) {
                 return undefined;
@@ -401,7 +401,7 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
         })).keepUpdated(this._store);
         this._modifiedOverlay = n.div({
             style: { pointerEvents: 'none', }
-        }, derived(reader => {
+        }, derived(this, reader => {
             const layoutInfoObs = mapOutFalsy(this._previewEditorLayoutInfo).read(reader);
             if (!layoutInfoObs) {
                 return undefined;
@@ -417,7 +417,7 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
             const separatorRect = ( overlayRect.map(
                 overlayRect => overlayRect.withMargin(separatorWidth, separatorWidth, separatorWidth, 0)
             ));
-            const insertionRect = derived(reader => {
+            const insertionRect = derived(this, reader => {
                 const overlay = overlayRect.read(reader);
                 const layoutinfo = layoutInfoObs.read(reader);
                 if (!layoutinfo.isInsertion || layoutinfo.contentLeft >= overlay.left) {
@@ -478,7 +478,7 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
             domNode: this._nonOverflowView.element,
             position: constObservable(null),
             allowEditorOverflow: false,
-            minContentWidthInPx: derived(reader => {
+            minContentWidthInPx: derived(this, reader => {
                 const x = this._previewEditorLayoutInfo.read(reader)?.maxContentWidth;
                 if (x === undefined) {
                     return 0;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.d.ts

@@ -19,6 +19,7 @@ export declare class InlineEditsWordReplacementView extends Disposable implement
     private readonly _line;
     private readonly _hoverableElement;
     readonly isHovered: IObservable<boolean>;
+    readonly minEditorScrollHeight: import("../../../../../../../base/common/observable.js").IObservableWithChange<number, void>;
     constructor(_editor: ObservableCodeEditor, 
     /** Must be single-line in both sides */
     _edit: TextReplacement, _tabAction: IObservable<InlineEditTabAction>, _languageService: ILanguageService);

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.js

@@ -30,6 +30,7 @@ import { constObservable } from '../../../../../../../base/common/observableInte
 import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 
+const BORDER_WIDTH = 1;
 let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extends Disposable {
     static { this.MAX_LENGTH = 100; }
     constructor(_editor,
@@ -46,7 +47,7 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
         this._line = createElement('div');
         this._hoverableElement = observableValue(this, null);
         this.isHovered = ( this._hoverableElement.map((e, reader) => e?.didMouseMoveDuringHover.read(reader) ?? false));
-        this._renderTextEffect = derived(_reader => {
+        this._renderTextEffect = derived(this, _reader => {
             const tm = this._editor.model.get();
             const origLine = tm.getLineContent(this._edit.range.startLineNumber);
             const edit = StringReplacement.replace(( new OffsetRange(this._edit.range.startColumn - 1, this._edit.range.endColumn - 1)), this._edit.text);
@@ -86,15 +87,21 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
                 lineHeight,
             };
         });
+        this.minEditorScrollHeight = derived(this, reader => {
+            const layout = mapOutFalsy(this._layout).read(reader);
+            if (!layout) {
+                return 0;
+            }
+            return layout.read(reader).modifiedLine.bottom + BORDER_WIDTH + this._editor.editor.getScrollTop();
+        });
         this._root = n.div({
             class: 'word-replacement',
         }, [
-            derived(reader => {
+            derived(this, reader => {
                 const layout = mapOutFalsy(this._layout).read(reader);
                 if (!layout) {
                     return [];
                 }
-                const borderWidth = 1;
                 const originalBorderColor = ( getOriginalBorderColor(this._tabAction).map(c => asCssVariable(c))).read(reader);
                 const modifiedBorderColor = ( getModifiedBorderColor(this._tabAction).map(c => asCssVariable(c))).read(reader);
                 return [
@@ -109,7 +116,7 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
                         n.div({
                             style: {
                                 position: 'absolute',
-                                ...rectToProps(reader => layout.read(reader).lowerBackground.withMargin(borderWidth, 2 * borderWidth, borderWidth, 0)),
+                                ...rectToProps(reader => layout.read(reader).lowerBackground.withMargin(BORDER_WIDTH, 2 * BORDER_WIDTH, BORDER_WIDTH, 0)),
                                 background: asCssVariable(editorBackground),
                                 cursor: 'pointer',
                                 pointerEvents: 'auto',
@@ -125,14 +132,14 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
                         n.div({
                             style: {
                                 position: 'absolute',
-                                ...rectToProps(reader => layout.read(reader).modifiedLine.withMargin(1, 2)),
+                                ...rectToProps(reader => layout.read(reader).modifiedLine.withMargin(BORDER_WIDTH, 2 * BORDER_WIDTH)),
                                 fontFamily: this._editor.getOption(EditorOption.fontFamily),
                                 fontSize: this._editor.getOption(EditorOption.fontSize),
                                 fontWeight: this._editor.getOption(EditorOption.fontWeight),
                                 pointerEvents: 'none',
                                 boxSizing: 'border-box',
                                 borderRadius: '4px',
-                                border: `${borderWidth}px solid ${modifiedBorderColor}`,
+                                border: `${BORDER_WIDTH}px solid ${modifiedBorderColor}`,
                                 background: asCssVariable(modifiedChangedTextOverlayColor),
                                 display: 'flex',
                                 justifyContent: 'center',
@@ -143,10 +150,10 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
                         n.div({
                             style: {
                                 position: 'absolute',
-                                ...rectToProps(reader => layout.read(reader).originalLine.withMargin(1)),
+                                ...rectToProps(reader => layout.read(reader).originalLine.withMargin(BORDER_WIDTH)),
                                 boxSizing: 'border-box',
                                 borderRadius: '4px',
-                                border: `${borderWidth}px solid ${originalBorderColor}`,
+                                border: `${BORDER_WIDTH}px solid ${originalBorderColor}`,
                                 background: asCssVariable(originalChangedTextOverlayColor),
                                 pointerEvents: 'none',
                             }

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.js

@@ -16,14 +16,14 @@ import '../../../../../../platform/theme/common/colors/searchColors.js';
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
 import { observableFromEventOpts } from '../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
-const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1303, 'Background color for the original text in inline edits.')), true);
-const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1304, 'Background color for the modified text in inline edits.')), true);
+const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1305, 'Background color for the original text in inline edits.')), true);
+const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1306, 'Background color for the modified text in inline edits.')), true);
 registerColor('inlineEdit.originalChangedLineBackground', ( transparent(diffRemoved, 0.8)), ( localize(
-    1305,
+    1307,
     'Background color for the changed lines in the original text of inline edits.'
 )), true);
 const originalChangedTextOverlayColor = registerColor('inlineEdit.originalChangedTextBackground', ( transparent(diffRemoved, 0.8)), ( localize(
-    1306,
+    1308,
     'Overlay color for the changed text in the original text of inline edits.'
 )), true);
 const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedChangedLineBackground', {
@@ -32,52 +32,52 @@ const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedCha
     hcDark: diffInsertedLine,
     hcLight: diffInsertedLine
 }, ( localize(
-    1307,
+    1309,
     'Background color for the changed lines in the modified text of inline edits.'
 )), true);
 const modifiedChangedTextOverlayColor = registerColor('inlineEdit.modifiedChangedTextBackground', ( transparent(diffInserted, 0.7)), ( localize(
-    1308,
+    1310,
     'Overlay color for the changed text in the modified text of inline edits.'
 )), true);
-const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1309, 'Foreground color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1310, 'Border color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1311, 'Foreground color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1312, 'Border color for the primary inline edit gutter indicator.')));
 const inlineEditIndicatorPrimaryBackground = registerColor('inlineEdit.gutterIndicator.primaryBackground', {
     light: ( transparent(inlineEditIndicatorPrimaryBorder, 0.5)),
     dark: ( transparent(inlineEditIndicatorPrimaryBorder, 0.4)),
     hcDark: ( transparent(inlineEditIndicatorPrimaryBorder, 0.4)),
     hcLight: ( transparent(inlineEditIndicatorPrimaryBorder, 0.5)),
-}, ( localize(1311, 'Background color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1312, 'Foreground color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1313, 'Border color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1314, 'Background color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1315, 'Foreground color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1316, 'Border color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1317, 'Background color for the successful inline edit gutter indicator.')));
+}, ( localize(1313, 'Background color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1314, 'Foreground color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1315, 'Border color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1316, 'Background color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1317, 'Foreground color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1318, 'Border color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1319, 'Background color for the successful inline edit gutter indicator.')));
 const inlineEditIndicatorBackground = registerColor('inlineEdit.gutterIndicator.background', {
     hcDark: ( transparent('tab.inactiveBackground', 0.5)),
     hcLight: ( transparent('tab.inactiveBackground', 0.5)),
     dark: ( transparent('tab.inactiveBackground', 0.5)),
     light: '#5f5f5f18',
-}, ( localize(1318, 'Background color for the inline edit gutter indicator.')));
+}, ( localize(1320, 'Background color for the inline edit gutter indicator.')));
 const originalBorder = registerColor('inlineEdit.originalBorder', {
     light: diffRemoved,
     dark: diffRemoved,
     hcDark: diffRemoved,
     hcLight: diffRemoved
-}, ( localize(1319, 'Border color for the original text in inline edits.')));
+}, ( localize(1321, 'Border color for the original text in inline edits.')));
 const modifiedBorder = registerColor('inlineEdit.modifiedBorder', {
     light: ( darken(diffInserted, 0.6)),
     dark: diffInserted,
     hcDark: diffInserted,
     hcLight: diffInserted
-}, ( localize(1320, 'Border color for the modified text in inline edits.')));
+}, ( localize(1322, 'Border color for the modified text in inline edits.')));
 const tabWillAcceptModifiedBorder = registerColor('inlineEdit.tabWillAcceptModifiedBorder', {
     light: ( darken(modifiedBorder, 0)),
     dark: ( darken(modifiedBorder, 0)),
     hcDark: ( darken(modifiedBorder, 0)),
     hcLight: ( darken(modifiedBorder, 0))
 }, ( localize(
-    1321,
+    1323,
     'Modified border color for the inline edits widget when tab will accept it.'
 )));
 const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOriginalBorder', {
@@ -86,7 +86,7 @@ const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOrigi
     hcDark: ( darken(originalBorder, 0)),
     hcLight: ( darken(originalBorder, 0))
 }, ( localize(
-    1322,
+    1324,
     'Original border color for the inline edits widget over the original text when tab will accept it.'
 )));
 function getModifiedBorderColor(tabAction) {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.d.ts

@@ -33,7 +33,7 @@ export declare class UniqueUriGenerator {
 }
 export declare function applyEditToModifiedRangeMappings(rangeMapping: RangeMapping[], edit: TextEdit): RangeMapping[];
 export declare function classNames(...classes: (string | false | undefined | null)[]): string;
-export declare function createReindentEdit(text: string, range: LineRange): TextEdit;
+export declare function createReindentEdit(text: string, range: LineRange, tabSize: number): TextEdit;
 export declare class PathBuilder {
     private _data;
     moveTo(point: Point): this;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.js

@@ -6,8 +6,8 @@ import { findFirstMin } from '../../../../../../../base/common/arraysFind.js';
 import '../../../../../../../base/common/lifecycle.js';
 import '../../../../../../../base/common/observableInternal/index.js';
 import '../../../../../../../base/common/platform.js';
-import { splitLines, getIndentationLength } from '../../../../../../../base/common/strings.js';
-import '../../../../../../../base/common/charCode.js';
+import { splitLines } from '../../../../../../../base/common/strings.js';
+import { CharCode } from '../../../../../../../base/common/charCode.js';
 import '../../../../../../../base/common/marshallingIds.js';
 import '../../../../../../../base/common/path.js';
 import '../../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -19,8 +19,9 @@ import { Range } from '../../../../../../common/core/range.js';
 import { TextReplacement, TextEdit } from '../../../../../../common/core/edits/textEdit.js';
 import { RangeMapping } from '../../../../../../common/diff/rangeMapping.js';
 import { indentOfLine } from '../../../../../../common/model/textModel.js';
-import { derived, derivedOpts } from '../../../../../../../base/common/observableInternal/observables/derived.js';
+import { BugIndicatingError } from '../../../../../../../base/common/errors.js';
 import { derivedObservableWithCache } from '../../../../../../../base/common/observableInternal/utils/utils.js';
+import { derived, derivedOpts } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 
 function maxContentWidthInRange(editor, range, reader) {
     editor.layoutInfo.read(reader);
@@ -89,7 +90,7 @@ function getContentRenderWidth(content, editor, textModel) {
 }
 function getEditorValidOverlayRect(editor) {
     const contentLeft = editor.layoutInfoContentLeft;
-    const width = derived(r => {
+    const width = derived({ name: 'editor.validOverlay.width' }, r => {
         const hasMinimapOnTheRight = editor.layoutInfoMinimap.read(r).minimapLeft !== 0;
         const editorWidth = editor.layoutInfoWidth.read(r) - contentLeft.read(r);
         if (hasMinimapOnTheRight) {
@@ -98,8 +99,8 @@ function getEditorValidOverlayRect(editor) {
         }
         return editorWidth;
     });
-    const height = derived(r => editor.layoutInfoHeight.read(r) + editor.contentHeight.read(r));
-    return derived(r => Rect.fromLeftTopWidthHeight(contentLeft.read(r), 0, width.read(r), height.read(r)));
+    const height = derived({ name: 'editor.validOverlay.height' }, r => editor.layoutInfoHeight.read(r) + editor.contentHeight.read(r));
+    return derived({ name: 'editor.validOverlay' }, r => Rect.fromLeftTopWidthHeight(contentLeft.read(r), 0, width.read(r), height.read(r)));
 }
 function applyEditToModifiedRangeMappings(rangeMapping, edit) {
     const updatedMappings = [];
@@ -120,12 +121,47 @@ function offsetRangeToRange(columnOffsetRange, startPos) {
         startPos.column + columnOffsetRange.endExclusive
     ));
 }
-function createReindentEdit(text, range) {
+function getIndentationSize(line, tabSize) {
+    let currentSize = 0;
+    loop: for (let i = 0, len = line.length; i < len; i++) {
+        switch (line.charCodeAt(i)) {
+            case CharCode.Tab:
+                currentSize += tabSize;
+                break;
+            case CharCode.Space:
+                currentSize++;
+                break;
+            default: break loop;
+        }
+    }
+    return currentSize - (currentSize % tabSize);
+}
+function indentSizeToIndentLength(line, indentSize, tabSize) {
+    let remainingSize = indentSize - (indentSize % tabSize);
+    let i = 0;
+    for (; i < line.length; i++) {
+        if (remainingSize === 0) {
+            break;
+        }
+        switch (line.charCodeAt(i)) {
+            case CharCode.Tab:
+                remainingSize -= tabSize;
+                break;
+            case CharCode.Space:
+                remainingSize--;
+                break;
+            default: throw ( new BugIndicatingError('Unexpected character found while calculating indent length'));
+        }
+    }
+    return i;
+}
+function createReindentEdit(text, range, tabSize) {
     const newLines = splitLines(text);
     const edits = [];
-    const minIndent = findFirstMin(range.mapToLineArray(l => getIndentationLength(newLines[l - 1])), numberComparator);
+    const minIndentSize = findFirstMin(range.mapToLineArray(l => getIndentationSize(newLines[l - 1], tabSize)), numberComparator);
     range.forEach(lineNumber => {
-        edits.push(( new TextReplacement(offsetRangeToRange(( new OffsetRange(0, minIndent)), ( new Position(lineNumber, 1))), '')));
+        const indentLength = indentSizeToIndentLength(newLines[lineNumber - 1], minIndentSize, tabSize);
+        edits.push(( new TextReplacement(offsetRangeToRange(( new OffsetRange(0, indentLength)), ( new Position(lineNumber, 1))), '')));
     });
     return ( new TextEdit(edits));
 }
@@ -168,10 +204,10 @@ function mapOutFalsy(obs) {
 }
 function rectToProps(fn) {
     return {
-        left: derived(reader =>  fn(reader).left),
-        top: derived(reader =>  fn(reader).top),
-        width: derived(reader =>  fn(reader).right - fn(reader).left),
-        height: derived(reader =>  fn(reader).bottom - fn(reader).top),
+        left: derived({ name: 'editor.validOverlay.left' }, reader =>  fn(reader).left),
+        top: derived({ name: 'editor.validOverlay.top' }, reader =>  fn(reader).top),
+        width: derived({ name: 'editor.validOverlay.width' }, reader =>  fn(reader).right - fn(reader).left),
+        height: derived({ name: 'editor.validOverlay.height' }, reader =>  fn(reader).bottom - fn(reader).top),
     };
 }
 

package/vscode/src/vs/editor/contrib/insertFinalNewLine/browser/insertFinalNewLine.js

@@ -9,7 +9,7 @@ class InsertFinalNewLineAction extends EditorAction {
     constructor() {
         super({
             id: InsertFinalNewLineAction.ID,
-            label: ( localize2(1323, "Insert Final New Line")),
+            label: ( localize2(1325, "Insert Final New Line")),
             precondition: EditorContextKeys.writable
         });
     }

package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js

@@ -11,7 +11,7 @@ class ExpandLineSelectionAction extends EditorAction {
     constructor() {
         super({
             id: 'expandLineSelection',
-            label: ( localize2(1324, "Expand Line Selection")),
+            label: ( localize2(1326, "Expand Line Selection")),
             precondition: undefined,
             kbOpts: {
                 weight: KeybindingWeight.EditorCore,