@codingame/monaco-vscode-api 28.4.1 → 29.1.0

package/vscode/src/vs/editor/common/viewLayout/lineHeights.js

@@ -106,10 +106,11 @@ class LineHeightsManager {
         this._pendingChanges = [];
         this._hasPending = false;
         const stagedInserts = [];
+        const stagedIdMap = ( new ArrayMap());
         for (const change of changes) {
             switch (change.kind) {
             case PendingChangeKind.Remove:
-                this._doRemoveCustomLineHeight(change.decorationId, stagedInserts);
+                this._doRemoveCustomLineHeight(change.decorationId, stagedIdMap);
                 break;
             case PendingChangeKind.InsertOrChange:
                 this._doInsertOrChangeCustomLineHeight(
@@ -117,22 +118,23 @@ class LineHeightsManager {
                     change.startLineNumber,
                     change.endLineNumber,
                     change.lineHeight,
-                    stagedInserts
+                    stagedInserts,
+                    stagedIdMap
                 );
                 break;
             case PendingChangeKind.LinesDeleted:
-                this._flushStagedDecorationChanges(stagedInserts);
+                this._flushStagedDecorationChanges(stagedInserts, stagedIdMap);
                 this._doLinesDeleted(change.fromLineNumber, change.toLineNumber);
                 break;
             case PendingChangeKind.LinesInserted:
-                this._flushStagedDecorationChanges(stagedInserts);
-                this._doLinesInserted(change.fromLineNumber, change.toLineNumber, stagedInserts);
+                this._flushStagedDecorationChanges(stagedInserts, stagedIdMap);
+                this._doLinesInserted(change.fromLineNumber, change.toLineNumber, stagedInserts, stagedIdMap);
                 break;
             }
         }
-        this._flushStagedDecorationChanges(stagedInserts);
+        this._flushStagedDecorationChanges(stagedInserts, stagedIdMap);
     }
-    _doRemoveCustomLineHeight(decorationID, stagedInserts) {
+    _doRemoveCustomLineHeight(decorationID, stagedIdMap) {
         const customLines = this._decorationIDToCustomLine.get(decorationID);
         if (customLines) {
             this._decorationIDToCustomLine.delete(decorationID);
@@ -141,30 +143,47 @@ class LineHeightsManager {
                 this._invalidIndex = Math.min(this._invalidIndex, customLine.index);
             }
         }
-        for (let i = stagedInserts.length - 1; i >= 0; i--) {
-            if (stagedInserts[i].decorationId === decorationID) {
-                stagedInserts.splice(i, 1);
+        const stagedLines = stagedIdMap.get(decorationID);
+        if (stagedLines) {
+            stagedIdMap.delete(decorationID);
+            for (const line of stagedLines) {
+                line.deleted = true;
             }
         }
     }
-    _doInsertOrChangeCustomLineHeight(decorationId, startLineNumber, endLineNumber, lineHeight, stagedInserts) {
-        this._doRemoveCustomLineHeight(decorationId, stagedInserts);
+    _doInsertOrChangeCustomLineHeight(
+        decorationId,
+        startLineNumber,
+        endLineNumber,
+        lineHeight,
+        stagedInserts,
+        stagedIdMap
+    ) {
+        this._doRemoveCustomLineHeight(decorationId, stagedIdMap);
         for (let lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++) {
             const customLine = ( new CustomLine(decorationId, -1, lineNumber, lineHeight, 0));
             stagedInserts.push(customLine);
+            stagedIdMap.add(decorationId, customLine);
         }
     }
-    _flushStagedDecorationChanges(stagedInserts) {
+    _flushStagedDecorationChanges(stagedInserts, stagedIdMap) {
         if (stagedInserts.length === 0 && this._invalidIndex === Infinity) {
             return;
         }
         for (const pendingChange of stagedInserts) {
+            if (pendingChange.deleted) {
+                continue;
+            }
             const candidateInsertionIndex = this._binarySearchOverOrderedCustomLinesArray(pendingChange.lineNumber);
             const insertionIndex = candidateInsertionIndex >= 0 ? candidateInsertionIndex : -(candidateInsertionIndex + 1);
             this._orderedCustomLines.splice(insertionIndex, 0, pendingChange);
             this._invalidIndex = Math.min(this._invalidIndex, insertionIndex);
         }
         stagedInserts.length = 0;
+        stagedIdMap.clear();
+        if (this._invalidIndex === Infinity) {
+            return;
+        }
         const newDecorationIDToSpecialLine = ( new ArrayMap());
         const newOrderedSpecialLines = [];
         for (let i = 0; i < this._invalidIndex; i++) {
@@ -309,7 +328,7 @@ class LineHeightsManager {
             }
         }
     }
-    _doLinesInserted(fromLineNumber, toLineNumber, stagedInserts) {
+    _doLinesInserted(fromLineNumber, toLineNumber, stagedInserts, stagedIdMap) {
         const insertCount = toLineNumber - fromLineNumber + 1;
         const candidateStartIndexOfInsertion = this._binarySearchOverOrderedCustomLinesArray(fromLineNumber);
         let startIndexOfInsertion;
@@ -365,7 +384,8 @@ class LineHeightsManager {
                     dec.startLineNumber,
                     dec.endLineNumber,
                     dec.lineHeight,
-                    stagedInserts
+                    stagedInserts,
+                    stagedIdMap
                 );
             }
         }
@@ -421,6 +441,9 @@ class ArrayMap {
     delete(key) {
         this._map.delete(key);
     }
+    clear() {
+        this._map.clear();
+    }
 }
 
 export { CustomLine, CustomLineHeightData, LineHeightsManager };

package/vscode/src/vs/editor/common/viewLayout/viewLineRenderer.js

@@ -894,7 +894,7 @@ function _renderLine(input, sb) {
     }
     if (isOverflowing) {
         sb.appendString("<span class=\"mtkoverflow\">");
-        sb.appendString(( localize(930, "Show more ({0})", renderOverflowingCharCount(overflowingCharCount))));
+        sb.appendString(( localize(931, "Show more ({0})", renderOverflowingCharCount(overflowingCharCount))));
         sb.appendString("</span>");
     }
     sb.appendString("</span>");
@@ -905,7 +905,7 @@ function to4CharHex(n) {
 }
 function renderOverflowingCharCount(n) {
     if (n < 1024) {
-        return localize(931, "{0} chars", n);
+        return localize(932, "{0} chars", n);
     }
     if (n < 1024 * 1024) {
         return `${(n / 1024).toFixed(1)} KB`;

package/vscode/src/vs/editor/common/viewModel/minimapTokensColorTracker.js

@@ -30,7 +30,10 @@ class MinimapTokensColorTracker extends Disposable {
     _updateColorMap() {
         const colorMap = TokenizationRegistry.getColorMap();
         if (!colorMap) {
-            this._colors = [RGBA8.Empty];
+            this._colors = [];
+            for (let i = 0; i <= ColorId.DefaultBackground; i++) {
+                this._colors[i] = RGBA8.Empty;
+            }
             this._backgroundIsLight = true;
             return;
         }

package/vscode/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.d.ts

@@ -1,9 +1,9 @@
 import { WrappingIndent, IComputedEditorOptions } from "../config/editorOptions.js";
 import { FontInfo } from "../config/fontInfo.js";
-import { ILineBreaksComputerFactory, ILineBreaksComputer } from "../modelLineProjectionData.js";
+import { ILineBreaksComputerFactory, ILineBreaksComputer, ILineBreaksComputerContext } from "../modelLineProjectionData.js";
 export declare class MonospaceLineBreaksComputerFactory implements ILineBreaksComputerFactory {
     static create(options: IComputedEditorOptions): MonospaceLineBreaksComputerFactory;
     private readonly classifier;
     constructor(breakBeforeChars: string, breakAfterChars: string);
-    createLineBreaksComputer(fontInfo: FontInfo, tabSize: number, wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: "normal" | "keepAll", wrapOnEscapedLineFeeds: boolean): ILineBreaksComputer;
+    createLineBreaksComputer(context: ILineBreaksComputerContext, fontInfo: FontInfo, tabSize: number, wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: "normal" | "keepAll", wrapOnEscapedLineFeeds: boolean): ILineBreaksComputer;
 }

package/vscode/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.js

@@ -17,6 +17,7 @@ class MonospaceLineBreaksComputerFactory {
         this.classifier = ( new WrappingCharacterClassifier(breakBeforeChars, breakAfterChars));
     }
     createLineBreaksComputer(
+        context,
         fontInfo,
         tabSize,
         wrappingColumn,
@@ -24,22 +25,21 @@ class MonospaceLineBreaksComputerFactory {
         wordBreak,
         wrapOnEscapedLineFeeds
     ) {
-        const requests = [];
-        const injectedTexts = [];
+        const lineNumbers = [];
         const previousBreakingData = [];
         return {
-            addRequest: (lineText, injectedText, previousLineBreakData) => {
-                requests.push(lineText);
-                injectedTexts.push(injectedText);
+            addRequest: (lineNumber, previousLineBreakData) => {
+                lineNumbers.push(lineNumber);
                 previousBreakingData.push(previousLineBreakData);
             },
             finalize: () => {
                 const columnsForFullWidthChar = fontInfo.typicalFullwidthCharacterWidth / fontInfo.typicalHalfwidthCharacterWidth;
                 const result = [];
-                for (let i = 0, len = requests.length; i < len; i++) {
-                    const injectedText = injectedTexts[i];
+                for (let i = 0, len = lineNumbers.length; i < len; i++) {
+                    const lineNumber = lineNumbers[i];
+                    const injectedText = context.getLineInjectedText(lineNumber);
+                    const lineText = context.getLineContent(lineNumber);
                     const previousLineBreakData = previousBreakingData[i];
-                    const lineText = requests[i];
                     const isLineFeedWrappingEnabled = wrapOnEscapedLineFeeds && lineText.includes("\"") && lineText.includes("\\n");
                     if (previousLineBreakData && !previousLineBreakData.injectionOptions && !injectedText && !isLineFeedWrappingEnabled) {
                         result[i] = createLineBreaksFromPreviousLineBreaks(

package/vscode/src/vs/editor/common/viewModel/viewModelImpl.d.ts

@@ -15,7 +15,7 @@ import { ILanguageConfigurationService } from "../languages/languageConfiguratio
 import { EditorTheme } from "../editorTheme.js";
 import * as viewEvents from "../viewEvents.js";
 import { ViewLayout } from "../viewLayout/viewLayout.js";
-import { ILineBreaksComputer, ILineBreaksComputerFactory, InjectedText } from "../modelLineProjectionData.js";
+import { ILineBreaksComputer, ILineBreaksComputerContext, ILineBreaksComputerFactory, InjectedText } from "../modelLineProjectionData.js";
 import { ViewEventHandler } from "../viewEventHandler.js";
 import { IViewModel, IWhitespaceChangeAccessor, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, ViewLineData, ViewLineRenderingData, ViewModelDecoration } from "../viewModel.js";
 import { OutgoingViewModelEvent } from "../viewModelEventDispatcher.js";
@@ -45,7 +45,7 @@ export declare class ViewModel extends Disposable implements IViewModel {
     constructor(editorId: number, configuration: IEditorConfiguration, model: ITextModel, domLineBreaksComputerFactory: ILineBreaksComputerFactory, monospaceLineBreaksComputerFactory: ILineBreaksComputerFactory, scheduleAtNextAnimationFrame: (callback: () => void) => IDisposable, languageConfigurationService: ILanguageConfigurationService, _themeService: IThemeService, _attachedView: IAttachedView, _transactionalTarget: IBatchableTarget);
     dispose(): void;
     getEditorOption<T extends EditorOption>(id: T): FindComputedEditorOptionValueById<T>;
-    createLineBreaksComputer(): ILineBreaksComputer;
+    createLineBreaksComputer(context?: ILineBreaksComputerContext): ILineBreaksComputer;
     addViewEventHandler(eventHandler: ViewEventHandler): void;
     removeViewEventHandler(eventHandler: ViewEventHandler): void;
     private _getCustomLineHeights;

package/vscode/src/vs/editor/common/viewModel/viewModelImpl.js

@@ -155,8 +155,8 @@ class ViewModel extends Disposable {
     getEditorOption(id) {
         return this._configuration.options.get(id);
     }
-    createLineBreaksComputer() {
-        return this._lines.createLineBreaksComputer();
+    createLineBreaksComputer(context) {
+        return this._lines.createLineBreaksComputer(context);
     }
     addViewEventHandler(eventHandler) {
         this._eventDispatcher.addViewEventHandler(eventHandler);
@@ -285,23 +285,14 @@ class ViewModel extends Disposable {
                 switch (change.changeType) {
                 case RawContentChangedType.LinesInserted:
                     {
-                        for (let lineIdx = 0; lineIdx < change.detail.length; lineIdx++) {
-                            const line = change.detail[lineIdx];
-                            let injectedText = change.injectedTexts[lineIdx];
-                            if (injectedText) {
-                                injectedText = injectedText.filter(element => (!element.ownerId || element.ownerId === this._editorId));
-                            }
-                            lineBreaksComputer.addRequest(line, injectedText, null);
+                        for (let i = 0; i < change.count; i++) {
+                            lineBreaksComputer.addRequest(change.fromLineNumberPostEdit + i, null);
                         }
                         break;
                     }
                 case RawContentChangedType.LineChanged:
                     {
-                        let injectedText = null;
-                        if (change.injectedText) {
-                            injectedText = change.injectedText.filter(element => (!element.ownerId || element.ownerId === this._editorId));
-                        }
-                        lineBreaksComputer.addRequest(change.detail, injectedText, null);
+                        lineBreaksComputer.addRequest(change.lineNumberPostEdit, null);
                         break;
                     }
                 }
@@ -336,7 +327,7 @@ class ViewModel extends Disposable {
                     }
                 case RawContentChangedType.LinesInserted:
                     {
-                        const insertedLineBreaks = lineBreakQueue.takeCount(change.detail.length);
+                        const insertedLineBreaks = lineBreakQueue.takeCount(change.count);
                         const linesInsertedEvent = this._lines.onModelLinesInserted(versionId, change.fromLineNumber, change.toLineNumber, insertedLineBreaks);
                         if (linesInsertedEvent !== null) {
                             eventsCollector.emitViewEvent(linesInsertedEvent);

package/vscode/src/vs/editor/common/viewModel/viewModelLines.d.ts

@@ -6,7 +6,7 @@ import { Range } from "../core/range.js";
 import { IModelDecoration, ITextModel, PositionAffinity } from "../model.js";
 import { IActiveIndentGuideInfo, BracketGuideOptions, IndentGuide } from "../textModelGuides.js";
 import * as viewEvents from "../viewEvents.js";
-import { ILineBreaksComputer, ModelLineProjectionData, InjectedText, ILineBreaksComputerFactory } from "../modelLineProjectionData.js";
+import { ILineBreaksComputer, ModelLineProjectionData, InjectedText, ILineBreaksComputerFactory, ILineBreaksComputerContext } from "../modelLineProjectionData.js";
 import { ViewLineData } from "../viewModel.js";
 import { ICoordinatesConverter } from "../coordinatesConverter.js";
 export interface IViewModelLines extends IDisposable {
@@ -15,7 +15,7 @@ export interface IViewModelLines extends IDisposable {
     setTabSize(newTabSize: number): boolean;
     getHiddenAreas(): Range[];
     setHiddenAreas(_ranges: readonly Range[]): boolean;
-    createLineBreaksComputer(): ILineBreaksComputer;
+    createLineBreaksComputer(context?: ILineBreaksComputerContext): ILineBreaksComputer;
     onModelFlushed(): void;
     onModelLinesDeleted(versionId: number | null, fromLineNumber: number, toLineNumber: number): viewEvents.ViewLinesDeletedEvent | null;
     onModelLinesInserted(versionId: number | null, fromLineNumber: number, toLineNumber: number, lineBreaks: (ModelLineProjectionData | null)[]): viewEvents.ViewLinesInsertedEvent | null;
@@ -74,7 +74,7 @@ export declare class ViewModelLinesFromProjectedModel implements IViewModelLines
     getModelLineViewLineCount(modelLineNumber: number): number;
     setTabSize(newTabSize: number): boolean;
     setWrappingSettings(fontInfo: FontInfo, wrappingStrategy: "simple" | "advanced", wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: "normal" | "keepAll"): boolean;
-    createLineBreaksComputer(): ILineBreaksComputer;
+    createLineBreaksComputer(_context?: ILineBreaksComputerContext): ILineBreaksComputer;
     onModelFlushed(): void;
     onModelLinesDeleted(versionId: number | null, fromLineNumber: number, toLineNumber: number): viewEvents.ViewLinesDeletedEvent | null;
     onModelLinesInserted(versionId: number | null, fromLineNumber: number, _toLineNumber: number, lineBreaks: (ModelLineProjectionData | null)[]): viewEvents.ViewLinesInsertedEvent | null;

package/vscode/src/vs/editor/common/viewModel/viewModelLines.js

@@ -1,11 +1,9 @@
 
-import { ArrayQueue } from '../../../base/common/arrays.js';
 import { Position } from '../core/position.js';
 import { Range } from '../core/range.js';
 import { PositionAffinity } from '../model.js';
 import { IndentGuide, IndentGuideHorizontalLine } from '../textModelGuides.js';
 import { ModelDecorationOptions } from '../model/textModel.js';
-import { LineInjectedText } from '../textModelEvents.js';
 import { ViewLinesDeletedEvent, ViewLinesInsertedEvent, ViewLinesChangedEvent } from '../viewEvents.js';
 import { createModelLineProjection } from './modelLineProjection.js';
 import { ConstantTimePrefixSumComputer } from '../model/prefixSumComputer.js';
@@ -52,17 +50,10 @@ class ViewModelLinesFromProjectedModel {
             this.hiddenAreasDecorationIds = this.model.deltaDecorations(this.hiddenAreasDecorationIds, []);
         }
         const linesContent = this.model.getLinesContent();
-        const injectedTextDecorations = this.model.getInjectedTextDecorations(this._editorId);
         const lineCount = linesContent.length;
         const lineBreaksComputer = this.createLineBreaksComputer();
-        const injectedTextQueue = new ArrayQueue(LineInjectedText.fromDecorations(injectedTextDecorations));
         for (let i = 0; i < lineCount; i++) {
-            const lineInjectedText = injectedTextQueue.takeWhile(t => t.lineNumber === i + 1);
-            lineBreaksComputer.addRequest(
-                linesContent[i],
-                lineInjectedText,
-                previousLineBreaks ? previousLineBreaks[i] : null
-            );
+            lineBreaksComputer.addRequest(i + 1, previousLineBreaks ? previousLineBreaks[i] : null);
         }
         const linesBreaks = lineBreaksComputer.finalize();
         const values = [];
@@ -192,9 +183,18 @@ class ViewModelLinesFromProjectedModel {
         this._constructLines( false, previousLineBreaks);
         return true;
     }
-    createLineBreaksComputer() {
+    createLineBreaksComputer(_context) {
         const lineBreaksComputerFactory = (this.wrappingStrategy === "advanced" ? this._domLineBreaksComputerFactory : this._monospaceLineBreaksComputerFactory);
+        const context = _context ?? {
+            getLineContent: lineNumber => {
+                return this.model.getLineContent(lineNumber);
+            },
+            getLineInjectedText: lineNumber => {
+                return this.model.getLineInjectedText(lineNumber, this._editorId);
+            }
+        };
         return lineBreaksComputerFactory.createLineBreaksComputer(
+            context,
             this.fontInfo,
             this.tabSize,
             this.wrappingColumn,
@@ -878,7 +878,7 @@ class ViewModelLinesFromModelAsIs {
     createLineBreaksComputer() {
         const result = [];
         return {
-            addRequest: (lineText, injectedText, previousLineBreakData) => {
+            addRequest: (lineNumber, previousLineBreakData) => {
                 result.push(null);
             },
             finalize: () => {

package/vscode/src/vs/editor/common/viewModel.d.ts

@@ -8,7 +8,7 @@ import { CursorChangeReason } from "./cursorEvents.js";
 import { INewScrollPosition, ScrollType } from "./editorCommon.js";
 import { EditorTheme } from "./editorTheme.js";
 import { EndOfLinePreference, IGlyphMarginLanesModel, IModelDecorationOptions, ITextModel, TextDirection } from "./model.js";
-import { ILineBreaksComputer, InjectedText } from "./modelLineProjectionData.js";
+import { ILineBreaksComputer, ILineBreaksComputerContext, InjectedText } from "./modelLineProjectionData.js";
 import { InternalModelContentChangeEvent, ModelInjectedTextChangedEvent } from "./textModelEvents.js";
 import { BracketGuideOptions, IActiveIndentGuideInfo, IndentGuide } from "./textModelGuides.js";
 import { IViewLineTokens } from "./tokens/lineTokens.js";
@@ -72,7 +72,7 @@ export interface IViewModel extends ICursorSimpleModel, ISimpleModel {
     } | null;
     onDidChangeContentOrInjectedText(e: InternalModelContentChangeEvent | ModelInjectedTextChangedEvent): void;
     emitContentChangeEvent(e: InternalModelContentChangeEvent | ModelInjectedTextChangedEvent): void;
-    createLineBreaksComputer(): ILineBreaksComputer;
+    createLineBreaksComputer(context?: ILineBreaksComputerContext): ILineBreaksComputer;
     getPrimaryCursorState(): CursorState;
     getLastAddedCursorIndex(): number;
     getCursorStates(): CursorState[];

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

@@ -42,12 +42,12 @@ let SelectionAnchorController = class SelectionAnchorController {
                 this.decorationId = accessor.addDecoration(Selection.fromPositions(position, position), {
                     description: "selection-anchor",
                     stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-                    hoverMessage: ( new MarkdownString()).appendText(( localize(932, "Selection Anchor"))),
+                    hoverMessage: ( new MarkdownString()).appendText(( localize(933, "Selection Anchor"))),
                     className: "selection-anchor"
                 });
             });
             this.selectionAnchorSetContextKey.set(!!this.decorationId);
-            alert(( localize(933, "Anchor set at {0}:{1}", position.lineNumber, position.column)));
+            alert(( localize(934, "Anchor set at {0}:{1}", position.lineNumber, position.column)));
         }
     }
     goToSelectionAnchor() {
@@ -88,7 +88,7 @@ class SetSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: "editor.action.setSelectionAnchor",
-            label: ( localize2(934, "Set Selection Anchor")),
+            label: ( localize2(935, "Set Selection Anchor")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -105,7 +105,7 @@ class GoToSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: "editor.action.goToSelectionAnchor",
-            label: ( localize2(935, "Go to Selection Anchor")),
+            label: ( localize2(936, "Go to Selection Anchor")),
             precondition: SelectionAnchorSet
         });
     }
@@ -117,7 +117,7 @@ class SelectFromAnchorToCursor extends EditorAction {
     constructor() {
         super({
             id: "editor.action.selectFromAnchorToCursor",
-            label: ( localize2(936, "Select from Anchor to Cursor")),
+            label: ( localize2(937, "Select from Anchor to Cursor")),
             precondition: SelectionAnchorSet,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -134,7 +134,7 @@ class CancelSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: "editor.action.cancelSelectionAnchor",
-            label: ( localize2(937, "Cancel Selection Anchor")),
+            label: ( localize2(938, "Cancel Selection Anchor")),
             precondition: SelectionAnchorSet,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,

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

@@ -30,12 +30,12 @@ import { themeColorFromId, registerThemingParticipant } from '../../../../platfo
 import { editorBracketMatchForeground } from '../../../common/core/editorColorRegistry.js';
 
 registerCss(bracketMatching);
-const overviewRulerBracketMatchForeground = registerColor("editorOverviewRuler.bracketMatchForeground", "#A0A0A0", ( localize(938, "Overview ruler marker color for matching brackets.")));
+const overviewRulerBracketMatchForeground = registerColor("editorOverviewRuler.bracketMatchForeground", "#A0A0A0", ( localize(939, "Overview ruler marker color for matching brackets.")));
 class JumpToBracketAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.jumpToBracket",
-            label: ( localize2(939, "Go to Bracket")),
+            label: ( localize2(940, "Go to Bracket")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -52,10 +52,10 @@ class SelectToBracketAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.selectToBracket",
-            label: ( localize2(940, "Select to Bracket")),
+            label: ( localize2(941, "Select to Bracket")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(941, "Select the text inside and including the brackets or curly braces")),
+                description: ( localize2(942, "Select the text inside and including the brackets or curly braces")),
                 args: [{
                     name: "args",
                     schema: {
@@ -83,7 +83,7 @@ class RemoveBracketsAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.removeBrackets",
-            label: ( localize2(942, "Remove Brackets")),
+            label: ( localize2(943, "Remove Brackets")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -369,7 +369,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: "5_infile_nav",
     command: {
         id: "editor.action.jumpToBracket",
-        title: ( localize(943, "Go to &&Bracket"))
+        title: ( localize(944, "Go to &&Bracket"))
     },
     order: 2
 });

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

@@ -27,7 +27,7 @@ class MoveCaretLeftAction extends MoveCaretAction {
     constructor() {
         super(true, {
             id: "editor.action.moveCarretLeftAction",
-            label: ( localize2(944, "Move Selected Text Left")),
+            label: ( localize2(945, "Move Selected Text Left")),
             precondition: EditorContextKeys.writable
         });
     }
@@ -36,7 +36,7 @@ class MoveCaretRightAction extends MoveCaretAction {
     constructor() {
         super(false, {
             id: "editor.action.moveCarretRightAction",
-            label: ( localize2(945, "Move Selected Text Right")),
+            label: ( localize2(946, "Move Selected Text Right")),
             precondition: EditorContextKeys.writable
         });
     }

package/vscode/src/vs/editor/contrib/caretOperations/browser/transpose.js

@@ -12,7 +12,7 @@ class TransposeLettersAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.transposeLetters",
-            label: ( localize2(946, "Transpose Letters")),
+            label: ( localize2(947, "Transpose Letters")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,

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

@@ -42,23 +42,23 @@ const CutAction = supportsCut ? registerCommand(( new MultiCommand({
     menuOpts: [{
         menuId: MenuId.MenubarEditMenu,
         group: "2_ccp",
-        title: ( localize(947, "Cu&&t")),
+        title: ( localize(948, "Cu&&t")),
         order: 1
     }, {
         menuId: MenuId.EditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(948, "Cut")),
+        title: ( localize(949, "Cut")),
         when: EditorContextKeys.writable,
         order: 1
     }, {
         menuId: MenuId.CommandPalette,
         group: "",
-        title: ( localize(948, "Cut")),
+        title: ( localize(949, "Cut")),
         order: 1
     }, {
         menuId: MenuId.SimpleEditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(948, "Cut")),
+        title: ( localize(949, "Cut")),
         when: EditorContextKeys.writable,
         order: 1
     }]
@@ -78,47 +78,47 @@ const CopyAction = supportsCopy ? registerCommand(( new MultiCommand({
     menuOpts: [{
         menuId: MenuId.MenubarEditMenu,
         group: "2_ccp",
-        title: ( localize(949, "&&Copy")),
+        title: ( localize(950, "&&Copy")),
         order: 2
     }, {
         menuId: MenuId.EditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(950, "Copy")),
+        title: ( localize(951, "Copy")),
         order: 2
     }, {
         menuId: MenuId.CommandPalette,
         group: "",
-        title: ( localize(950, "Copy")),
+        title: ( localize(951, "Copy")),
         order: 1
     }, {
         menuId: MenuId.SimpleEditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(950, "Copy")),
+        title: ( localize(951, "Copy")),
         order: 2
     }]
 }))) : undefined;
 MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, {
     submenu: MenuId.MenubarCopy,
-    title: ( localize2(951, "Copy As")),
+    title: ( localize2(952, "Copy As")),
     group: "2_ccp",
     order: 3
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.EditorContextCopy,
-    title: ( localize2(951, "Copy As")),
+    title: ( localize2(952, "Copy As")),
     group: CLIPBOARD_CONTEXT_MENU_GROUP,
     order: 3
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.EditorContextShare,
-    title: ( localize2(952, "Share")),
+    title: ( localize2(953, "Share")),
     group: "11_share",
     order: -1,
     when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals("resourceScheme", "output")), EditorContextKeys.editorTextFocus))
 });
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
     submenu: MenuId.ExplorerContextShare,
-    title: ( localize2(952, "Share")),
+    title: ( localize2(953, "Share")),
     group: "11_share",
     order: -1
 });
@@ -141,23 +141,23 @@ const PasteAction = supportsPaste ? registerCommand(( new MultiCommand({
     menuOpts: [{
         menuId: MenuId.MenubarEditMenu,
         group: "2_ccp",
-        title: ( localize(953, "&&Paste")),
+        title: ( localize(954, "&&Paste")),
         order: 4
     }, {
         menuId: MenuId.EditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(954, "Paste")),
+        title: ( localize(955, "Paste")),
         when: EditorContextKeys.writable,
         order: 4
     }, {
         menuId: MenuId.CommandPalette,
         group: "",
-        title: ( localize(954, "Paste")),
+        title: ( localize(955, "Paste")),
         order: 1
     }, {
         menuId: MenuId.SimpleEditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(954, "Paste")),
+        title: ( localize(955, "Paste")),
         when: EditorContextKeys.writable,
         order: 4
     }]
@@ -166,7 +166,7 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.clipboardCopyWithSyntaxHighlightingAction",
-            label: ( localize2(955, "Copy with Syntax Highlighting")),
+            label: ( localize2(956, "Copy with Syntax Highlighting")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,

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

@@ -267,7 +267,7 @@ async function applyCodeAction(accessor, item, codeActionReason, options, token
             await commandService.executeCommand(item.action.command.id, ...(item.action.command.arguments || []));
         } catch (err) {
             const message = asMessage(err);
-            notificationService.error(typeof message === "string" ? message : ( localize(956, "An unknown error occurred while applying the code action")));
+            notificationService.error(typeof message === "string" ? message : ( localize(957, "An unknown error occurred while applying the code action")));
         }
     }
     setTimeout(