@codingame/monaco-vscode-api 16.1.1 → 17.1.0

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

@@ -0,0 +1,215 @@
+
+import { __decorate, __param } from '../../../../../../../../../../external/tslib/tslib.es6.js';
+import { getWindow } from '../../../../../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
+import { Emitter } from '../../../../../../../base/common/event.js';
+import { Disposable } from '../../../../../../../base/common/lifecycle.js';
+import '../../../../../../../base/common/observableInternal/index.js';
+import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
+import '../../../../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../../../../platform/theme/common/colors/chartsColors.js';
+import { editorBackground } from '../../../../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../../../../platform/theme/common/colors/listColors.js';
+import '../../../../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../../../../platform/theme/common/colors/searchColors.js';
+import { IThemeService } from '../../../../../../../platform/theme/common/themeService.service.js';
+import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
+import { Rect } from '../../../../../../browser/rect.js';
+import { renderLines, LineSource, RenderOptions } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
+import { EditorOption } from '../../../../../../common/config/editorOptions.js';
+import { LineRange } from '../../../../../../common/core/lineRange.js';
+import { ILanguageService } from '../../../../../../common/languages/language.service.js';
+import { LineTokens } from '../../../../../../common/tokens/lineTokens.js';
+import { TokenArray } from '../../../../../../common/tokens/tokenArray.js';
+import { InlineEditTabAction } from '../inlineEditsViewInterface.js';
+import { inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBackground, getEditorBlendedColor } from '../theme.js';
+import { maxContentWidthInRange, rectToProps } from '../utils/utils.js';
+import { observableValue } from '../../../../../../../base/common/observableInternal/base.js';
+import { n } from '../../../../../../../base/browser/domImpl/n.js';
+import { constObservable } from '../../../../../../../base/common/observableInternal/utils.js';
+import { autorun } from '../../../../../../../base/common/observableInternal/autorun.js';
+import { derived } from '../../../../../../../base/common/observableInternal/derived.js';
+
+let InlineEditsCustomView = class InlineEditsCustomView extends Disposable {
+    constructor(_editor, displayLocation, tabAction, themeService, _languageService) {
+        super();
+        this._editor = _editor;
+        this._languageService = _languageService;
+        this._onDidClick = this._register(( new Emitter()));
+        this.onDidClick = this._onDidClick.event;
+        this._isHovered = observableValue(this, false);
+        this.isHovered = this._isHovered;
+        this._viewRef = n.ref();
+        this._editorObs = observableCodeEditor(this._editor);
+        const styles = ( tabAction.map((v, reader) => {
+            let border;
+            switch (v) {
+                case InlineEditTabAction.Inactive:
+                    border = inlineEditIndicatorSecondaryBackground;
+                    break;
+                case InlineEditTabAction.Jump:
+                    border = inlineEditIndicatorPrimaryBackground;
+                    break;
+                case InlineEditTabAction.Accept:
+                    border = inlineEditIndicatorsuccessfulBackground;
+                    break;
+            }
+            return {
+                border: ( getEditorBlendedColor(border, themeService).read(reader).toString()),
+                background: asCssVariable(editorBackground)
+            };
+        }));
+        const state = ( displayLocation.map(dl => dl ? this.getState(dl) : undefined));
+        const view = ( state.map(s => s ? this.getRendering(s, styles) : undefined));
+        const overlay = n.div({
+            class: 'inline-edits-custom-view',
+            style: {
+                position: 'absolute',
+                overflow: 'visible',
+                top: '0px',
+                left: '0px',
+                display: 'block',
+            },
+        }, [view]).keepUpdated(this._store);
+        this._register(this._editorObs.createOverlayWidget({
+            domNode: overlay.element,
+            position: constObservable(null),
+            allowEditorOverflow: false,
+            minContentWidthInPx: constObservable(0),
+        }));
+        this._register(autorun((reader) => {
+            const v = view.read(reader);
+            if (!v) {
+                this._isHovered.set(false, undefined);
+                return;
+            }
+            this._isHovered.set(overlay.isHovered.read(reader), undefined);
+        }));
+    }
+    getState(displayLocation) {
+        const contentState = derived((reader) => {
+            const startLineNumber = displayLocation.range.startLineNumber;
+            const endLineNumber = displayLocation.range.endLineNumber;
+            const startColumn = displayLocation.range.startColumn;
+            const endColumn = displayLocation.range.endColumn;
+            const lineCount = this._editor.getModel()?.getLineCount() ?? 0;
+            const lineWidth = maxContentWidthInRange(this._editorObs, ( new LineRange(startLineNumber, startLineNumber + 1)), reader);
+            const lineWidthBelow = startLineNumber + 1 <= lineCount ? maxContentWidthInRange(this._editorObs, ( new LineRange(startLineNumber + 1, startLineNumber + 2)), reader) : undefined;
+            const lineWidthAbove = startLineNumber - 1 >= 1 ? maxContentWidthInRange(this._editorObs, ( new LineRange(startLineNumber - 1, startLineNumber)), reader) : undefined;
+            const startContentLeftOffset = this._editor.getOffsetForColumn(startLineNumber, startColumn);
+            const endContentLeftOffset = this._editor.getOffsetForColumn(endLineNumber, endColumn);
+            return {
+                lineWidth,
+                lineWidthBelow,
+                lineWidthAbove,
+                startContentLeftOffset,
+                endContentLeftOffset
+            };
+        });
+        const minEndOfLinePadding = 14;
+        const paddingVertically = 0;
+        const paddingHorizontally = 4;
+        const horizontalOffsetWhenAboveBelow = 4;
+        const verticalOffsetWhenAboveBelow = 2;
+        const rect = derived((reader) => {
+            const w = this._editorObs.getOption(EditorOption.fontInfo).read(reader).typicalHalfwidthCharacterWidth;
+            const startLineNumber = displayLocation.range.startLineNumber;
+            const endLineNumber = displayLocation.range.endLineNumber;
+            const { lineWidth, lineWidthBelow, lineWidthAbove, startContentLeftOffset, endContentLeftOffset } = contentState.read(reader);
+            const contentLeft = this._editorObs.layoutInfoContentLeft.read(reader);
+            const lineHeight = this._editorObs.getOption(EditorOption.lineHeight).read(reader);
+            const scrollTop = this._editorObs.scrollTop.read(reader);
+            const scrollLeft = this._editorObs.scrollLeft.read(reader);
+            let position;
+            if (startLineNumber === endLineNumber && endContentLeftOffset + 5 * w >= lineWidth) {
+                position = 'end';
+            }
+            else if (lineWidthBelow !== undefined && lineWidthBelow + minEndOfLinePadding - horizontalOffsetWhenAboveBelow - paddingHorizontally < startContentLeftOffset) {
+                position = 'below';
+            }
+            else if (lineWidthAbove !== undefined && lineWidthAbove + minEndOfLinePadding - horizontalOffsetWhenAboveBelow - paddingHorizontally < startContentLeftOffset) {
+                position = 'above';
+            }
+            else {
+                position = 'end';
+            }
+            let topOfLine;
+            let contentStartOffset;
+            let deltaX = 0;
+            let deltaY = 0;
+            switch (position) {
+                case 'end': {
+                    topOfLine = this._editorObs.editor.getTopForLineNumber(startLineNumber);
+                    contentStartOffset = lineWidth;
+                    deltaX = paddingHorizontally + minEndOfLinePadding;
+                    break;
+                }
+                case 'below': {
+                    topOfLine = this._editorObs.editor.getTopForLineNumber(startLineNumber + 1);
+                    contentStartOffset = startContentLeftOffset;
+                    deltaX = paddingHorizontally + horizontalOffsetWhenAboveBelow;
+                    deltaY = paddingVertically + verticalOffsetWhenAboveBelow;
+                    break;
+                }
+                case 'above': {
+                    topOfLine = this._editorObs.editor.getTopForLineNumber(startLineNumber - 1);
+                    contentStartOffset = startContentLeftOffset;
+                    deltaX = paddingHorizontally + horizontalOffsetWhenAboveBelow;
+                    deltaY = -0 + verticalOffsetWhenAboveBelow;
+                    break;
+                }
+            }
+            const textRect = Rect.fromLeftTopWidthHeight(contentLeft + contentStartOffset - scrollLeft, topOfLine - scrollTop, w * displayLocation.label.length, lineHeight);
+            return textRect.withMargin(paddingVertically, paddingHorizontally).translateX(deltaX).translateY(deltaY);
+        });
+        return {
+            rect,
+            label: displayLocation.label
+        };
+    }
+    getRendering(state, styles) {
+        const line = document.createElement('div');
+        const t = this._editor.getModel().tokenization.tokenizeLinesAt(1, [state.label])?.[0];
+        let tokens;
+        if (t) {
+            tokens = TokenArray.fromLineTokens(t).toLineTokens(state.label, this._languageService.languageIdCodec);
+        }
+        else {
+            tokens = LineTokens.createEmpty(state.label, this._languageService.languageIdCodec);
+        }
+        const result = renderLines(( new LineSource([tokens])), RenderOptions.fromEditor(this._editor).withSetWidth(false).withScrollBeyondLastColumn(0), [], line, true);
+        line.style.width = `${result.minWidthInPx}px`;
+        const rect = ( state.rect.map(r => r.withMargin(0, 4)));
+        return n.div({
+            class: 'collapsedView',
+            ref: this._viewRef,
+            style: {
+                position: 'absolute',
+                ...rectToProps(reader => rect.read(reader)),
+                overflow: 'hidden',
+                boxSizing: 'border-box',
+                cursor: 'pointer',
+                border: ( styles.map(s => `1px solid ${s.border}`)),
+                borderRadius: '4px',
+                backgroundColor: ( styles.map(s => s.background)),
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                whiteSpace: 'nowrap',
+            },
+            onclick: (e) => { this._onDidClick.fire(( new StandardMouseEvent(getWindow(e), e))); }
+        }, [
+            line
+        ]);
+    }
+};
+InlineEditsCustomView = ( __decorate([
+    ( __param(3, IThemeService)),
+    ( __param(4, ILanguageService))
+], InlineEditsCustomView));
+
+export { InlineEditsCustomView };

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

@@ -136,7 +136,6 @@ class InlineEditsDeletionView extends Disposable {
                 overflow: 'visible',
                 top: '0px',
                 left: '0px',
-                zIndex: '0',
                 display: this._display,
             },
         }, [

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

@@ -225,7 +225,6 @@ let InlineEditsInsertionView = class InlineEditsInsertionView extends Disposable
                 overflow: 'visible',
                 top: '0px',
                 left: '0px',
-                zIndex: '0',
                 display: this._display,
             },
         }, [

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

@@ -203,7 +203,7 @@ let InlineEditsLineReplacementView = class InlineEditsLineReplacementView extend
                             style: {
                                 position: 'absolute',
                                 ...rectToProps(reader => layout.read(reader).lowerBackground.translateX(-contentLeft)),
-                                borderRadius: '4px',
+                                borderRadius: '0 0 4px 4px',
                                 background: asCssVariable(editorBackground),
                                 boxShadow: `${asCssVariable(scrollbarShadow)} 0 6px 6px -6px`,
                                 border: `1px solid ${asCssVariable(modifiedBorderColor)}`,
@@ -235,7 +235,7 @@ let InlineEditsLineReplacementView = class InlineEditsLineReplacementView extend
                                 fontWeight: this._editor.getOption(EditorOption.fontWeight),
                                 pointerEvents: 'none',
                                 whiteSpace: 'nowrap',
-                                borderRadius: '4px',
+                                borderRadius: '0 0 4px 4px',
                                 overflow: 'hidden',
                             }
                         }, [...modifiedLineElements.lines]),

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

@@ -5,7 +5,6 @@ import { IInstantiationService } from "../../../../../../../platform/instantiati
 import { IThemeService } from "../../../../../../../platform/theme/common/themeService.service.js";
 import { ICodeEditor } from "../../../../../../browser/editorBrowser.js";
 import { EmbeddedCodeEditorWidget } from "../../../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js";
-import { LineRange } from "../../../../../../common/core/lineRange.js";
 import { ITextModel } from "../../../../../../common/model.js";
 import { IInlineEditsView, InlineEditTabAction } from "../inlineEditsViewInterface.js";
 import { InlineEditWithChanges } from "../inlineEditWithChanges.js";
@@ -17,13 +16,12 @@ export declare class InlineEditsSideBySideView extends Disposable implements IIn
     private readonly _tabAction;
     private readonly _instantiationService;
     private readonly _themeService;
-    static fitsInsideViewport(editor: ICodeEditor, textModel: ITextModel, edit: InlineEditWithChanges, originalDisplayRange: LineRange, reader: IReader): boolean;
+    static fitsInsideViewport(editor: ICodeEditor, textModel: ITextModel, edit: InlineEditWithChanges, reader: IReader): boolean;
     private readonly _editorObs;
     private readonly _onDidClick;
     readonly onDidClick: import("../../../../../../../base/common/event.js").Event<IMouseEvent>;
     constructor(_editor: ICodeEditor, _edit: IObservable<InlineEditWithChanges | undefined>, _previewTextModel: ITextModel, _uiState: IObservable<{
         newTextLineCount: number;
-        originalDisplayRange: LineRange;
     } | undefined>, _tabAction: IObservable<InlineEditTabAction>, _instantiationService: IInstantiationService, _themeService: IThemeService);
     private readonly _display;
     private readonly previewRef;

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

@@ -43,13 +43,13 @@ const BORDER_RADIUS = 4;
 const ORIGINAL_END_PADDING = 20;
 const MODIFIED_END_PADDING = 12;
 let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposable {
-    static fitsInsideViewport(editor, textModel, edit, originalDisplayRange, reader) {
+    static fitsInsideViewport(editor, textModel, edit, reader) {
         const editorObs = observableCodeEditor(editor);
         const editorWidth = editorObs.layoutInfoWidth.read(reader);
         const editorContentLeft = editorObs.layoutInfoContentLeft.read(reader);
         const editorVerticalScrollbar = editor.getLayoutInfo().verticalScrollbarWidth;
         const minimapWidth = editorObs.layoutInfoMinimap.read(reader).minimapLeft !== 0 ? editorObs.layoutInfoMinimap.read(reader).minimapWidth : 0;
-        const maxOriginalContent = maxContentWidthInRange(editorObs, originalDisplayRange, undefined );
+        const maxOriginalContent = maxContentWidthInRange(editorObs, edit.displayRange, undefined );
         const maxModifiedContent = edit.lineEdit.newLines.reduce((max, line) => Math.max(max, getContentRenderWidth(line, editor, textModel)), 0);
         const originalPadding = ORIGINAL_END_PADDING;
         const modifiedPadding = MODIFIED_END_PADDING + 2 * BORDER_WIDTH;
@@ -189,7 +189,7 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
         });
         this._originalVerticalStartPosition = ( this._editorObs.observePosition(this._originalStartPosition, this._store).map(p => p?.y));
         this._originalVerticalEndPosition = ( this._editorObs.observePosition(this._originalEndPosition, this._store).map(p => p?.y));
-        this._originalDisplayRange = ( this._uiState.map(s => s?.originalDisplayRange));
+        this._originalDisplayRange = ( this._edit.map(e => e?.displayRange));
         this._editorMaxContentWidthInRange = ( derived(this, reader => {
             const originalDisplayRange = this._originalDisplayRange.read(reader);
             if (!originalDisplayRange) {
@@ -461,7 +461,6 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
                 overflow: 'visible',
                 top: '0px',
                 left: '0px',
-                zIndex: '0',
                 display: this._display,
             },
         }, [

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

@@ -1,6 +1,6 @@
 
 import { BugIndicatingError } from '../../../../../../base/common/errors.js';
-import { observableFromEventOpts } from '../../../../../../base/common/observableInternal/utils.js';
+import '../../../../../../base/common/observableInternal/index.js';
 import { localize } from '../../../../../../nls.js';
 import { registerColor, transparent, darken } from '../../../../../../platform/theme/common/colorUtils.js';
 import '../../../../../../platform/theme/common/colors/baseColors.js';
@@ -14,15 +14,16 @@ import '../../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../platform/theme/common/colors/searchColors.js';
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
+import { observableFromEventOpts } from '../../../../../../base/common/observableInternal/utils.js';
 
-const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1281, 'Background color for the original text in inline edits.')), true);
-const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1282, 'Background color for the modified text in inline edits.')), true);
+const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1278, 'Background color for the original text in inline edits.')), true);
+const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1279, 'Background color for the modified text in inline edits.')), true);
 registerColor('inlineEdit.originalChangedLineBackground', ( transparent(diffRemoved, 0.8)), ( localize(
-    1283,
+    1280,
     'Background color for the changed lines in the original text of inline edits.'
 )), true);
 const originalChangedTextOverlayColor = registerColor('inlineEdit.originalChangedTextBackground', ( transparent(diffRemoved, 0.8)), ( localize(
-    1284,
+    1281,
     'Overlay color for the changed text in the original text of inline edits.'
 )), true);
 const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedChangedLineBackground', {
@@ -31,52 +32,52 @@ const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedCha
     hcDark: diffInsertedLine,
     hcLight: diffInsertedLine
 }, ( localize(
-    1285,
+    1282,
     'Background color for the changed lines in the modified text of inline edits.'
 )), true);
 const modifiedChangedTextOverlayColor = registerColor('inlineEdit.modifiedChangedTextBackground', ( transparent(diffInserted, 0.7)), ( localize(
-    1286,
+    1283,
     'Overlay color for the changed text in the modified text of inline edits.'
 )), true);
-const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1287, 'Foreground color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1288, 'Border color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1284, 'Foreground color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1285, '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(1289, 'Background color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1290, 'Foreground color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1291, 'Border color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1292, 'Background color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1293, 'Foreground color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1294, 'Border color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1295, 'Background color for the successful inline edit gutter indicator.')));
+}, ( localize(1286, 'Background color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1287, 'Foreground color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1288, 'Border color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1289, 'Background color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1290, 'Foreground color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1291, 'Border color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1292, '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(1296, 'Background color for the inline edit gutter indicator.')));
+}, ( localize(1293, 'Background color for the inline edit gutter indicator.')));
 const originalBorder = registerColor('inlineEdit.originalBorder', {
     light: diffRemoved,
     dark: diffRemoved,
     hcDark: diffRemoved,
     hcLight: diffRemoved
-}, ( localize(1297, 'Border color for the original text in inline edits.')));
+}, ( localize(1294, '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(1298, 'Border color for the modified text in inline edits.')));
+}, ( localize(1295, '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(
-    1299,
+    1296,
     'Modified border color for the inline edits widget when tab will accept it.'
 )));
 const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOriginalBorder', {
@@ -85,7 +86,7 @@ const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOrigi
     hcDark: ( darken(originalBorder, 0)),
     hcLight: ( darken(originalBorder, 0))
 }, ( localize(
-    1300,
+    1297,
     '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/insertFinalNewLine/browser/insertFinalNewLine.js

@@ -9,7 +9,7 @@ class InsertFinalNewLineAction extends EditorAction {
     constructor() {
         super({
             id: InsertFinalNewLineAction.ID,
-            label: ( localize2(1301, "Insert Final New Line")),
+            label: ( localize2(1298, "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(1302, "Expand Line Selection")),
+            label: ( localize2(1299, "Expand Line Selection")),
             precondition: undefined,
             kbOpts: {
                 weight: KeybindingWeight.EditorCore,