@codingame/monaco-vscode-api 7.0.11 → 7.1.1

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

@@ -19,7 +19,7 @@ import { ILanguageFeaturesService } from '../../../common/services/languageFeatu
 import { ITextResourceConfigurationService } from '../../../common/services/textResourceConfiguration.js';
 import { EditorStateCancellationTokenSource, CodeEditorStateFlag } from '../../editorState/browser/editorState.js';
 import { MessageController } from '../../message/browser/messageController.js';
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { localize, localize2 } from '../../../../nls.js';
 import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
 import { Extensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -32,7 +32,6 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { RenameWidget, CONTEXT_RENAME_INPUT_VISIBLE } from './renameWidget.js';
 var RenameController_1;
-const _moduleId = "vs/editor/contrib/rename/browser/rename";
 class RenameSkeleton {
     constructor(model, position, registry) {
         this.model = model;
@@ -93,7 +92,7 @@ class RenameSkeleton {
         }
         const result = await provider.provideRenameEdits(this.model, this.position, newName, token);
         if (!result) {
-            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localizeWithPath(_moduleId, 0, "No result."))), token);
+            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localize(1867, "No result."))), token);
         }
         else if (result.rejectReason) {
             return this._provideRenameEdits(newName, i + 1, rejects.concat(result.rejectReason), token);
@@ -172,7 +171,7 @@ let RenameController = class RenameController {
             else {
                 trace('resolve rename location failed', e instanceof Error ? e : JSON.stringify(e, null, '\t'));
                 if (typeof e === 'string' || isMarkdownString(e)) {
-                    MessageController.get(this.editor)?.showMessage(e || ( localizeWithPath(_moduleId, 1, "An unknown error occurred while resolving rename location")), position);
+                    MessageController.get(this.editor)?.showMessage(e || ( localize(1868, "An unknown error occurred while resolving rename location")), position);
                 }
             }
             return undefined;
@@ -249,22 +248,15 @@ let RenameController = class RenameController {
             this._bulkEditService.apply(renameResult, {
                 editor: this.editor,
                 showPreview: inputFieldResult.wantsPreview,
-                label: ( localizeWithPath(
-                    _moduleId,
-                    2,
-                    "Renaming '{0}' to '{1}'",
-                    loc?.text,
-                    inputFieldResult.newName
-                )),
+                label: ( localize(1869, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
                 code: 'undoredo.rename',
-                quotableLabel: ( localizeWithPath(_moduleId, 3, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
+                quotableLabel: ( localize(1870, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
                 respectAutoSaveConfig: true
             }).then(result => {
                 trace('edits applied');
                 if (result.ariaSummary) {
-                    alert(( localizeWithPath(
-                        _moduleId,
-                        4,
+                    alert(( localize(
+                        1871,
                         "Successfully renamed '{0}' to '{1}'. Summary: {2}",
                         loc.text,
                         inputFieldResult.newName,
@@ -273,12 +265,12 @@ let RenameController = class RenameController {
                 }
             }).catch(err => {
                 trace(`error when applying edits ${JSON.stringify(err, null, '\t')}`);
-                this._notificationService.error(( localizeWithPath(_moduleId, 5, "Rename failed to apply edits")));
+                this._notificationService.error(( localize(1872, "Rename failed to apply edits")));
                 this._logService.error(err);
             });
         }, err => {
             trace('error when providing rename edits', JSON.stringify(err, null, '\t'));
-            this._notificationService.error(( localizeWithPath(_moduleId, 6, "Rename failed to compute edits")));
+            this._notificationService.error(( localize(1873, "Rename failed to compute edits")));
             this._logService.error(err);
         }).finally(() => {
             cts2.dispose();
@@ -334,7 +326,7 @@ class RenameAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.rename',
-            label: ( localizeWithPath(_moduleId, 7, "Rename Symbol")),
+            label: ( localize(1874, "Rename Symbol")),
             alias: 'Rename Symbol',
             precondition: ( (ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider))),
             kbOpts: {
@@ -418,7 +410,7 @@ registerAction2(class FocusNextRenameSuggestion extends Action2 {
         super({
             id: 'focusNextRenameSuggestion',
             title: {
-                ...( localize2WithPath(_moduleId, 8, "Focus Next Rename Suggestion")),
+                ...( localize2(1875, "Focus Next Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
@@ -446,7 +438,7 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
         super({
             id: 'focusPreviousRenameSuggestion',
             title: {
-                ...( localize2WithPath(_moduleId, 9, "Focus Previous Rename Suggestion")),
+                ...( localize2(1876, "Focus Previous Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
@@ -489,11 +481,7 @@ registerModelAndPositionCommand('_executePrepareRename', async function (accesso
     properties: {
         'editor.rename.enablePreview': {
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localizeWithPath(
-                _moduleId,
-                10,
-                "Enable/disable the ability to preview changes before renaming"
-            )),
+            description: ( localize(1877, "Enable/disable the ability to preview changes before renaming")),
             default: true,
             type: 'boolean'
         }

package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js

@@ -22,8 +22,8 @@ import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { ScrollType } from '../../../common/editorCommon.js';
-import { NewSymbolNameTag, NewSymbolNameTriggerKind } from '../../../common/languages.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { NewSymbolNameTriggerKind, NewSymbolNameTag } from '../../../common/languages.js';
+import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
@@ -41,8 +41,7 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import { quickInputListFocusForeground, quickInputListFocusBackground } from '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
-const _moduleId = "vs/editor/contrib/rename/browser/renameWidget";
-const CONTEXT_RENAME_INPUT_VISIBLE = ( (new RawContextKey('renameInputVisible', false, ( localizeWithPath(_moduleId, 0, "Whether the rename input widget is visible")))));
+const CONTEXT_RENAME_INPUT_VISIBLE = ( (new RawContextKey('renameInputVisible', false, ( localize(5244, "Whether the rename input widget is visible")))));
 let RenameWidget = class RenameWidget {
     constructor(_editor, _acceptKeybindings, _themeService, _keybindingService, contextKeyService, _logService) {
         this._editor = _editor;
@@ -164,9 +163,8 @@ let RenameWidget = class RenameWidget {
     }
     beforeRender() {
         const [accept, preview] = this._acceptKeybindings;
-        this._label.innerText = ( localizeWithPath(
-            _moduleId,
-            2,
+        this._label.innerText = ( localize(
+            5246,
             "{0} to Rename, {1} to Preview",
             this._keybindingService.lookupKeybinding(accept)?.getLabel(),
             this._keybindingService.lookupKeybinding(preview)?.getLabel()
@@ -464,7 +462,7 @@ class RenameCandidateListView {
         this._listWidget.layout(height, width);
         this._listContainer.style.height = `${height}px`;
         this._listContainer.style.width = `${width}px`;
-        status(( localizeWithPath(_moduleId, 3, "Received {0} rename suggestions", candidates.length)));
+        status(( localize(5247, "Received {0} rename suggestions", candidates.length)));
     }
     clearCandidates() {
         this._listContainer.style.height = '0px';
@@ -606,13 +604,13 @@ class InputWithButton {
             this._inputNode.className = 'rename-input';
             this._inputNode.type = 'text';
             this._inputNode.style.border = 'none';
-            this._inputNode.setAttribute('aria-label', ( localizeWithPath(_moduleId, 4, "Rename input. Type new name and press Enter to commit.")));
+            this._inputNode.setAttribute('aria-label', ( localize(5248, "Rename input. Type new name and press Enter to commit.")));
             this._domNode.appendChild(this._inputNode);
             this._buttonNode = document.createElement('div');
             this._buttonNode.className = 'rename-suggestions-button';
             this._buttonNode.setAttribute('tabindex', '0');
-            this._buttonGenHoverText = ( localizeWithPath(_moduleId, 5, "Generate new name suggestions"));
-            this._buttonCancelHoverText = ( localizeWithPath(_moduleId, 6, "Cancel"));
+            this._buttonGenHoverText = ( localize(5249, "Generate new name suggestions"));
+            this._buttonCancelHoverText = ( localize(5250, "Cancel"));
             this._buttonHover = getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('element'), this._buttonNode, this._buttonGenHoverText);
             this._disposables.add(this._buttonHover);
             this._domNode.appendChild(this._buttonNode);

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

@@ -11,7 +11,7 @@ import { Selection } from '../../../common/core/selection.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { BracketSelectionRangeProvider } from './bracketSelections.js';
 import { WordSelectionRangeProvider } from './wordSelections.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -20,7 +20,6 @@ import { ITextModelService } from '../../../common/services/resolverService.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 var SmartSelectController_1;
-const _moduleId = "vs/editor/contrib/smartSelect/browser/smartSelect";
 class SelectionRanges {
     constructor(index, ranges) {
         this.index = index;
@@ -117,7 +116,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(true, {
             id: 'editor.action.smartSelect.expand',
-            label: ( localizeWithPath(_moduleId, 0, "Expand Selection")),
+            label: ( localize(1878, "Expand Selection")),
             alias: 'Expand Selection',
             precondition: undefined,
             kbOpts: {
@@ -132,7 +131,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '1_basic',
-                title: ( localizeWithPath(_moduleId, 1, "&&Expand Selection")),
+                title: ( localize(1879, "&&Expand Selection")),
                 order: 2
             }
         });
@@ -143,7 +142,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(false, {
             id: 'editor.action.smartSelect.shrink',
-            label: ( localizeWithPath(_moduleId, 2, "Shrink Selection")),
+            label: ( localize(1880, "Shrink Selection")),
             alias: 'Shrink Selection',
             precondition: undefined,
             kbOpts: {
@@ -158,7 +157,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '1_basic',
-                title: ( localizeWithPath(_moduleId, 3, "&&Shrink Selection")),
+                title: ( localize(1881, "&&Shrink Selection")),
                 order: 3
             }
         });

package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js

@@ -9,14 +9,13 @@ import { CompletionItemKind } from '../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { showSimpleSuggestions } from '../../suggest/browser/suggest.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { SnippetSession } from './snippetSession.js';
 var SnippetController2_1;
-const _moduleId = "vs/editor/contrib/snippet/browser/snippetController2";
 const _defaultOptions = {
     overwriteBefore: 0,
     overwriteAfter: 0,
@@ -32,9 +31,9 @@ let SnippetController2 = class SnippetController2 {
     static get(editor) {
         return editor.getContribution(SnippetController2_1.ID);
     }
-    static { this.InSnippetMode = ( (new RawContextKey('inSnippetMode', false, ( localizeWithPath(_moduleId, 0, "Whether the editor in current in snippet mode"))))); }
-    static { this.HasNextTabstop = ( (new RawContextKey('hasNextTabstop', false, ( localizeWithPath(_moduleId, 1, "Whether there is a next tab stop when in snippet mode"))))); }
-    static { this.HasPrevTabstop = ( (new RawContextKey('hasPrevTabstop', false, ( localizeWithPath(_moduleId, 2, "Whether there is a previous tab stop when in snippet mode"))))); }
+    static { this.InSnippetMode = ( (new RawContextKey('inSnippetMode', false, ( localize(1882, "Whether the editor in current in snippet mode"))))); }
+    static { this.HasNextTabstop = ( (new RawContextKey('hasNextTabstop', false, ( localize(1883, "Whether there is a next tab stop when in snippet mode"))))); }
+    static { this.HasPrevTabstop = ( (new RawContextKey('hasPrevTabstop', false, ( localize(1884, "Whether there is a previous tab stop when in snippet mode"))))); }
     constructor(_editor, _logService, _languageFeaturesService, contextKeyService, _languageConfigurationService) {
         this._editor = _editor;
         this._logService = _logService;
@@ -123,7 +122,7 @@ let SnippetController2 = class SnippetController2 {
                             sortText: 'a'.repeat(i + 1),
                             range: activeChoice.range,
                             filterText: isAnyOfOptions ? `${word}_${option.value}` : undefined,
-                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localizeWithPath(_moduleId, 3, 'Go to next placeholder...')) }
+                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1885, 'Go to next placeholder...')) }
                         });
                     }
                     return { suggestions };

package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js

@@ -6,9 +6,8 @@ import { getLeadingWhitespace, splitLines, commonPrefixLength, isFalsyOrWhitespa
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { Text } from './snippetParser.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { toWorkspaceIdentifier, isEmptyWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, WORKSPACE_EXTENSION } from '../../../../platform/workspace/common/workspace.js';
-const _moduleId = "vs/editor/contrib/snippet/browser/snippetVariables";
 const KnownSnippetVariableNames = ( (Object.freeze({
     'CURRENT_YEAR': true,
     'CURRENT_YEAR_SHORT': true,
@@ -213,10 +212,10 @@ class TimeBasedVariableResolver {
     constructor() {
         this._date = ( (new Date()));
     }
-    static { this.dayNames = [( localizeWithPath(_moduleId, 0, "Sunday")), ( localizeWithPath(_moduleId, 1, "Monday")), ( localizeWithPath(_moduleId, 2, "Tuesday")), ( localizeWithPath(_moduleId, 3, "Wednesday")), ( localizeWithPath(_moduleId, 4, "Thursday")), ( localizeWithPath(_moduleId, 5, "Friday")), ( localizeWithPath(_moduleId, 6, "Saturday"))]; }
-    static { this.dayNamesShort = [( localizeWithPath(_moduleId, 7, "Sun")), ( localizeWithPath(_moduleId, 8, "Mon")), ( localizeWithPath(_moduleId, 9, "Tue")), ( localizeWithPath(_moduleId, 10, "Wed")), ( localizeWithPath(_moduleId, 11, "Thu")), ( localizeWithPath(_moduleId, 12, "Fri")), ( localizeWithPath(_moduleId, 13, "Sat"))]; }
-    static { this.monthNames = [( localizeWithPath(_moduleId, 14, "January")), ( localizeWithPath(_moduleId, 15, "February")), ( localizeWithPath(_moduleId, 16, "March")), ( localizeWithPath(_moduleId, 17, "April")), ( localizeWithPath(_moduleId, 18, "May")), ( localizeWithPath(_moduleId, 19, "June")), ( localizeWithPath(_moduleId, 20, "July")), ( localizeWithPath(_moduleId, 21, "August")), ( localizeWithPath(_moduleId, 22, "September")), ( localizeWithPath(_moduleId, 23, "October")), ( localizeWithPath(_moduleId, 24, "November")), ( localizeWithPath(_moduleId, 25, "December"))]; }
-    static { this.monthNamesShort = [( localizeWithPath(_moduleId, 26, "Jan")), ( localizeWithPath(_moduleId, 27, "Feb")), ( localizeWithPath(_moduleId, 28, "Mar")), ( localizeWithPath(_moduleId, 29, "Apr")), ( localizeWithPath(_moduleId, 30, "May")), ( localizeWithPath(_moduleId, 31, "Jun")), ( localizeWithPath(_moduleId, 32, "Jul")), ( localizeWithPath(_moduleId, 33, "Aug")), ( localizeWithPath(_moduleId, 34, "Sep")), ( localizeWithPath(_moduleId, 35, "Oct")), ( localizeWithPath(_moduleId, 36, "Nov")), ( localizeWithPath(_moduleId, 37, "Dec"))]; }
+    static { this.dayNames = [( localize(9893, "Sunday")), ( localize(9894, "Monday")), ( localize(9895, "Tuesday")), ( localize(9896, "Wednesday")), ( localize(9897, "Thursday")), ( localize(9898, "Friday")), ( localize(9899, "Saturday"))]; }
+    static { this.dayNamesShort = [( localize(9900, "Sun")), ( localize(9901, "Mon")), ( localize(9902, "Tue")), ( localize(9903, "Wed")), ( localize(9904, "Thu")), ( localize(9905, "Fri")), ( localize(9906, "Sat"))]; }
+    static { this.monthNames = [( localize(9907, "January")), ( localize(9908, "February")), ( localize(9909, "March")), ( localize(9910, "April")), ( localize(9911, "May")), ( localize(9912, "June")), ( localize(9913, "July")), ( localize(9914, "August")), ( localize(9915, "September")), ( localize(9916, "October")), ( localize(9917, "November")), ( localize(9918, "December"))]; }
+    static { this.monthNamesShort = [( localize(9919, "Jan")), ( localize(9920, "Feb")), ( localize(9921, "Mar")), ( localize(9922, "Apr")), ( localize(9923, "May")), ( localize(9924, "Jun")), ( localize(9925, "Jul")), ( localize(9926, "Aug")), ( localize(9927, "Sep")), ( localize(9928, "Oct")), ( localize(9929, "Nov")), ( localize(9930, "Dec"))]; }
     resolve(variable) {
         const { name } = variable;
         if (name === 'CURRENT_YEAR') {

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js

@@ -1,6 +1,6 @@
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { EditorAction2 } from '../../../browser/editorExtensions.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -8,27 +8,25 @@ import { KeybindingWeight } from '../../../../platform/keybinding/common/keybind
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { StickyScrollController } from './stickyScrollController.js';
-const _moduleId = "vs/editor/contrib/stickyScroll/browser/stickyScrollActions";
 class ToggleStickyScroll extends Action2 {
     constructor() {
         super({
             id: 'editor.action.toggleStickyScroll',
             title: {
-                ...( localize2WithPath(_moduleId, 0, "Toggle Editor Sticky Scroll")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Toggle Editor Sticky Scroll")),
+                ...( localize2(5259, "Toggle Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(5260, "&&Toggle Editor Sticky Scroll")),
             },
             metadata: {
-                description: ( localize2WithPath(
-                    _moduleId,
-                    2,
+                description: ( localize2(
+                    5261,
                     "Toggle/enable the editor sticky scroll which shows the nested scopes at the top of the viewport"
                 )),
             },
             category: Categories.View,
             toggled: {
                 condition: ( (ContextKeyExpr.equals('config.editor.stickyScroll.enabled', true))),
-                title: ( localizeWithPath(_moduleId, 3, "Sticky Scroll")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 4, "&&Sticky Scroll")),
+                title: ( localize(5262, "Sticky Scroll")),
+                mnemonicTitle: ( localize(5263, "&&Sticky Scroll")),
             },
             menu: [
                 { id: MenuId.CommandPalette },
@@ -49,8 +47,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: 'editor.action.focusStickyScroll',
             title: {
-                ...( localize2WithPath(_moduleId, 5, "Focus on the editor sticky scroll")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 6, "&&Focus Sticky Scroll")),
+                ...( localize2(5264, "Focus on the editor sticky scroll")),
+                mnemonicTitle: ( localize(5265, "&&Focus Sticky Scroll")),
             },
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.has('config.editor.stickyScroll.enabled')),
@@ -69,7 +67,7 @@ class SelectNextStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectNextStickyScrollLine',
-            title: ( localize2WithPath(_moduleId, 7, "Select the next editor sticky scroll line")),
+            title: ( localize2(5266, "Select the next editor sticky scroll line")),
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,
@@ -85,7 +83,7 @@ class SelectPreviousStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectPreviousStickyScrollLine',
-            title: ( localize2WithPath(_moduleId, 8, "Select the previous sticky scroll line")),
+            title: ( localize2(5267, "Select the previous sticky scroll line")),
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,
@@ -101,7 +99,7 @@ class GoToStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.goToFocusedStickyScrollLine',
-            title: ( localize2WithPath(_moduleId, 9, "Go to the focused sticky scroll line")),
+            title: ( localize2(5268, "Go to the focused sticky scroll line")),
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,
@@ -117,7 +115,7 @@ class SelectEditor extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectEditor',
-            title: ( localize2WithPath(_moduleId, 10, "Select Editor")),
+            title: ( localize2(5269, "Select Editor")),
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js

@@ -255,7 +255,7 @@ let StickyScrollController = class StickyScrollController extends Disposable {
             const cancellationToken = ( new CancellationTokenSource());
             sessionStore.add(toDisposable(() => cancellationToken.dispose(true)));
             let currentHTMLChild;
-            getDefinitionsAtPosition(this._languageFeaturesService.definitionProvider, this._editor.getModel(), ( new Position(range.startLineNumber, range.startColumn + 1)), cancellationToken.token).then((candidateDefinitions => {
+            getDefinitionsAtPosition(this._languageFeaturesService.definitionProvider, this._editor.getModel(), ( new Position(range.startLineNumber, range.startColumn + 1)), false, cancellationToken.token).then((candidateDefinitions => {
                 if (cancellationToken.token.isCancellationRequested) {
                     return;
                 }

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

@@ -10,40 +10,30 @@ import { Range } from '../../../common/core/range.js';
 import { CompletionTriggerKind, CompletionItemKind, CompletionItemTag, CompletionItemInsertTextRule } from '../../../common/languages.js';
 import { ITextModelService } from '../../../common/services/resolverService.js';
 import { SnippetParser } from '../../snippet/browser/snippetParser.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { historyNavigationVisible } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
-const _moduleId = "vs/editor/contrib/suggest/browser/suggest";
 const Context = {
     Visible: historyNavigationVisible,
-    HasFocusedSuggestion: ( (new RawContextKey('suggestWidgetHasFocusedSuggestion', false, ( localizeWithPath(_moduleId, 0, "Whether any suggestion is focused"))))),
-    DetailsVisible: ( (new RawContextKey('suggestWidgetDetailsVisible', false, ( localizeWithPath(_moduleId, 1, "Whether suggestion details are visible"))))),
-    MultipleSuggestions: ( (new RawContextKey('suggestWidgetMultipleSuggestions', false, ( localizeWithPath(_moduleId, 2, "Whether there are multiple suggestions to pick from"))))),
-    MakesTextEdit: ( (new RawContextKey('suggestionMakesTextEdit', true, ( localizeWithPath(
-        _moduleId,
-        3,
+    HasFocusedSuggestion: ( (new RawContextKey('suggestWidgetHasFocusedSuggestion', false, ( localize(5251, "Whether any suggestion is focused"))))),
+    DetailsVisible: ( (new RawContextKey('suggestWidgetDetailsVisible', false, ( localize(5252, "Whether suggestion details are visible"))))),
+    MultipleSuggestions: ( (new RawContextKey('suggestWidgetMultipleSuggestions', false, ( localize(5253, "Whether there are multiple suggestions to pick from"))))),
+    MakesTextEdit: ( (new RawContextKey('suggestionMakesTextEdit', true, ( localize(
+        5254,
         "Whether inserting the current suggestion yields in a change or has everything already been typed"
     ))))),
-    AcceptSuggestionsOnEnter: ( (new RawContextKey('acceptSuggestionOnEnter', true, ( localizeWithPath(_moduleId, 4, "Whether suggestions are inserted when pressing Enter"))))),
-    HasInsertAndReplaceRange: ( (new RawContextKey('suggestionHasInsertAndReplaceRange', false, ( localizeWithPath(
-        _moduleId,
-        5,
-        "Whether the current suggestion has insert and replace behaviour"
-    ))))),
+    AcceptSuggestionsOnEnter: ( (new RawContextKey('acceptSuggestionOnEnter', true, ( localize(5255, "Whether suggestions are inserted when pressing Enter"))))),
+    HasInsertAndReplaceRange: ( (new RawContextKey('suggestionHasInsertAndReplaceRange', false, ( localize(5256, "Whether the current suggestion has insert and replace behaviour"))))),
     InsertMode: ( (new RawContextKey(
         'suggestionInsertMode',
         undefined,
-        { type: 'string', description: ( localizeWithPath(_moduleId, 6, "Whether the default behaviour is to insert or replace")) }
+        { type: 'string', description: ( localize(5257, "Whether the default behaviour is to insert or replace")) }
     ))),
-    CanResolve: ( (new RawContextKey('suggestionCanResolve', false, ( localizeWithPath(
-        _moduleId,
-        7,
-        "Whether the current suggestion supports to resolve further details"
-    ))))),
+    CanResolve: ( (new RawContextKey('suggestionCanResolve', false, ( localize(5258, "Whether the current suggestion supports to resolve further details"))))),
 };
 const suggestWidgetStatusbarMenu = ( (new MenuId('suggestWidgetStatusBar')));
 class CompletionItem {

package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js

@@ -24,7 +24,7 @@ import { SnippetController2 } from '../../snippet/browser/snippetController2.js'
 import { SnippetParser } from '../../snippet/browser/snippetParser.js';
 import { ISuggestMemoryService } from './suggestMemory.js';
 import { WordContextKey } from './wordContextKey.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -44,7 +44,6 @@ import { hash } from '../../../../base/common/hash.js';
 import { WindowIdleValue, getWindow } from '../../../../base/browser/dom.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 var SuggestController_1;
-const _moduleId = "vs/editor/contrib/suggest/browser/suggestController";
 class LineSuffix {
     constructor(_model, _position) {
         this._model = _model;
@@ -432,9 +431,8 @@ let SuggestController = class SuggestController {
     }
     _alertCompletionItem(item) {
         if (isNonEmptyArray(item.completion.additionalTextEdits)) {
-            const msg = ( localizeWithPath(
-                _moduleId,
-                0,
+            const msg = ( localize(
+                1886,
                 "Accepting '{0}' made {1} additional edits",
                 item.textLabel,
                 item.completion.additionalTextEdits.length
@@ -611,7 +609,7 @@ class TriggerSuggestAction extends EditorAction {
     constructor() {
         super({
             id: TriggerSuggestAction.id,
-            label: ( localizeWithPath(_moduleId, 1, "Trigger Suggest")),
+            label: ( localize(1887, "Trigger Suggest")),
             alias: 'Trigger Suggest',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -667,13 +665,13 @@ registerEditorCommand(( (new SuggestCommand({
         }],
     menuOpts: [{
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localizeWithPath(_moduleId, 2, "Insert")),
+            title: ( localize(1888, "Insert")),
             group: 'left',
             order: 1,
             when: ( (Context.HasInsertAndReplaceRange.toNegated()))
         }, {
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localizeWithPath(_moduleId, 2, "Insert")),
+            title: ( localize(1888, "Insert")),
             group: 'left',
             order: 1,
             when: ( (ContextKeyExpr.and(
@@ -682,7 +680,7 @@ registerEditorCommand(( (new SuggestCommand({
             )))
         }, {
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localizeWithPath(_moduleId, 3, "Replace")),
+            title: ( localize(1889, "Replace")),
             group: 'left',
             order: 1,
             when: ( (ContextKeyExpr.and(
@@ -715,7 +713,7 @@ registerEditorCommand(( (new SuggestCommand({
                 Context.HasInsertAndReplaceRange,
                  (Context.InsertMode.isEqualTo('insert'))
             ))),
-            title: ( localizeWithPath(_moduleId, 3, "Replace"))
+            title: ( localize(1889, "Replace"))
         }, {
             menuId: suggestWidgetStatusbarMenu,
             group: 'left',
@@ -724,7 +722,7 @@ registerEditorCommand(( (new SuggestCommand({
                 Context.HasInsertAndReplaceRange,
                  (Context.InsertMode.isEqualTo('replace'))
             ))),
-            title: ( localizeWithPath(_moduleId, 2, "Insert"))
+            title: ( localize(1889, "Insert"))
         }]
 }))));
 CommandsRegistry.registerCommandAlias('acceptSelectedSuggestionOnEnter', 'acceptSelectedSuggestion');
@@ -849,13 +847,13 @@ registerEditorCommand(( (new SuggestCommand({
             group: 'right',
             order: 1,
             when: ( (ContextKeyExpr.and(Context.DetailsVisible, Context.CanResolve))),
-            title: ( localizeWithPath(_moduleId, 4, "show less"))
+            title: ( localize(1890, "show less"))
         }, {
             menuId: suggestWidgetStatusbarMenu,
             group: 'right',
             order: 1,
             when: ( (ContextKeyExpr.and( (Context.DetailsVisible.toNegated()), Context.CanResolve))),
-            title: ( localizeWithPath(_moduleId, 5, "show more"))
+            title: ( localize(1891, "show more"))
         }]
 }))));
 registerEditorCommand(( (new SuggestCommand({
@@ -932,7 +930,7 @@ registerEditorAction(class extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.resetSuggestSize',
-            label: ( localizeWithPath(_moduleId, 6, "Reset Suggest Widget Size")),
+            label: ( localize(1892, "Reset Suggest Widget Size")),
             alias: 'Reset Suggest Widget Size',
             precondition: undefined
         });