@codingame/monaco-vscode-api 7.1.0 → 7.1.1

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

@@ -8,7 +8,7 @@ import '../../../../base/common/cancellation.js';
 import { registerDiffEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import '../../../../platform/notification/common/notification.js';
@@ -18,7 +18,6 @@ import { FloatingEditorClickWidget } from '../../../browser/codeeditor.js';
 import { Extensions } from '../../../common/configuration.js';
 import { DiffEditorAccessibilityHelp } from './diffEditorAccessibilityHelp.js';
 import Severity$1 from '../../../../base/common/severity.js';
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/diffEditorHelper";
 let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Disposable {
     static { this.ID = 'editor.contrib.diffEditorHelper'; }
     constructor(_diffEditor, _instantiationService, _textResourceConfigurationService, _notificationService) {
@@ -33,7 +32,7 @@ let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Di
             const onlyWhiteSpaceChange = ( (computationResult.map(r => r && !r.identical && r.changes2.length === 0)));
             this._register(autorunWithStore((reader, store) => {
                 if (onlyWhiteSpaceChange.read(reader)) {
-                    const helperWidget = store.add(this._instantiationService.createInstance(FloatingEditorClickWidget, this._diffEditor.getModifiedEditor(), ( localizeWithPath(_moduleId, 0, "Show Whitespace Differences")), null));
+                    const helperWidget = store.add(this._instantiationService.createInstance(FloatingEditorClickWidget, this._diffEditor.getModifiedEditor(), ( localize(1001, "Show Whitespace Differences")), null));
                     store.add(helperWidget.onClick(() => {
                         this._textResourceConfigurationService.updateValue(this._diffEditor.getModel().modified.uri, 'diffEditor.ignoreTrimWhitespace', false);
                     }));
@@ -43,13 +42,12 @@ let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Di
             this._register(this._diffEditor.onDidUpdateDiff(() => {
                 const diffComputationResult = this._diffEditor.getDiffComputationResult();
                 if (diffComputationResult && diffComputationResult.quitEarly) {
-                    this._notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
-                        _moduleId,
-                        1,
+                    this._notificationService.prompt(Severity$1.Warning, ( localize(
+                        1002,
                         "The diff algorithm was stopped early (after {0} ms.)",
                         this._diffEditor.maxComputationTime
                     )), [{
-                            label: ( localizeWithPath(_moduleId, 2, "Remove Limit")),
+                            label: ( localize(1003, "Remove Limit")),
                             run: () => {
                                 this._textResourceConfigurationService.updateValue(this._diffEditor.getModel().modified.uri, 'diffEditor.maxComputationTime', 0);
                             }

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

@@ -1,5 +1,5 @@
 import './simpleFindWidget.css.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { trackFocus, addDisposableListener, getComputedStyle } from '../../../../../base/browser/dom.js';
 import { Widget } from '../../../../../base/browser/ui/widget.js';
 import { Delayer } from '../../../../../base/common/async.js';
@@ -25,12 +25,11 @@ 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';
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget";
-const NLS_FIND_INPUT_LABEL = ( localizeWithPath(_moduleId, 0, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localizeWithPath(_moduleId, 1, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localizeWithPath(_moduleId, 2, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localizeWithPath(_moduleId, 3, "Next Match"));
-const NLS_CLOSE_BTN_LABEL = ( localizeWithPath(_moduleId, 4, "Close"));
+const NLS_FIND_INPUT_LABEL = ( localize(11443, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(11444, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(11445, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(11446, "Next Match"));
+const NLS_CLOSE_BTN_LABEL = ( localize(11447, "Close"));
 const SIMPLE_FIND_WIDGET_INITIAL_WIDTH = 310;
 const MATCHES_COUNT_WIDTH = 73;
 class SimpleFindWidget extends Widget {
@@ -332,17 +331,17 @@ class SimpleFindWidget extends Widget {
     }
     _announceSearchResults(label, searchString) {
         if (!searchString) {
-            return ( localizeWithPath(_moduleId, 5, "Enter search input"));
+            return ( localize(11448, "Enter search input"));
         }
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localizeWithPath(_moduleId, 6, "{0} found", label))
-                : ( localizeWithPath(_moduleId, 7, "{0} found for '{1}'", label, searchString));
+                ? ( localize(11449, "{0} found", label))
+                : ( localize(11450, "{0} found for '{1}'", label, searchString));
         }
-        return ( localizeWithPath(_moduleId, 8, "{0} found for '{1}'", label, searchString));
+        return ( localize(11451, "{0} found for '{1}'", label, searchString));
     }
 }
-const simpleFindWidgetSashBorder = registerColor('simpleFindWidget.sashBorder', { dark: '#454545', light: '#C8C8C8', hcDark: '#6FC3DF', hcLight: '#0F4A85' }, ( localizeWithPath(_moduleId, 9, 'Border color of the sash border.')));
+const simpleFindWidgetSashBorder = registerColor('simpleFindWidget.sashBorder', { dark: '#454545', light: '#C8C8C8', hcDark: '#6FC3DF', hcLight: '#0F4A85' }, ( localize(11452, 'Border color of the sash border.')));
 registerThemingParticipant((theme, collector) => {
     const resizeBorderBackground = theme.getColor(simpleFindWidgetSashBorder);
     collector.addRule(`.monaco-workbench .simple-find-part .monaco-sash { background-color: ${resizeBorderBackground}; border-color: ${resizeBorderBackground} }`);

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { basename } from '../../../../base/common/path.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { registerEditorContribution, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
@@ -7,7 +7,6 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/largeFileOptimizations";
 let LargeFileOptimizationsWarner = class LargeFileOptimizationsWarner extends Disposable {
     static { this.ID = 'editor.contrib.largeFileOptimizationsWarner'; }
     constructor(_editor, _notificationService, _configurationService) {
@@ -24,22 +23,17 @@ let LargeFileOptimizationsWarner = class LargeFileOptimizationsWarner extends Di
             return;
         }
         if (model.isTooLargeForTokenization()) {
-            const message = ( localizeWithPath(
-                _moduleId,
-                0,
+            const message = ( localize(
+                1004,
                 "{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: ( localizeWithPath(_moduleId, 1, "Forcefully Enable Features")),
+                    label: ( localize(1005, "Forcefully Enable Features")),
                     run: () => {
                         this._configurationService.updateValue(`editor.largeFileOptimizations`, false).then(() => {
-                            this._notificationService.info(( localizeWithPath(
-                                _moduleId,
-                                2,
-                                "Please reopen file in order for this setting to take effect."
-                            )));
+                            this._notificationService.info(( localize(1006, "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.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
+import { localize2, localize } from '../../../../../nls.js';
 import { ItemActivation } from '../../../../../platform/quickinput/common/quickInput.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.service.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
@@ -27,7 +27,6 @@ import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contex
 import { accessibleViewIsShown, accessibilityHelpIsShown } from '../../../accessibility/browser/accessibilityConfiguration.js';
 import { parseLabelWithIcons, matchesFuzzyIconAware } from '../../../../../base/common/iconLabels.js';
 var GotoSymbolQuickAccessProvider_1;
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess";
 let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccessProvider {
     static { GotoSymbolQuickAccessProvider_1 = this; }
     constructor(editorService, editorGroupService, configurationService, languageFeaturesService, outlineService, outlineModelService) {
@@ -148,7 +147,7 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
                     return true;
                 });
                 if (filteredItems.length === 0) {
-                    const label = ( localizeWithPath(_moduleId, 0, 'No matching entries'));
+                    const label = ( localize(1166, 'No matching entries'));
                     picker.items = [{ label, index: -1, kind: SymbolKind.String }];
                     picker.ariaLabel = label;
                 }
@@ -192,8 +191,8 @@ class GotoSymbolAction extends Action2 {
         super({
             id: GotoSymbolAction.ID,
             title: {
-                ...( localize2WithPath(_moduleId, 1, "Go to Symbol in Editor...")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 2, "Go to &&Symbol in Editor...")),
+                ...( localize2(1167, "Go to Symbol in Editor...")),
+                mnemonicTitle: ( localize(1168, "Go to &&Symbol in Editor...")),
             },
             f1: true,
             keybinding: {
@@ -220,16 +219,16 @@ registerAction2(GotoSymbolAction);
     ctor: GotoSymbolQuickAccessProvider,
     prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
     contextKey: 'inFileSymbolsPicker',
-    placeholder: ( localizeWithPath(_moduleId, 3, "Type the name of a symbol to go to.")),
+    placeholder: ( localize(1169, "Type the name of a symbol to go to.")),
     helpEntries: [
         {
-            description: ( localizeWithPath(_moduleId, 4, "Go to Symbol in Editor")),
+            description: ( localize(1170, "Go to Symbol in Editor")),
             prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
             commandId: GotoSymbolAction.ID,
             commandCenterOrder: 40
         },
         {
-            description: ( localizeWithPath(_moduleId, 5, "Go to Symbol in Editor by Category")),
+            description: ( localize(1171, "Go to Symbol in Editor by Category")),
             prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX_BY_CATEGORY
         }
     ]

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

@@ -1,4 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { lastNonWhitespaceIndex } from '../../../../base/common/strings.js';
@@ -14,7 +15,7 @@ import { applyCodeAction, ApplyCodeActionReason, getCodeActions } from '../../..
 import { CodeActionKind, CodeActionTriggerSource } from '../../../../editor/contrib/codeAction/common/types.js';
 import { formatDocumentWithSelectedProvider, FormattingMode, formatDocumentRangesWithSelectedProvider } from '../../../../editor/contrib/format/browser/format.js';
 import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
@@ -22,9 +23,10 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions } from '../../../common/contributions.js';
 import { SaveReason } from '../../../common/editor.js';
 import { getModifiedRanges } from '../../format/browser/formatModified.js';
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+import { IHostService } from '../../../services/host/browser/host.service.js';
 import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/saveParticipants";
 let TrimWhitespaceParticipant = class TrimWhitespaceParticipant {
     constructor(configurationService, codeEditorService) {
         this.configurationService = configurationService;
@@ -187,9 +189,8 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         const overrides = { overrideIdentifier: textEditorModel.getLanguageId(), resource: textEditorModel.uri };
         const nestedProgress = ( (new Progress(provider => {
             progress.report({
-                message: ( localizeWithPath(
-                    _moduleId,
-                    0,
+                message: ( localize(
+                    1007,
                     "Running '{0}' Formatter ([configure]({1})).",
                     provider.displayName || provider.extensionId && provider.extensionId.value || '???',
                     'command:workbench.action.openSettings?%5B%22editor.formatOnSave%22%5D'
@@ -221,11 +222,40 @@ FormatOnSaveParticipant = ( (__decorate([
     ( (__param(1, ICodeEditorService))),
     ( (__param(2, IInstantiationService)))
 ], FormatOnSaveParticipant)));
-let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
-    constructor(configurationService, instantiationService, languageFeaturesService) {
+let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disposable {
+    constructor(configurationService, instantiationService, languageFeaturesService, hostService, editorService, codeEditorService) {
+        super();
         this.configurationService = configurationService;
         this.instantiationService = instantiationService;
         this.languageFeaturesService = languageFeaturesService;
+        this.hostService = hostService;
+        this.editorService = editorService;
+        this.codeEditorService = codeEditorService;
+        this._register(this.hostService.onDidChangeFocus(() => { this.triggerCodeActionsCommand(); }));
+        this._register(this.editorService.onDidActiveEditorChange(() => { this.triggerCodeActionsCommand(); }));
+    }
+    async triggerCodeActionsCommand() {
+        if (this.configurationService.getValue('editor.codeActions.triggerOnFocusChange') && this.configurationService.getValue('files.autoSave') === 'afterDelay') {
+            const model = this.codeEditorService.getActiveCodeEditor()?.getModel();
+            if (!model) {
+                return undefined;
+            }
+            const settingsOverrides = { overrideIdentifier: model.getLanguageId(), resource: model.uri };
+            const setting = this.configurationService.getValue('editor.codeActionsOnSave', settingsOverrides);
+            if (!setting) {
+                return undefined;
+            }
+            if (Array.isArray(setting)) {
+                return undefined;
+            }
+            const settingItems = ( (Object.keys(setting))).filter(x => setting[x] && setting[x] === 'always' && CodeActionKind.Source.contains(( (new HierarchicalKind(x)))));
+            const cancellationTokenSource = ( (new CancellationTokenSource()));
+            const codeActionKindList = [];
+            for (const item of settingItems) {
+                codeActionKindList.push(( (new HierarchicalKind(item))));
+            }
+            await this.applyOnSaveActions(model, codeActionKindList, [], Progress.None, cancellationTokenSource.token);
+        }
     }
     async participate(model, context, progress, token) {
         if (!model.textEditorModel) {
@@ -269,7 +299,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
             : ( (( (Object.keys(setting)))
                 .filter(x => setting[x] === 'never' || false)
                 .map(x => ( (new HierarchicalKind(x))))));
-        progress.report({ message: ( localizeWithPath(_moduleId, 1, "Quick Fixes")) });
+        progress.report({ message: ( localize(1008, "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));
         await this.applyOnSaveActions(textEditorModel, filteredSaveList, excludedActions, progress, token);
     }
@@ -286,9 +316,8 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
             }
             _report() {
                 progress.report({
-                    message: ( localizeWithPath(
-                        _moduleId,
-                        2,
+                    message: ( localize(
+                        1009,
                         "Getting code actions from '{0}' ([configure]({1})).",
                         ( ([...this._names].map(name => `'${name}'`))).join(', '),
                         'command:workbench.action.openSettings?%5B%22editor.codeActionsOnSave%22%5D'
@@ -310,7 +339,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
             }
             try {
                 for (const action of actionsToRun.validActions) {
-                    progress.report({ message: ( localizeWithPath(_moduleId, 3, "Applying code action '{0}'.", action.action.title)) });
+                    progress.report({ message: ( localize(1010, "Applying code action '{0}'.", action.action.title)) });
                     await this.instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
                     if (token.isCancellationRequested) {
                         return;
@@ -335,7 +364,10 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
 CodeActionOnSaveParticipant = ( (__decorate([
     ( (__param(0, IConfigurationService))),
     ( (__param(1, IInstantiationService))),
-    ( (__param(2, ILanguageFeaturesService)))
+    ( (__param(2, ILanguageFeaturesService))),
+    ( (__param(3, IHostService))),
+    ( (__param(4, IEditorService))),
+    ( (__param(5, ICodeEditorService)))
 ], CodeActionOnSaveParticipant)));
 let SaveParticipantsContribution = class SaveParticipantsContribution extends Disposable {
     constructor(instantiationService, textFileService) {

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

@@ -1,17 +1,16 @@
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/toggleMinimap";
 class ToggleMinimapAction extends Action2 {
     static { this.ID = 'editor.action.toggleMinimap'; }
     constructor() {
         super({
             id: ToggleMinimapAction.ID,
             title: {
-                ...( localize2WithPath(_moduleId, 0, "Toggle Minimap")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Minimap")),
+                ...( localize2(1011, "Toggle Minimap")),
+                mnemonicTitle: ( localize(1012, "&&Minimap")),
             },
             category: Categories.View,
             f1: true,

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { Action2, registerAction2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -9,14 +9,13 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions } from '../../../common/contributions.js';
 import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier";
 class ToggleMultiCursorModifierAction extends Action2 {
     static { this.ID = 'workbench.action.toggleMultiCursorModifier'; }
     static { this.multiCursorModifierConfigurationKey = 'editor.multiCursorModifier'; }
     constructor() {
         super({
             id: ToggleMultiCursorModifierAction.ID,
-            title: ( localize2WithPath(_moduleId, 0, 'Toggle Multi-Cursor Modifier')),
+            title: ( localize2(1013, 'Toggle Multi-Cursor Modifier')),
             f1: true
         });
     }
@@ -56,7 +55,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
     group: '4_config',
     command: {
         id: ToggleMultiCursorModifierAction.ID,
-        title: ( localizeWithPath(_moduleId, 1, "Switch to Alt+Click for Multi-Cursor"))
+        title: ( localize(1014, "Switch to Alt+Click for Multi-Cursor"))
     },
     when: ( (multiCursorModifier.isEqualTo('ctrlCmd'))),
     order: 1
@@ -66,8 +65,8 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
     command: {
         id: ToggleMultiCursorModifierAction.ID,
         title: (isMacintosh
-            ? ( localizeWithPath(_moduleId, 2, "Switch to Cmd+Click for Multi-Cursor"))
-            : ( localizeWithPath(_moduleId, 3, "Switch to Ctrl+Click for Multi-Cursor")))
+            ? ( localize(1015, "Switch to Cmd+Click for Multi-Cursor"))
+            : ( localize(1016, "Switch to Ctrl+Click for Multi-Cursor")))
     },
     when: ( (multiCursorModifier.isEqualTo('altKey'))),
     order: 1

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

@@ -1,17 +1,16 @@
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter";
 class ToggleRenderControlCharacterAction extends Action2 {
     static { this.ID = 'editor.action.toggleRenderControlCharacter'; }
     constructor() {
         super({
             id: ToggleRenderControlCharacterAction.ID,
             title: {
-                ...( localize2WithPath(_moduleId, 0, "Toggle Control Characters")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 1, "Render &&Control Characters")),
+                ...( localize2(1017, "Toggle Control Characters")),
+                mnemonicTitle: ( localize(1018, "Render &&Control Characters")),
             },
             category: Categories.View,
             f1: true,

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

@@ -1,17 +1,16 @@
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace";
 class ToggleRenderWhitespaceAction extends Action2 {
     static { this.ID = 'editor.action.toggleRenderWhitespace'; }
     constructor() {
         super({
             id: ToggleRenderWhitespaceAction.ID,
             title: {
-                ...( localize2WithPath(_moduleId, 0, "Toggle Render Whitespace")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Render Whitespace")),
+                ...( localize2(1024, "Toggle Render Whitespace")),
+                mnemonicTitle: ( localize(1025, "&&Render Whitespace")),
             },
             category: Categories.View,
             f1: true,

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

@@ -9,19 +9,18 @@ import { registerEditorContribution, registerDiffEditorContribution, registerEdi
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/toggleWordWrap";
 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, ( localizeWithPath(_moduleId, 0, 'Whether the editor is currently using word wrapping.')))));
+const EDITOR_WORD_WRAP = ( (new RawContextKey('editorWordWrap', false, ( localize(1019, 'Whether the editor is currently using word wrapping.')))));
 function writeTransientState(model, state, codeEditorService) {
     codeEditorService.setTransientModelProperty(model, transientWordWrapState, state);
 }
@@ -33,7 +32,7 @@ class ToggleWordWrapAction extends EditorAction {
     constructor() {
         super({
             id: TOGGLE_WORD_WRAP_ID,
-            label: ( localizeWithPath(_moduleId, 1, "View: Toggle Word Wrap")),
+            label: ( localize(1020, "View: Toggle Word Wrap")),
             alias: 'View: Toggle Word Wrap',
             precondition: undefined,
             kbOpts: {
@@ -252,7 +251,7 @@ registerEditorAction(ToggleWordWrapAction);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localizeWithPath(_moduleId, 2, "Disable wrapping for this file")),
+        title: ( localize(1021, "Disable wrapping for this file")),
         icon: Codicon.wordWrap
     },
     group: 'navigation',
@@ -265,7 +264,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localizeWithPath(_moduleId, 3, "Enable wrapping for this file")),
+        title: ( localize(1022, "Enable wrapping for this file")),
         icon: Codicon.wordWrap
     },
     group: 'navigation',
@@ -279,7 +278,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localizeWithPath(_moduleId, 4, "&&Word Wrap")),
+        title: ( localize(1023, "&&Word Wrap")),
         toggled: EDITOR_WORD_WRAP,
         precondition: CAN_TOGGLE_WORD_WRAP
     },

package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js

@@ -1,6 +1,6 @@
 import { CommentThreadState } from '../../../../editor/common/languages.js';
 import { peekViewTitleBackground } from '../../../../editor/contrib/peekView/browser/peekView.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
 import { disabledForeground, contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -12,16 +12,14 @@ 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';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentColors";
-const resolvedCommentViewIcon = registerColor('commentsView.resolvedIcon', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 0, 'Icon color for resolved comments.')));
-const unresolvedCommentViewIcon = registerColor('commentsView.unresolvedIcon', { dark: listFocusOutline, light: listFocusOutline, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 1, 'Icon color for unresolved comments.')));
-registerColor('editorCommentsWidget.replyInputBackground', peekViewTitleBackground, ( localizeWithPath(_moduleId, 2, 'Background color for comment reply input box.')));
-const resolvedCommentBorder = registerColor('editorCommentsWidget.resolvedBorder', { dark: resolvedCommentViewIcon, light: resolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 3, 'Color of borders and arrow for resolved comments.')));
-const unresolvedCommentBorder = registerColor('editorCommentsWidget.unresolvedBorder', { dark: unresolvedCommentViewIcon, light: unresolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 4, 'Color of borders and arrow for unresolved comments.')));
-registerColor('editorCommentsWidget.rangeBackground', ( (transparent(unresolvedCommentBorder, .1))), ( localizeWithPath(_moduleId, 5, 'Color of background for comment ranges.')));
-registerColor('editorCommentsWidget.rangeActiveBackground', ( (transparent(unresolvedCommentBorder, .1))), ( localizeWithPath(
-    _moduleId,
-    6,
+const resolvedCommentViewIcon = registerColor('commentsView.resolvedIcon', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(9987, 'Icon color for resolved comments.')));
+const unresolvedCommentViewIcon = registerColor('commentsView.unresolvedIcon', { dark: listFocusOutline, light: listFocusOutline, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(9988, 'Icon color for unresolved comments.')));
+registerColor('editorCommentsWidget.replyInputBackground', peekViewTitleBackground, ( localize(9989, 'Background color for comment reply input box.')));
+const resolvedCommentBorder = registerColor('editorCommentsWidget.resolvedBorder', { dark: resolvedCommentViewIcon, light: resolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(9990, 'Color of borders and arrow for resolved comments.')));
+const unresolvedCommentBorder = registerColor('editorCommentsWidget.unresolvedBorder', { dark: unresolvedCommentViewIcon, light: unresolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(9991, 'Color of borders and arrow for unresolved comments.')));
+registerColor('editorCommentsWidget.rangeBackground', ( (transparent(unresolvedCommentBorder, .1))), ( localize(9992, 'Color of background for comment ranges.')));
+registerColor('editorCommentsWidget.rangeActiveBackground', ( (transparent(unresolvedCommentBorder, .1))), ( localize(
+    9993,
     'Color of background for currently selected or hovered comment range.'
 )));
 const commentThreadStateBorderColors = ( (new Map([

package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { Color } from '../../../../base/common/color.js';
 import { ContentWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js';
 import { OverviewRulerLane } from '../../../../editor/common/model.js';
@@ -16,26 +16,21 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 import { CommentThreadState } from '../../../../editor/common/languages.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentGlyphWidget";
-const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: ( (darken(opaque(listInactiveSelectionBackground, editorBackground), .05))), hcDark: Color.white, hcLight: Color.black }, ( localizeWithPath(
-    _moduleId,
-    0,
+const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: ( (darken(opaque(listInactiveSelectionBackground, editorBackground), .05))), hcDark: Color.white, hcLight: Color.black }, ( localize(
+    10014,
     'Editor gutter decoration color for commenting ranges. This color should be opaque.'
 )));
-const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', overviewRulerCommentingRangeForeground, ( localizeWithPath(
-    _moduleId,
-    1,
+const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', overviewRulerCommentingRangeForeground, ( localize(
+    10015,
     'Editor overview ruler decoration color for resolved comments. This color should be opaque.'
 )));
-const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', overviewRulerCommentForeground, ( localizeWithPath(
-    _moduleId,
-    2,
+const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', overviewRulerCommentForeground, ( localize(
+    10016,
     'Editor overview ruler decoration color for unresolved comments. This color should be opaque.'
 )));
-const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( localizeWithPath(_moduleId, 3, 'Editor gutter decoration color for commenting glyphs.')));
-registerColor('editorGutter.commentUnresolvedGlyphForeground', editorGutterCommentGlyphForeground, ( localizeWithPath(
-    _moduleId,
-    4,
+const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( localize(10017, 'Editor gutter decoration color for commenting glyphs.')));
+registerColor('editorGutter.commentUnresolvedGlyphForeground', editorGutterCommentGlyphForeground, ( localize(
+    10018,
     'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'
 )));
 class CommentGlyphWidget {

package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { $, append, addDisposableListener, EventType, scheduleAtNextAnimationFrame, getWindow, getContentWidth, getContentHeight } from '../../../../base/browser/dom.js';
 import { CommentMode } from '../../../../editor/common/languages.js';
 import { ActionsOrientation, ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
@@ -39,7 +39,6 @@ import { IAccessibilityService } from '../../../../platform/accessibility/common
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentNode";
 class CommentsActionRunner extends ActionRunner {
     async runAction(action, context) {
         await action.run(...context);
@@ -79,7 +78,7 @@ let CommentNode = class CommentNode extends Disposable {
         this._onDidClick = ( (new Emitter()));
         this.isEditing = false;
         this._domNode = $('div.review-comment');
-        this._contextKeyService = contextKeyService.createScoped(this._domNode);
+        this._contextKeyService = this._register(contextKeyService.createScoped(this._domNode));
         this._commentContextValue = CommentContextKeys.commentContext.bindTo(this._contextKeyService);
         if (this.comment.contextValue) {
             this._commentContextValue.set(this.comment.contextValue);
@@ -317,7 +316,7 @@ let CommentNode = class CommentNode extends Disposable {
     createReactionPicker(reactionGroup) {
         const toggleReactionAction = this._register(( (new ToggleReactionsAction(() => {
             toggleReactionActionViewItem?.show();
-        }, ( localizeWithPath(_moduleId, 0, "Toggle Reaction"))))));
+        }, ( localize(11540, "Toggle Reaction"))))));
         let reactionMenuActions = [];
         if (reactionGroup && reactionGroup.length) {
             reactionMenuActions = ( (reactionGroup.map((reaction) => {
@@ -333,8 +332,8 @@ let CommentNode = class CommentNode extends Disposable {
                             }
                             catch (e) {
                                 const error = e.message
-                                    ? ( localizeWithPath(_moduleId, 1, "Toggling the comment reaction failed: {0}.", e.message))
-                                    : ( localizeWithPath(_moduleId, 2, "Toggling the comment reaction failed"));
+                                    ? ( localize(11541, "Toggling the comment reaction failed: {0}.", e.message))
+                                    : ( localize(11542, "Toggling the comment reaction failed"));
                                 this.notificationService.error(error);
                             }
                         }