@codingame/monaco-vscode-api 8.0.1 → 8.0.2

package/api.js

@@ -29,7 +29,7 @@ function createProxy(key) {
     });
 }
 const api = {
-    version: "1.92.1",
+    version: "1.92.2",
     tasks: createProxy('tasks'),
     notebooks: createProxy('notebooks'),
     scm: createProxy('scm'),

package/extensions.d.ts

@@ -20,6 +20,30 @@
 /// <reference path="./vscode-dts/vscode.proposed.commentThreadApplicability.d.ts" />
 /// <reference path="./vscode-dts/vscode.proposed.commentingRangeHint.d.ts" />
 /// <reference path="./vscode-dts/vscode.proposed.commentsDraftState.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribAccessibilityHelpContent.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribCommentPeekContext.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribCommentThreadAdditionalMenu.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribCommentsViewThreadMenus.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribDiffEditorGutterToolBarMenus.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribEditSessions.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribEditorContentMenu.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribIssueReporter.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribLabelFormatterWorkspaceTooltip.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribMenuBarHome.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribMergeEditorMenus.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribMultiDiffEditorMenus.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribNotebookStaticPreloads.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribRemoteHelp.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribShareMenu.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribSourceControlHistoryItemChangesMenu.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribSourceControlInputBoxMenu.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribSourceControlTitleMenu.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribStatusBarItems.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribViewsRemote.d.ts" />
+/// <reference path="./vscode-dts/vscode.proposed.contribViewsWelcome.d.ts" />
 /// <reference path="./vscode-dts/vscode.proposed.createFileSystemWatcher.d.ts" />
 /// <reference path="./vscode-dts/vscode.proposed.customEditorMove.d.ts" />
 /// <reference path="./vscode-dts/vscode.proposed.debugVisualization.d.ts" />

package/missing-services.js

@@ -580,8 +580,8 @@ registerSingleton(IPathService, class PathService {
 registerSingleton(IProductService, class ProductService {
     constructor() {
         this._serviceBrand = undefined;
-        this.version = "1.92.1";
-        this.commit = "eaa41d57266683296de7d118f574d0c2652e1fc4";
+        this.version = "1.92.2";
+        this.commit = "fee1edb8d6d72a0ddff41e5f71a671c23ed924b9";
         this.quality = 'oss';
         this.nameShort = 'Code - OSS Dev';
         this.nameLong = 'Code - OSS Dev';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -99,12 +99,12 @@
   "dependencies": {
     "@vscode/iconv-lite-umd": "0.7.0",
     "jschardet": "3.1.3",
-    "@codingame/monaco-vscode-extensions-service-override": "8.0.1",
-    "@codingame/monaco-vscode-files-service-override": "8.0.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "8.0.1",
-    "@codingame/monaco-vscode-environment-service-override": "8.0.1",
-    "@codingame/monaco-vscode-layout-service-override": "8.0.1",
-    "@codingame/monaco-vscode-host-service-override": "8.0.1",
-    "@codingame/monaco-vscode-base-service-override": "8.0.1"
+    "@codingame/monaco-vscode-extensions-service-override": "8.0.2",
+    "@codingame/monaco-vscode-files-service-override": "8.0.2",
+    "@codingame/monaco-vscode-quickaccess-service-override": "8.0.2",
+    "@codingame/monaco-vscode-environment-service-override": "8.0.2",
+    "@codingame/monaco-vscode-layout-service-override": "8.0.2",
+    "@codingame/monaco-vscode-host-service-override": "8.0.2",
+    "@codingame/monaco-vscode-base-service-override": "8.0.2"
   }
 }

package/services.js

@@ -186,9 +186,9 @@ async function initialize(overrides, container = document.body, configuration =
     initialize$1(container, configuration, env);
     const instantiationService = StandaloneServices.initialize({
         [( IProductService.toString())]: mixin({
-            version: "1.92.1",
+            version: "1.92.2",
             quality: 'stable',
-            commit: "eaa41d57266683296de7d118f574d0c2652e1fc4",
+            commit: "fee1edb8d6d72a0ddff41e5f71a671c23ed924b9",
             nameShort: 'Code - OSS',
             nameLong: 'Code - OSS',
             applicationName: 'code-oss',

package/vscode/src/vs/base/browser/ui/dialog/dialog.js

@@ -30,7 +30,7 @@ class Dialog extends Disposable {
             this.buttons = buttons;
         }
         else if (!this.options.disableDefaultAction) {
-            this.buttons = [( localize(9514, "OK"))];
+            this.buttons = [( localize(9521, "OK"))];
         }
         else {
             this.buttons = [];
@@ -94,16 +94,16 @@ class Dialog extends Disposable {
         this.applyStyles();
     }
     getIconAriaLabel() {
-        let typeLabel = ( localize(9515, 'Info'));
+        let typeLabel = ( localize(9522, 'Info'));
         switch (this.options.type) {
             case 'error':
-                typeLabel = ( localize(9516, 'Error'));
+                typeLabel = ( localize(9523, 'Error'));
                 break;
             case 'warning':
-                typeLabel = ( localize(9517, 'Warning'));
+                typeLabel = ( localize(9524, 'Warning'));
                 break;
             case 'pending':
-                typeLabel = ( localize(9518, 'In Progress'));
+                typeLabel = ( localize(9525, 'In Progress'));
                 break;
         }
         return typeLabel;
@@ -264,7 +264,7 @@ class Dialog extends Disposable {
                 }
                 if (!this.options.disableCloseAction) {
                     const actionBar = this._register(( (new ActionBar(this.toolbarContainer, {}))));
-                    const action = this._register(( (new Action('dialog.close', ( localize(9519, "Close Dialog")), ThemeIcon.asClassName(Codicon.dialogClose), true, async () => {
+                    const action = this._register(( (new Action('dialog.close', ( localize(9526, "Close Dialog")), ThemeIcon.asClassName(Codicon.dialogClose), true, async () => {
                         resolve({
                             button: this.options.cancelId || 0,
                             checkboxChecked: this.checkbox ? this.checkbox.checked : undefined

package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js

@@ -66,8 +66,8 @@ class HoverAction extends Disposable {
     }
 }
 function getHoverAccessibleViewHint(shouldHaveHint, keybinding) {
-    return shouldHaveHint && keybinding ? ( localize(6862, "Inspect this in the accessible view with {0}.", keybinding)) : shouldHaveHint ? ( localize(
-        6863,
+    return shouldHaveHint && keybinding ? ( localize(6985, "Inspect this in the accessible view with {0}.", keybinding)) : shouldHaveHint ? ( localize(
+        6986,
         "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
     )) : '';
 }

package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js

@@ -2,7 +2,7 @@ import { Action } from '../../../common/actions.js';
 import { localize } from '../../../../nls.js';
 class CollapseAllAction extends Action {
     constructor(viewer, enabled) {
-        super('vs.tree.collapse', ( localize(10914, "Collapse All")), 'collapse-all', enabled);
+        super('vs.tree.collapse', ( localize(10916, "Collapse All")), 'collapse-all', enabled);
         this.viewer = viewer;
     }
     async run() {

package/vscode/src/vs/editor/browser/coreCommands.js

@@ -861,7 +861,7 @@ var CoreNavigationCommands;
                         type: 'object',
                         properties: {
                             'sticky': {
-                                description: ( localize(1179, "Stick to the end even when going to longer lines")),
+                                description: ( localize(1160, "Stick to the end even when going to longer lines")),
                                 type: 'boolean',
                                 default: false
                             }
@@ -889,7 +889,7 @@ var CoreNavigationCommands;
                         type: 'object',
                         properties: {
                             'sticky': {
-                                description: ( localize(1179, "Stick to the end even when going to longer lines")),
+                                description: ( localize(1160, "Stick to the end even when going to longer lines")),
                                 type: 'boolean',
                                 default: false
                             }
@@ -1431,7 +1431,7 @@ var CoreNavigationCommands;
                 viewModel.getPrimaryCursorState()
             ]);
             viewModel.revealAllCursors(args.source, true);
-            status(( localize(1180, "Removed secondary cursors")));
+            status(( localize(1161, "Removed secondary cursors")));
         }
     }));
     CoreNavigationCommands.RevealLine = registerEditorCommand(new (class extends CoreEditorCommand {

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js

@@ -1302,7 +1302,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                     if (e.reachedMaxCursorCount) {
                         const multiCursorLimit = this.getOption(EditorOption.multiCursorLimit);
                         const message = ( localize(
-                            1160,
+                            1162,
                             "The number of cursors has been limited to {0}. Consider using [find and replace](https://code.visualstudio.com/docs/editor/codebasics#_find-and-replace) for larger changes or increase the editor multi cursor limit setting.",
                             multiCursorLimit
                         ));
@@ -1314,7 +1314,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                                 }
                             },
                             {
-                                label: ( localize(1161, 'Increase Multi Cursor Limit')),
+                                label: ( localize(1163, 'Increase Multi Cursor Limit')),
                                 run: () => {
                                     this._commandService.executeCommand('workbench.action.openSettings2', {
                                         query: 'editor.multiCursorLimit'

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js

@@ -12,7 +12,7 @@ registerAction2(ToggleUseInlineViewWhenSpaceIsLimited);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( (new ToggleUseInlineViewWhenSpaceIsLimited())).desc.id,
-        title: ( localize(1162, "Use Inline View When Space Is Limited")),
+        title: ( localize(1170, "Use Inline View When Space Is Limited")),
         toggled: ( (ContextKeyExpr.has('config.diffEditor.useInlineViewWhenSpaceIsLimited'))),
         precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
@@ -26,7 +26,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( (new ToggleShowMovedCodeBlocks())).desc.id,
-        title: ( localize(1163, "Show Moved Code Blocks")),
+        title: ( localize(1171, "Show Moved Code Blocks")),
         icon: Codicon.move,
         toggled: ContextKeyEqualsExpr.create('config.diffEditor.experimental.showMoves', true),
         precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
@@ -43,7 +43,7 @@ for (const ctx of [
     MenuRegistry.appendMenuItem(MenuId.DiffEditorHunkToolbar, {
         command: {
             id: ( (new RevertHunkOrSelection())).desc.id,
-            title: ( localize(1164, "Revert Block")),
+            title: ( localize(1172, "Revert Block")),
             icon: ctx.icon,
         },
         when: ( (ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key))),
@@ -53,7 +53,7 @@ for (const ctx of [
     MenuRegistry.appendMenuItem(MenuId.DiffEditorSelectionToolbar, {
         command: {
             id: ( (new RevertHunkOrSelection())).desc.id,
-            title: ( localize(1165, "Revert Selection")),
+            title: ( localize(1173, "Revert Selection")),
             icon: ctx.icon,
         },
         when: ( (ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key))),
@@ -68,7 +68,7 @@ registerAction2(ShowAllUnchangedRegions);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: AccessibleDiffViewerNext.id,
-        title: ( localize(1166, "Open Accessible Diff Viewer")),
+        title: ( localize(1174, "Open Accessible Diff Viewer")),
         precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
     order: 10,

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js

@@ -10,6 +10,6 @@ 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';
-registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localize(9829, 'The background color of the diff editor\'s header')));
-registerColor('multiDiffEditor.background', 'editorBackground', ( localize(9830, 'The background color of the multi file diff editor')));
-registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localize(9831, 'The border color of the multi file diff editor')));
+registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localize(9363, 'The background color of the diff editor\'s header')));
+registerColor('multiDiffEditor.background', 'editorBackground', ( localize(9364, 'The background color of the multi file diff editor')));
+registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localize(9365, 'The border color of the multi file diff editor')));

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js

@@ -51,7 +51,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         }, this._scrollable))));
         this._elements = h('div.monaco-component.multiDiffEditor', {}, [
             h('div', {}, [this._scrollableElement.getDomNode()]),
-            h('div.placeholder@placeholder', {}, [h('div', [( localize(9828, 'No Changed Files'))])]),
+            h('div.placeholder@placeholder', {}, [h('div', [( localize(9362, 'No Changed Files'))])]),
         ]);
         this._sizeObserver = this._register(( (new ObservableElementSizeObserver(this._element, undefined))));
         this._objectPool = this._register(( (new ObjectPool((data) => {

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

@@ -893,7 +893,7 @@ function _renderLine(input, sb) {
     }
     if (isOverflowing) {
         sb.appendString('<span class="mtkoverflow">');
-        sb.appendString(( localize(9826, "Show more ({0})", renderOverflowingCharCount(overflowingCharCount))));
+        sb.appendString(( localize(9360, "Show more ({0})", renderOverflowingCharCount(overflowingCharCount))));
         sb.appendString('</span>');
     }
     sb.appendString('</span>');
@@ -906,7 +906,7 @@ function to4CharHex(n) {
 }
 function renderOverflowingCharCount(n) {
     if (n < 1024) {
-        return ( localize(9827, "{0} chars", n));
+        return ( localize(9361, "{0} chars", n));
     }
     if (n < 1024 * 1024) {
         return `${(n / 1024).toFixed(1)} KB`;

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

@@ -34,12 +34,12 @@ let SelectionAnchorController = class SelectionAnchorController {
                 this.decorationId = accessor.addDecoration(Selection.fromPositions(position, position), {
                     description: 'selection-anchor',
                     stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-                    hoverMessage: ( (new MarkdownString())).appendText(( localize(1167, "Selection Anchor"))),
+                    hoverMessage: ( (new MarkdownString())).appendText(( localize(1164, "Selection Anchor"))),
                     className: 'selection-anchor'
                 });
             });
             this.selectionAnchorSetContextKey.set(!!this.decorationId);
-            alert(( localize(1168, "Anchor set at {0}:{1}", position.lineNumber, position.column)));
+            alert(( localize(1165, "Anchor set at {0}:{1}", position.lineNumber, position.column)));
         }
     }
     goToSelectionAnchor() {
@@ -82,7 +82,7 @@ class SetSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.setSelectionAnchor',
-            label: ( localize(1169, "Set Selection Anchor")),
+            label: ( localize(1166, "Set Selection Anchor")),
             alias: 'Set Selection Anchor',
             precondition: undefined,
             kbOpts: {
@@ -100,7 +100,7 @@ class GoToSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.goToSelectionAnchor',
-            label: ( localize(1170, "Go to Selection Anchor")),
+            label: ( localize(1167, "Go to Selection Anchor")),
             alias: 'Go to Selection Anchor',
             precondition: SelectionAnchorSet,
         });
@@ -113,7 +113,7 @@ class SelectFromAnchorToCursor extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.selectFromAnchorToCursor',
-            label: ( localize(1171, "Select from Anchor to Cursor")),
+            label: ( localize(1168, "Select from Anchor to Cursor")),
             alias: 'Select from Anchor to Cursor',
             precondition: SelectionAnchorSet,
             kbOpts: {
@@ -131,7 +131,7 @@ class CancelSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.cancelSelectionAnchor',
-            label: ( localize(1172, "Cancel Selection Anchor")),
+            label: ( localize(1169, "Cancel Selection Anchor")),
             alias: 'Cancel Selection Anchor',
             precondition: SelectionAnchorSet,
             kbOpts: {

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

@@ -25,12 +25,12 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
-const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', '#A0A0A0', ( localize(1173, 'Overview ruler marker color for matching brackets.')));
+const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', '#A0A0A0', ( localize(1177, 'Overview ruler marker color for matching brackets.')));
 class JumpToBracketAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.jumpToBracket',
-            label: ( localize(1174, "Go to Bracket")),
+            label: ( localize(1178, "Go to Bracket")),
             alias: 'Go to Bracket',
             precondition: undefined,
             kbOpts: {
@@ -48,11 +48,11 @@ class SelectToBracketAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.selectToBracket',
-            label: ( localize(1175, "Select to Bracket")),
+            label: ( localize(1179, "Select to Bracket")),
             alias: 'Select to Bracket',
             precondition: undefined,
             metadata: {
-                description: ( localize2(1176, "Select the text inside and including the brackets or curly braces")),
+                description: ( localize2(1180, "Select the text inside and including the brackets or curly braces")),
                 args: [{
                         name: 'args',
                         schema: {
@@ -80,7 +80,7 @@ class RemoveBracketsAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.removeBrackets',
-            label: ( localize(1177, "Remove Brackets")),
+            label: ( localize(1181, "Remove Brackets")),
             alias: 'Remove Brackets',
             precondition: undefined,
             kbOpts: {
@@ -353,7 +353,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '5_infile_nav',
     command: {
         id: 'editor.action.jumpToBracket',
-        title: ( localize(1178, "Go to &&Bracket"))
+        title: ( localize(1182, "Go to &&Bracket"))
     },
     order: 2
 });

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

@@ -25,7 +25,7 @@ class MoveCaretLeftAction extends MoveCaretAction {
     constructor() {
         super(true, {
             id: 'editor.action.moveCarretLeftAction',
-            label: ( localize(1181, "Move Selected Text Left")),
+            label: ( localize(1175, "Move Selected Text Left")),
             alias: 'Move Selected Text Left',
             precondition: EditorContextKeys.writable
         });
@@ -35,7 +35,7 @@ class MoveCaretRightAction extends MoveCaretAction {
     constructor() {
         super(false, {
             id: 'editor.action.moveCarretRightAction',
-            label: ( localize(1182, "Move Selected Text Right")),
+            label: ( localize(1176, "Move Selected Text Right")),
             alias: 'Move Selected Text Right',
             precondition: EditorContextKeys.writable
         });

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

@@ -21,7 +21,7 @@ registerEditorCommand(( (new CodeActionCommand())));
         'editor.codeActionWidget.showHeaders': {
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(1193, "Enable/disable showing group headers in the Code Action menu.")),
+            description: ( localize(1195, "Enable/disable showing group headers in the Code Action menu.")),
             default: true,
         },
     }
@@ -33,7 +33,7 @@ registerEditorCommand(( (new CodeActionCommand())));
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             description: ( localize(
-                1194,
+                1196,
                 "Enable/disable showing nearest Quick Fix within a line when not currently on a diagnostic."
             )),
             default: true,
@@ -47,7 +47,7 @@ registerEditorCommand(( (new CodeActionCommand())));
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             markdownDescription: ( localize(
-                1195,
+                1197,
                 'Enable triggering {0} when {1} is set to {2}. Code Actions must be set to {3} to be triggered for window and focus changes.',
                 '`#editor.codeActionsOnSave#`',
                 '`#files.autoSave#`',

package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js

@@ -388,7 +388,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
         super({
             id: 'codelens.showLensesInCurrentLine',
             precondition: EditorContextKeys.hasCodeLensProvider,
-            label: ( localize(1196, "Show CodeLens Commands For Current Line")),
+            label: ( localize(1193, "Show CodeLens Commands For Current Line")),
             alias: 'Show CodeLens Commands For Current Line',
         });
     }
@@ -422,7 +422,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
         }
         const item = await quickInputService.pick(items, {
             canPickMany: false,
-            placeHolder: ( localize(1197, "Select a command"))
+            placeHolder: ( localize(1194, "Select a command"))
         });
         if (!item) {
             return;

package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js

@@ -10,7 +10,7 @@ import { registerSingleton, InstantiationType } from '../../../../platform/insta
 import { localize } from '../../../../nls.js';
 const IEditorCancellationTokens = ( (createDecorator('IEditorCancelService')));
 const ctxCancellableOperation = ( (new RawContextKey('cancellableOperation', false, ( localize(
-    9832,
+    9366,
     'Whether the editor runs a cancellable operation, e.g. like \'Peek References\''
 )))));
 registerSingleton(IEditorCancellationTokens, class {

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js

@@ -245,7 +245,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
         };
         this._preview = this._instantiationService.createInstance(EmbeddedCodeEditorWidget, this._previewContainer, options, {}, this.editor);
         hide(this._previewContainer);
-        this._previewNotAvailableMessage = ( (new TextModel(( localize(9787, "no preview available")), PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null, this._undoRedoService, this._languageService, this._languageConfigurationService)));
+        this._previewNotAvailableMessage = ( (new TextModel(( localize(9794, "no preview available")), PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null, this._undoRedoService, this._languageService, this._languageConfigurationService)));
         this._treeContainer = append(containerElement, $('div.ref-tree.inline'));
         const treeOptions = {
             keyboardSupport: this._defaultTreeKeyboardSupport,
@@ -351,7 +351,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
         }
         if (this._model.isEmpty) {
             this.setTitle('');
-            this._messageContainer.innerText = ( localize(9788, "No results"));
+            this._messageContainer.innerText = ( localize(9795, "No results"));
             show(this._messageContainer);
             return Promise.resolve(undefined);
         }
@@ -406,7 +406,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
             this.setTitle(basenameOrAuthority(reference.uri), this._uriLabel.getUriLabel(dirname(reference.uri)));
         }
         else {
-            this.setTitle(( localize(9789, "References")));
+            this.setTitle(( localize(9796, "References")));
         }
         const promise = this._textModelResolverService.createModelReference(reference.uri);
         if (this._tree.getInput() === reference.parent) {

package/vscode/src/vs/platform/actions/common/menuResetAction.js

@@ -7,7 +7,7 @@ class MenuHiddenStatesReset extends Action2 {
     constructor() {
         super({
             id: 'menu.resetHiddenStates',
-            title: ( localize2(4161, "Reset All Menus")),
+            title: ( localize2(4484, "Reset All Menus")),
             category: Categories.View,
             f1: true
         });

package/vscode/src/vs/platform/dialogs/common/dialogs.js

@@ -28,13 +28,13 @@ class AbstractDialogHandler {
                     buttons.push(confirmationDialog.primaryButton);
                 }
                 else {
-                    buttons.push(( localize(5687, "&&Yes")));
+                    buttons.push(( localize(5682, "&&Yes")));
                 }
                 if (confirmationDialog.cancelButton) {
                     buttons.push(confirmationDialog.cancelButton);
                 }
                 else {
-                    buttons.push(( localize(5688, "Cancel")));
+                    buttons.push(( localize(5683, "Cancel")));
                 }
                 break;
             }
@@ -45,7 +45,7 @@ class AbstractDialogHandler {
                 }
                 if (promptDialog.cancelButton) {
                     if (promptDialog.cancelButton === true) {
-                        buttons.push(( localize(5688, "Cancel")));
+                        buttons.push(( localize(5683, "Cancel")));
                     }
                     else if (typeof promptDialog.cancelButton === 'string') {
                         buttons.push(promptDialog.cancelButton);
@@ -55,12 +55,12 @@ class AbstractDialogHandler {
                             buttons.push(promptDialog.cancelButton.label);
                         }
                         else {
-                            buttons.push(( localize(5688, "Cancel")));
+                            buttons.push(( localize(5683, "Cancel")));
                         }
                     }
                 }
                 if (buttons.length === 0) {
-                    buttons.push(( localize(5689, "&&OK")));
+                    buttons.push(( localize(5684, "&&OK")));
                 }
                 break;
             }
@@ -70,13 +70,13 @@ class AbstractDialogHandler {
                     buttons.push(inputDialog.primaryButton);
                 }
                 else {
-                    buttons.push(( localize(5689, "&&OK")));
+                    buttons.push(( localize(5684, "&&OK")));
                 }
                 if (inputDialog.cancelButton) {
                     buttons.push(inputDialog.cancelButton);
                 }
                 else {
-                    buttons.push(( localize(5688, "Cancel")));
+                    buttons.push(( localize(5683, "Cancel")));
                 }
                 break;
             }
@@ -118,11 +118,11 @@ function getFileNamesMessage(fileNamesOrResources) {
     ))));
     if (fileNamesOrResources.length > MAX_CONFIRM_FILES) {
         if (fileNamesOrResources.length - MAX_CONFIRM_FILES === 1) {
-            message.push(( localize(5690, "...1 additional file not shown")));
+            message.push(( localize(5685, "...1 additional file not shown")));
         }
         else {
             message.push(( localize(
-                5691,
+                5686,
                 "...{0} additional files not shown",
                 fileNamesOrResources.length - MAX_CONFIRM_FILES
             )));

package/vscode/src/vs/platform/markers/common/markers.js

@@ -18,9 +18,9 @@ var MarkerSeverity;
     }
     MarkerSeverity.compare = compare;
     const _displayStrings = Object.create(null);
-    _displayStrings[MarkerSeverity.Error] = ( localize(4800, "Error"));
-    _displayStrings[MarkerSeverity.Warning] = ( localize(4801, "Warning"));
-    _displayStrings[MarkerSeverity.Info] = ( localize(4802, "Info"));
+    _displayStrings[MarkerSeverity.Error] = ( localize(4813, "Error"));
+    _displayStrings[MarkerSeverity.Warning] = ( localize(4814, "Warning"));
+    _displayStrings[MarkerSeverity.Info] = ( localize(4815, "Info"));
     function toString(a) {
         return _displayStrings[a] || '';
     }

package/vscode/src/vs/platform/theme/common/colors/minimapColors.js

@@ -3,18 +3,18 @@ import { Color, RGBA } from '../../../../base/common/color.js';
 import { registerColor, transparent } from '../colorUtils.js';
 import { editorInfoForeground, editorInfoBorder, editorWarningForeground, editorWarningBorder } from './editorColors.js';
 import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground } from './miscColors.js';
-const minimapFindMatch = registerColor('minimap.findMatchHighlight', { light: '#d18616', dark: '#d18616', hcDark: '#AB5A00', hcLight: '#0F4A85' }, ( localize(1897, 'Minimap marker color for find matches.')), true);
-const minimapSelectionOccurrenceHighlight = registerColor('minimap.selectionOccurrenceHighlight', { light: '#c9c9c9', dark: '#676767', hcDark: '#ffffff', hcLight: '#0F4A85' }, ( localize(1898, 'Minimap marker color for repeating editor selections.')), true);
-const minimapSelection = registerColor('minimap.selectionHighlight', { light: '#ADD6FF', dark: '#264F78', hcDark: '#ffffff', hcLight: '#0F4A85' }, ( localize(1899, 'Minimap marker color for the editor selection.')), true);
-const minimapInfo = registerColor('minimap.infoHighlight', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: editorInfoBorder, hcLight: editorInfoBorder }, ( localize(1900, 'Minimap marker color for infos.')));
-const minimapWarning = registerColor('minimap.warningHighlight', { dark: editorWarningForeground, light: editorWarningForeground, hcDark: editorWarningBorder, hcLight: editorWarningBorder }, ( localize(1901, 'Minimap marker color for warnings.')));
-const minimapError = registerColor('minimap.errorHighlight', { dark: ( (new Color( (new RGBA(255, 18, 18, 0.7))))), light: ( (new Color( (new RGBA(255, 18, 18, 0.7))))), hcDark: ( (new Color( (new RGBA(255, 50, 50, 1))))), hcLight: '#B5200D' }, ( localize(1902, 'Minimap marker color for errors.')));
-const minimapBackground = registerColor('minimap.background', null, ( localize(1903, "Minimap background color.")));
+const minimapFindMatch = registerColor('minimap.findMatchHighlight', { light: '#d18616', dark: '#d18616', hcDark: '#AB5A00', hcLight: '#0F4A85' }, ( localize(1905, 'Minimap marker color for find matches.')), true);
+const minimapSelectionOccurrenceHighlight = registerColor('minimap.selectionOccurrenceHighlight', { light: '#c9c9c9', dark: '#676767', hcDark: '#ffffff', hcLight: '#0F4A85' }, ( localize(1906, 'Minimap marker color for repeating editor selections.')), true);
+const minimapSelection = registerColor('minimap.selectionHighlight', { light: '#ADD6FF', dark: '#264F78', hcDark: '#ffffff', hcLight: '#0F4A85' }, ( localize(1907, 'Minimap marker color for the editor selection.')), true);
+const minimapInfo = registerColor('minimap.infoHighlight', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: editorInfoBorder, hcLight: editorInfoBorder }, ( localize(1908, 'Minimap marker color for infos.')));
+const minimapWarning = registerColor('minimap.warningHighlight', { dark: editorWarningForeground, light: editorWarningForeground, hcDark: editorWarningBorder, hcLight: editorWarningBorder }, ( localize(1909, 'Minimap marker color for warnings.')));
+const minimapError = registerColor('minimap.errorHighlight', { dark: ( (new Color( (new RGBA(255, 18, 18, 0.7))))), light: ( (new Color( (new RGBA(255, 18, 18, 0.7))))), hcDark: ( (new Color( (new RGBA(255, 50, 50, 1))))), hcLight: '#B5200D' }, ( localize(1910, 'Minimap marker color for errors.')));
+const minimapBackground = registerColor('minimap.background', null, ( localize(1911, "Minimap background color.")));
 const minimapForegroundOpacity = registerColor('minimap.foregroundOpacity', ( (Color.fromHex('#000f'))), ( localize(
- 1904,
+ 1912,
  'Opacity of foreground elements rendered in the minimap. For example, "#000000c0" will render the elements with 75% opacity.'
 )));
-registerColor('minimapSlider.background', ( (transparent(scrollbarSliderBackground, 0.5))), ( localize(1905, "Minimap slider background color.")));
-registerColor('minimapSlider.hoverBackground', ( (transparent(scrollbarSliderHoverBackground, 0.5))), ( localize(1906, "Minimap slider background color when hovering.")));
-registerColor('minimapSlider.activeBackground', ( (transparent(scrollbarSliderActiveBackground, 0.5))), ( localize(1907, "Minimap slider background color when clicked on.")));
+registerColor('minimapSlider.background', ( (transparent(scrollbarSliderBackground, 0.5))), ( localize(1913, "Minimap slider background color.")));
+registerColor('minimapSlider.hoverBackground', ( (transparent(scrollbarSliderHoverBackground, 0.5))), ( localize(1914, "Minimap slider background color when hovering.")));
+registerColor('minimapSlider.activeBackground', ( (transparent(scrollbarSliderActiveBackground, 0.5))), ( localize(1915, "Minimap slider background color when clicked on.")));
 export { minimapBackground, minimapError, minimapFindMatch, minimapForegroundOpacity, minimapInfo, minimapSelection, minimapSelectionOccurrenceHighlight, minimapWarning };