@codingame/monaco-vscode-api 26.2.2 → 27.0.0

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.js

@@ -31,12 +31,12 @@ class DiffEditorAccessibilityHelp {
             return;
         }
         const switchSides = ( localize(
-            6653,
+            7260,
             "Run the command Diff Editor: Switch Side{0} to toggle between the original and modified editors.",
             "<keybinding:diffEditor.switchSide>"
         ));
         const diffEditorActiveAnnouncement = ( localize(
-            6654,
+            7261,
             "The setting, accessibility.verbosity.diffEditorActive, controls if a diff editor announcement is made when it becomes the active editor."
         ));
         const keys = [
@@ -44,13 +44,13 @@ class DiffEditorAccessibilityHelp {
             "accessibility.signals.diffLineInserted",
             "accessibility.signals.diffLineModified"
         ];
-        const content = [( localize(6655, "You are in a diff editor.")), ( localize(
-            6656,
+        const content = [( localize(7262, "You are in a diff editor.")), ( localize(
+            7263,
             "View the next{0} or previous{1} diff in diff review mode, which is optimized for screen readers.",
             "<keybinding:" + AccessibleDiffViewerNext.id + ">",
             "<keybinding:" + AccessibleDiffViewerPrev.id + ">"
         )), switchSides, diffEditorActiveAnnouncement, ( localize(
-            6657,
+            7264,
             "To control which accessibility signals should be played, the following settings can be configured: {0}.",
             keys.join(", ")
         ))];

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js

@@ -46,7 +46,7 @@ let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Di
                     const helperWidget = store.add(this._instantiationService.createInstance(
                         FloatingEditorClickWidget,
                         this._diffEditor.getModifiedEditor(),
-                        ( localize(6658, "Show Whitespace Differences")),
+                        ( localize(7265, "Show Whitespace Differences")),
                         null
                     ));
                     store.add(helperWidget.onClick(() => {
@@ -63,11 +63,11 @@ let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Di
                 const diffComputationResult = this._diffEditor.getDiffComputationResult();
                 if (diffComputationResult && diffComputationResult.quitEarly) {
                     this._notificationService.prompt(Severity$1.Warning, ( localize(
-                        6659,
+                        7266,
                         "The diff algorithm was stopped early (after {0} ms.)",
                         this._diffEditor.maxComputationTime
                     )), [{
-                        label: ( localize(6660, "Remove Limit")),
+                        label: ( localize(7267, "Remove Limit")),
                         run: () => {
                             this._textResourceConfigurationService.updateValue(
                                 this._diffEditor.getModel().modified.uri,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.d.ts

@@ -6,6 +6,8 @@ import { IContextViewService } from "../../../../../platform/contextview/browser
 import { IKeybindingService } from "../../../../../platform/keybinding/common/keybinding.service.js";
 import { IVerticalSashLayoutProvider, Sash } from "../../../../../base/browser/ui/sash/sash.js";
 import { IHoverService } from "../../../../../platform/hover/browser/hover.service.js";
+import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.service.js";
+import { IAccessibilityService } from "../../../../../platform/accessibility/common/accessibility.service.js";
 interface IFindOptions {
     showCommonFindToggles?: boolean;
     checkImeCompletionState?: boolean;
@@ -23,6 +25,8 @@ interface IFindOptions {
 }
 export declare abstract class SimpleFindWidget extends Widget implements IVerticalSashLayoutProvider {
     private readonly _keybindingService;
+    private readonly _configurationService;
+    private readonly _accessibilityService;
     private readonly _findInput;
     private readonly _domNode;
     private readonly _innerDomNode;
@@ -36,8 +40,15 @@ export declare abstract class SimpleFindWidget extends Widget implements IVertic
     private _isVisible;
     private _foundMatch;
     private _width;
+    /**
+     * Tracks whether the accessibility help hint has been announced in the ARIA label.
+     * Reset to false when the widget is hidden, allowing the hint to be announced again
+     * on the next reveal.
+     */
+    private _accessibilityHelpHintAnnounced;
+    private _labelResetTimeout;
     readonly state: FindReplaceState;
-    constructor(options: IFindOptions, contextViewService: IContextViewService, contextKeyService: IContextKeyService, hoverService: IHoverService, _keybindingService: IKeybindingService);
+    constructor(options: IFindOptions, contextViewService: IContextViewService, contextKeyService: IContextKeyService, hoverService: IHoverService, _keybindingService: IKeybindingService, _configurationService: IConfigurationService, _accessibilityService: IAccessibilityService);
     getVerticalSashLeft(_sash: Sash): number;
     abstract find(previous: boolean): void;
     abstract findFirst(): void;
@@ -70,6 +81,13 @@ export declare abstract class SimpleFindWidget extends Widget implements IVertic
     protected focusFindBox(): void;
     updateResultCount(): Promise<void>;
     changeState(state: INewFindReplaceState): void;
+    /**
+     * Updates the ARIA label of the find input box.
+     * When a screen reader is active and the accessibility verbosity setting is enabled,
+     * includes a hint about pressing Alt+F1 for accessibility help on first reveal.
+     * The hint is only announced once per show/hide cycle to prevent double-speak.
+     */
+    private _updateFindInputAriaLabel;
     private _announceSearchResults;
 }
 export declare const simpleFindWidgetSashBorder: string;

package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js

@@ -4,7 +4,7 @@ import * as simpleFindWidget from './simpleFindWidget.css';
 import { localize } from '../../../../../nls.js';
 import { createElement, trackFocus, addDisposableListener, getComputedStyle, createTextNode } from '../../../../../base/browser/dom.js';
 import { Widget } from '../../../../../base/browser/ui/widget.js';
-import { Delayer } from '../../../../../base/common/async.js';
+import { Delayer, disposableTimeout } from '../../../../../base/common/async.js';
 import { KeyCode } from '../../../../../base/common/keyCodes.js';
 import { FindReplaceState } from '../../../../../editor/contrib/find/browser/findState.js';
 import { SimpleButton, findPreviousMatchIcon, findNextMatchIcon, NLS_MATCHES_LOCATION, NLS_NO_RESULTS } from '../../../../../editor/contrib/find/browser/findWidget.js';
@@ -29,11 +29,11 @@ import '../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../platform/theme/common/colors/searchColors.js';
 
 registerCss(simpleFindWidget);
-const NLS_FIND_INPUT_LABEL = ( localize(6667, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localize(6668, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(6669, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localize(6670, "Next Match"));
-const NLS_CLOSE_BTN_LABEL = ( localize(6671, "Close"));
+const NLS_FIND_INPUT_LABEL = ( localize(7274, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(7275, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(7276, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(7277, "Next Match"));
+const NLS_CLOSE_BTN_LABEL = ( localize(7278, "Close"));
 const SIMPLE_FIND_WIDGET_INITIAL_WIDTH = 310;
 const MATCHES_COUNT_WIDTH = 73;
 class SimpleFindWidget extends Widget {
@@ -42,13 +42,18 @@ class SimpleFindWidget extends Widget {
         contextViewService,
         contextKeyService,
         hoverService,
-        _keybindingService
+        _keybindingService,
+        _configurationService,
+        _accessibilityService
     ) {
         super();
         this._keybindingService = _keybindingService;
+        this._configurationService = _configurationService;
+        this._accessibilityService = _accessibilityService;
         this._isVisible = false;
         this._foundMatch = false;
         this._width = 0;
+        this._accessibilityHelpHintAnnounced = false;
         this.state = this._register(( new FindReplaceState()));
         this._matchesLimit = options.matchesLimit ?? Number.MAX_SAFE_INTEGER;
         this._findInput = this._register(( new ContextScopedFindInput(null, contextViewService, {
@@ -242,6 +247,7 @@ class SimpleFindWidget extends Widget {
             return;
         }
         this._isVisible = true;
+        this._updateFindInputAriaLabel();
         this.updateResultCount();
         this.layout();
         setTimeout(() => {
@@ -269,6 +275,7 @@ class SimpleFindWidget extends Widget {
     }
     hide(animated = true) {
         if (this._isVisible) {
+            this._accessibilityHelpHintAnnounced = false;
             this._innerDomNode.classList.toggle("suppress-transition", !animated);
             this._innerDomNode.classList.remove("visible-transition");
             this._innerDomNode.setAttribute("aria-hidden", "true");
@@ -347,14 +354,31 @@ class SimpleFindWidget extends Widget {
     changeState(state) {
         this.state.change(state, false);
     }
+    _updateFindInputAriaLabel() {
+        let findLabel = NLS_FIND_INPUT_LABEL;
+        if (!this._accessibilityHelpHintAnnounced && this._configurationService.getValue("accessibility.verbosity.find") && this._accessibilityService.isScreenReaderOptimized()) {
+            const keybinding = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelp")?.getAriaLabel();
+            if (keybinding) {
+                findLabel += ", " + ( localize(7279, "Press {0} for accessibility help", keybinding));
+                this._accessibilityHelpHintAnnounced = true;
+                this._labelResetTimeout?.dispose();
+                this._labelResetTimeout = disposableTimeout(() => {
+                    if (this._isVisible) {
+                        this._findInput.inputBox.setAriaLabel(NLS_FIND_INPUT_LABEL);
+                    }
+                }, 1000);
+            }
+        }
+        this._findInput.inputBox.setAriaLabel(findLabel);
+    }
     _announceSearchResults(label, searchString) {
         if (!searchString) {
-            return localize(6672, "Enter search input");
+            return localize(7280, "Enter search input");
         }
         if (label === NLS_NO_RESULTS) {
-            return searchString === "" ? ( localize(6673, "{0} found", label)) : ( localize(6674, "{0} found for '{1}'", label, searchString));
+            return searchString === "" ? ( localize(7281, "{0} found", label)) : ( localize(7282, "{0} found for '{1}'", label, searchString));
         }
-        return localize(6675, "{0} found for '{1}'", label, searchString);
+        return localize(7283, "{0} found for '{1}'", label, searchString);
     }
 }
 const simpleFindWidgetSashBorder = registerColor("simpleFindWidget.sashBorder", {
@@ -362,7 +386,7 @@ const simpleFindWidgetSashBorder = registerColor("simpleFindWidget.sashBorder",
     light: "#C8C8C8",
     hcDark: "#6FC3DF",
     hcLight: "#0F4A85"
-}, ( localize(6676, "Border color of the sash border.")));
+}, ( localize(7284, "Border color of the sash border.")));
 registerThemingParticipant((theme, collector) => {
     const resizeBorderBackground = theme.getColor(simpleFindWidgetSashBorder);
     collector.addRule(

package/vscode/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js

@@ -103,7 +103,7 @@ class InspectEditorTokens extends EditorAction {
     constructor() {
         super({
             id: "editor.action.inspectTMScopes",
-            label: ( localize2(6677, "Developer: Inspect Editor Tokens and Scopes")),
+            label: ( localize2(7285, "Developer: Inspect Editor Tokens and Scopes")),
             precondition: undefined
         });
     }
@@ -186,7 +186,7 @@ class InspectEditorTokensWidget extends Disposable {
         const backend = this._model.tokenization.tokens.get();
         const asTreeSitterBackend = backend instanceof TreeSitterSyntaxTokenBackend ? backend : undefined;
         clearNode(this._domNode);
-        this._domNode.appendChild(createTextNode(( localize(6678, "Loading..."))));
+        this._domNode.appendChild(createTextNode(( localize(7286, "Loading..."))));
         Promise.all([grammar, semanticTokens]).then(([grammar, semanticTokens]) => {
             if (this._isDisposed) {
                 return;

package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js

@@ -28,15 +28,15 @@ let LargeFileOptimizationsWarner = class LargeFileOptimizationsWarner extends Di
         }
         if (model.isTooLargeForTokenization()) {
             const message = ( localize(
-                6679,
+                7287,
                 "{0}: tokenization, wrapping, folding, codelens, word highlighting and sticky scroll have been turned off for this large file in order to reduce memory usage and avoid freezing or crashing.",
                 basename(model.uri.path)
             ));
             this._notificationService.prompt(Severity$1.Info, message, [{
-                label: ( localize(6680, "Forcefully Enable Features")),
+                label: ( localize(7288, "Forcefully Enable Features")),
                 run: () => {
                     this._configurationService.updateValue(`editor.largeFileOptimizations`, false).then(() => {
-                        this._notificationService.info(( localize(6681, "Please reopen file in order for this setting to take effect.")));
+                        this._notificationService.info(( localize(7289, "Please reopen file in order for this setting to take effect.")));
                     }, err => {
                         this._notificationService.error(err);
                     });

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.d.ts

@@ -9,16 +9,14 @@ import { DisposableStore, IDisposable } from "../../../../../base/common/lifecyc
 import { CancellationToken } from "../../../../../base/common/cancellation.js";
 import { IQuickAccessTextEditorContext } from "../../../../../editor/contrib/quickAccess/browser/editorNavigationQuickAccess.js";
 import { IOutlineService } from "../../../../services/outline/browser/outline.service.js";
-import { IEditorGroupsService } from "../../../../services/editor/common/editorGroupsService.service.js";
 import { IOutlineModelService } from "../../../../../editor/contrib/documentSymbols/browser/outlineModel.service.js";
 import { ILanguageFeaturesService } from "../../../../../editor/common/services/languageFeatures.service.js";
 export declare class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccessProvider {
     private readonly editorService;
-    private readonly editorGroupService;
     private readonly configurationService;
     private readonly outlineService;
     protected readonly onDidActiveTextEditorControlChange: Event<void>;
-    constructor(editorService: IEditorService, editorGroupService: IEditorGroupsService, configurationService: IConfigurationService, languageFeaturesService: ILanguageFeaturesService, outlineService: IOutlineService, outlineModelService: IOutlineModelService);
+    constructor(editorService: IEditorService, configurationService: IConfigurationService, languageFeaturesService: ILanguageFeaturesService, outlineService: IOutlineService, outlineModelService: IOutlineModelService);
     private get configuration();
     protected get activeTextEditorControl(): import("../../../../../editor/common/editorCommon.js").IEditor | undefined;
     protected gotoLocation(context: IQuickAccessTextEditorContext, options: {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js

@@ -3,6 +3,7 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { localize, localize2 } from '../../../../../nls.js';
 import { ItemActivation } from '../../../../../platform/quickinput/common/quickInput.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.service.js';
+import { SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { Registry } from '../../../../../platform/registry/common/platform.js';
 import { Extensions } from '../../../../../platform/quickinput/common/quickAccess.js';
@@ -21,7 +22,6 @@ import { KeybindingWeight } from '../../../../../platform/keybinding/common/keyb
 import { OutlineTarget } from '../../../../services/outline/browser/outline.js';
 import { IOutlineService } from '../../../../services/outline/browser/outline.service.js';
 import { isCompositeEditor } from '../../../../../editor/browser/editorBrowser.js';
-import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.service.js';
 import { IOutlineModelService } from '../../../../../editor/contrib/documentSymbols/browser/outlineModel.service.js';
 import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.service.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
@@ -35,7 +35,6 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
     }
     constructor(
         editorService,
-        editorGroupService,
         configurationService,
         languageFeaturesService,
         outlineService,
@@ -45,7 +44,6 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
             openSideBySideDirection: () => this.configuration.openSideBySideDirection
         });
         this.editorService = editorService;
-        this.editorGroupService = editorGroupService;
         this.configurationService = configurationService;
         this.outlineService = outlineService;
         this.onDidActiveTextEditorControlChange = this.editorService.onDidActiveEditorChange;
@@ -71,7 +69,7 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
                 pinned: options.keyMods.ctrlCmd || this.configuration.openEditorPinned,
                 preserveFocus: options.preserveFocus
             };
-            this.editorGroupService.sideGroup.openEditor(this.editorService.activeEditor, editorOptions);
+            this.editorService.openEditor(this.editorService.activeEditor, editorOptions, SIDE_GROUP);
         }
         else {
             super.gotoLocation(context, options);
@@ -179,7 +177,7 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
                     return true;
                 });
                 if (filteredItems.length === 0) {
-                    const label = ( localize(6692, "No matching entries"));
+                    const label = ( localize(7300, "No matching entries"));
                     picker.items = [{
                         label,
                         index: -1,
@@ -211,7 +209,7 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
         return disposables;
     }
 };
-GotoSymbolQuickAccessProvider = GotoSymbolQuickAccessProvider_1 = ( __decorate([( __param(0, IEditorService)), ( __param(1, IEditorGroupsService)), ( __param(2, IConfigurationService)), ( __param(3, ILanguageFeaturesService)), ( __param(4, IOutlineService)), ( __param(5, IOutlineModelService))], GotoSymbolQuickAccessProvider));
+GotoSymbolQuickAccessProvider = GotoSymbolQuickAccessProvider_1 = ( __decorate([( __param(0, IEditorService)), ( __param(1, IConfigurationService)), ( __param(2, ILanguageFeaturesService)), ( __param(3, IOutlineService)), ( __param(4, IOutlineModelService))], GotoSymbolQuickAccessProvider));
 class GotoSymbolAction extends Action2 {
     static {
         this.ID = "workbench.action.gotoSymbol";
@@ -220,8 +218,8 @@ class GotoSymbolAction extends Action2 {
         super({
             id: GotoSymbolAction.ID,
             title: {
-                ...( localize2(6693, "Go to Symbol in Editor...")),
-                mnemonicTitle: ( localize(6694, "Go to &&Symbol in Editor..."))
+                ...( localize2(7301, "Go to Symbol in Editor...")),
+                mnemonicTitle: ( localize(7302, "Go to &&Symbol in Editor..."))
             },
             f1: true,
             keybinding: {
@@ -247,14 +245,14 @@ registerAction2(GotoSymbolAction);
     ctor: GotoSymbolQuickAccessProvider,
     prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
     contextKey: "inFileSymbolsPicker",
-    placeholder: ( localize(6695, "Type the name of a symbol to go to.")),
+    placeholder: ( localize(7303, "Type the name of a symbol to go to.")),
     helpEntries: [{
-        description: ( localize(6696, "Go to Symbol in Editor")),
+        description: ( localize(7304, "Go to Symbol in Editor")),
         prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
         commandId: GotoSymbolAction.ID,
         commandCenterOrder: 40
     }, {
-        description: ( localize(6697, "Go to Symbol in Editor by Category")),
+        description: ( localize(7305, "Go to Symbol in Editor by Category")),
         prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX_BY_CATEGORY
     }]
 });

package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js

@@ -206,7 +206,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         const nestedProgress = ( new Progress(provider => {
             progress.report({
                 message: ( localize(
-                    6698,
+                    7306,
                     "Running '{0}' Formatter ([configure]({1})).",
                     provider.displayName || provider.extensionId && provider.extensionId.value || "???",
                     (createCommandUri("workbench.action.openSettings", "editor.formatOnSave").toString())
@@ -352,7 +352,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disp
         }
         const excludedActions = Array.isArray(setting) ? [] : ( ( Object.keys(setting)).filter(x => setting[x] === "never" || false).map(x => ( new HierarchicalKind(x))));
         progress.report({
-            message: ( localize(6699, "Quick Fixes"))
+            message: ( localize(7307, "Quick Fixes"))
         });
         const filteredSaveList = Array.isArray(setting) ? codeActionsOnSave : codeActionsOnSave.filter(
             x => setting[x.value] === "always" || ((setting[x.value] === "explicit" || setting[x.value] === true) && context.reason === SaveReason.EXPLICIT)
@@ -373,7 +373,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disp
             _report() {
                 progress.report({
                     message: ( localize(
-                        6700,
+                        7308,
                         "Getting code actions from {0} ([configure]({1})).",
                         ( [...this._names].map(name => `'${name}'`)).join(", "),
                         (createCommandUri("workbench.action.openSettings", "editor.codeActionsOnSave").toString())
@@ -396,7 +396,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disp
             try {
                 for (const action of actionsToRun.validActions) {
                     progress.report({
-                        message: ( localize(6701, "Applying code action '{0}'.", action.action.title))
+                        message: ( localize(7309, "Applying code action '{0}'.", action.action.title))
                     });
                     await this.instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
                     if (token.isCancellationRequested) {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js

@@ -59,9 +59,9 @@ let SuggestEnabledInput = class SuggestEnabledInput extends Widget {
         configurationService
     ) {
         super();
-        this._onShouldFocusResults = ( new Emitter());
+        this._onShouldFocusResults = this._register(( new Emitter()));
         this.onShouldFocusResults = this._onShouldFocusResults.event;
-        this._onInputDidChange = ( new Emitter());
+        this._onInputDidChange = this._register(( new Emitter()));
         this.onInputDidChange = this._onInputDidChange.event;
         this._onDidFocus = this._register(( new Emitter()));
         this.onDidFocus = this._onDidFocus.event;

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js

@@ -13,8 +13,8 @@ class ToggleMinimapAction extends Action2 {
         super({
             id: ToggleMinimapAction.ID,
             title: {
-                ...( localize2(6702, "Toggle Minimap")),
-                mnemonicTitle: ( localize(6703, "&&Minimap"))
+                ...( localize2(7310, "Toggle Minimap")),
+                mnemonicTitle: ( localize(7311, "&&Minimap"))
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js

@@ -21,7 +21,7 @@ class ToggleMultiCursorModifierAction extends Action2 {
     constructor() {
         super({
             id: ToggleMultiCursorModifierAction.ID,
-            title: ( localize2(6704, "Toggle Multi-Cursor Modifier")),
+            title: ( localize2(7312, "Toggle Multi-Cursor Modifier")),
             f1: true
         });
     }
@@ -61,7 +61,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
     group: "4_config",
     command: {
         id: ToggleMultiCursorModifierAction.ID,
-        title: ( localize(6705, "Switch to Alt+Click for Multi-Cursor"))
+        title: ( localize(7313, "Switch to Alt+Click for Multi-Cursor"))
     },
     when: ( multiCursorModifier.isEqualTo("ctrlCmd")),
     order: 1
@@ -70,7 +70,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
     group: "4_config",
     command: {
         id: ToggleMultiCursorModifierAction.ID,
-        title: (isMacintosh ? ( localize(6706, "Switch to Cmd+Click for Multi-Cursor")) : ( localize(6707, "Switch to Ctrl+Click for Multi-Cursor")))
+        title: (isMacintosh ? ( localize(7314, "Switch to Cmd+Click for Multi-Cursor")) : ( localize(7315, "Switch to Ctrl+Click for Multi-Cursor")))
     },
     when: ( multiCursorModifier.isEqualTo("altKey")),
     order: 1

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js

@@ -13,8 +13,8 @@ class ToggleRenderControlCharacterAction extends Action2 {
         super({
             id: ToggleRenderControlCharacterAction.ID,
             title: {
-                ...( localize2(6708, "Toggle Control Characters")),
-                mnemonicTitle: ( localize(6709, "Render &&Control Characters"))
+                ...( localize2(7316, "Toggle Control Characters")),
+                mnemonicTitle: ( localize(7317, "Render &&Control Characters"))
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js

@@ -13,8 +13,8 @@ class ToggleRenderWhitespaceAction extends Action2 {
         super({
             id: ToggleRenderWhitespaceAction.ID,
             title: {
-                ...( localize2(6710, "Toggle Render Whitespace")),
-                mnemonicTitle: ( localize(6711, "&&Render Whitespace"))
+                ...( localize2(7318, "Toggle Render Whitespace")),
+                mnemonicTitle: ( localize(7319, "&&Render Whitespace"))
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js

@@ -24,7 +24,7 @@ const transientWordWrapState = "transientWordWrapState";
 const isWordWrapMinifiedKey = "isWordWrapMinified";
 const isDominatedByLongLinesKey = "isDominatedByLongLines";
 const CAN_TOGGLE_WORD_WRAP = ( new RawContextKey("canToggleWordWrap", false, true));
-const EDITOR_WORD_WRAP = ( new RawContextKey("editorWordWrap", false, ( localize(6712, "Whether the editor is currently using word wrapping."))));
+const EDITOR_WORD_WRAP = ( new RawContextKey("editorWordWrap", false, ( localize(7320, "Whether the editor is currently using word wrapping."))));
 function writeTransientState(model, state, codeEditorService) {
     codeEditorService.setTransientModelProperty(model, transientWordWrapState, state);
 }
@@ -36,7 +36,7 @@ class ToggleWordWrapAction extends EditorAction {
     constructor() {
         super({
             id: TOGGLE_WORD_WRAP_ID,
-            label: ( localize2(6713, "View: Toggle Word Wrap")),
+            label: ( localize2(7321, "View: Toggle Word Wrap")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
@@ -205,7 +205,7 @@ let EditorWordWrapContextKeyTracker = class EditorWordWrapContextKeyTracker exte
         this._canToggleWordWrap = CAN_TOGGLE_WORD_WRAP.bindTo(this._contextService);
         this._editorWordWrap = EDITOR_WORD_WRAP.bindTo(this._contextService);
         this._activeEditor = null;
-        this._activeEditorListener = ( new DisposableStore());
+        this._activeEditorListener = this._register(( new DisposableStore()));
         this._update();
     }
     _update() {
@@ -254,7 +254,7 @@ registerEditorAction(ToggleWordWrapAction);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localize(6714, "Disable wrapping for this file")),
+        title: ( localize(7322, "Disable wrapping for this file")),
         icon: Codicon.wordWrap
     },
     group: "navigation",
@@ -264,7 +264,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localize(6715, "Enable wrapping for this file")),
+        title: ( localize(7323, "Enable wrapping for this file")),
         icon: Codicon.wordWrap
     },
     group: "navigation",
@@ -274,7 +274,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localize(6716, "&&Word Wrap")),
+        title: ( localize(7324, "&&Word Wrap")),
         toggled: EDITOR_WORD_WRAP,
         precondition: CAN_TOGGLE_WORD_WRAP
     },