@codingame/monaco-vscode-api 7.1.0 → 8.0.0

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

@@ -8,7 +8,7 @@ import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { IMarkerNavigationService } from './markerNavigationService.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -18,7 +18,6 @@ import { KeybindingWeight } from '../../../../platform/keybinding/common/keybind
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { MarkerNavigationWidget } from './gotoErrorWidget.js';
 var MarkerController_1;
-const _moduleId = "vs/editor/contrib/gotoError/browser/gotoError";
 let MarkerController = class MarkerController {
     static { MarkerController_1 = this; }
     static { this.ID = 'editor.contrib.markerController'; }
@@ -149,7 +148,7 @@ class MarkerNavigationAction extends EditorAction {
 }
 class NextMarkerAction extends MarkerNavigationAction {
     static { this.ID = 'editor.action.marker.next'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 0, "Go to Next Problem (Error, Warning, Info)")); }
+    static { this.LABEL = ( localize(1402, "Go to Next Problem (Error, Warning, Info)")); }
     constructor() {
         super(true, false, {
             id: NextMarkerAction.ID,
@@ -164,7 +163,7 @@ class NextMarkerAction extends MarkerNavigationAction {
             menuOpts: {
                 menuId: MarkerNavigationWidget.TitleMenu,
                 title: NextMarkerAction.LABEL,
-                icon: registerIcon('marker-navigation-next', Codicon.arrowDown, ( localizeWithPath(_moduleId, 1, 'Icon for goto next marker.'))),
+                icon: registerIcon('marker-navigation-next', Codicon.arrowDown, ( localize(1403, 'Icon for goto next marker.'))),
                 group: 'navigation',
                 order: 1
             }
@@ -173,7 +172,7 @@ class NextMarkerAction extends MarkerNavigationAction {
 }
 class PrevMarkerAction extends MarkerNavigationAction {
     static { this.ID = 'editor.action.marker.prev'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 2, "Go to Previous Problem (Error, Warning, Info)")); }
+    static { this.LABEL = ( localize(1404, "Go to Previous Problem (Error, Warning, Info)")); }
     constructor() {
         super(false, false, {
             id: PrevMarkerAction.ID,
@@ -188,7 +187,7 @@ class PrevMarkerAction extends MarkerNavigationAction {
             menuOpts: {
                 menuId: MarkerNavigationWidget.TitleMenu,
                 title: PrevMarkerAction.LABEL,
-                icon: registerIcon('marker-navigation-previous', Codicon.arrowUp, ( localizeWithPath(_moduleId, 3, 'Icon for goto previous marker.'))),
+                icon: registerIcon('marker-navigation-previous', Codicon.arrowUp, ( localize(1405, 'Icon for goto previous marker.'))),
                 group: 'navigation',
                 order: 2
             }
@@ -199,7 +198,7 @@ class NextMarkerInFilesAction extends MarkerNavigationAction {
     constructor() {
         super(true, true, {
             id: 'editor.action.marker.nextInFiles',
-            label: ( localizeWithPath(_moduleId, 4, "Go to Next Problem in Files (Error, Warning, Info)")),
+            label: ( localize(1406, "Go to Next Problem in Files (Error, Warning, Info)")),
             alias: 'Go to Next Problem in Files (Error, Warning, Info)',
             precondition: undefined,
             kbOpts: {
@@ -209,7 +208,7 @@ class NextMarkerInFilesAction extends MarkerNavigationAction {
             },
             menuOpts: {
                 menuId: MenuId.MenubarGoMenu,
-                title: ( localizeWithPath(_moduleId, 5, "Next &&Problem")),
+                title: ( localize(1407, "Next &&Problem")),
                 group: '6_problem_nav',
                 order: 1
             }
@@ -220,7 +219,7 @@ class PrevMarkerInFilesAction extends MarkerNavigationAction {
     constructor() {
         super(false, true, {
             id: 'editor.action.marker.prevInFiles',
-            label: ( localizeWithPath(_moduleId, 6, "Go to Previous Problem in Files (Error, Warning, Info)")),
+            label: ( localize(1408, "Go to Previous Problem in Files (Error, Warning, Info)")),
             alias: 'Go to Previous Problem in Files (Error, Warning, Info)',
             precondition: undefined,
             kbOpts: {
@@ -230,7 +229,7 @@ class PrevMarkerInFilesAction extends MarkerNavigationAction {
             },
             menuOpts: {
                 menuId: MenuId.MenubarGoMenu,
-                title: ( localizeWithPath(_moduleId, 7, "Previous &&Problem")),
+                title: ( localize(1409, "Previous &&Problem")),
                 group: '6_problem_nav',
                 order: 2
             }

package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js

@@ -13,7 +13,7 @@ import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { ScrollType } from '../../../common/editorCommon.js';
 import { PeekViewWidget, peekViewTitleForeground, peekViewTitleInfoForeground } from '../../peekView/browser/peekView.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
@@ -36,7 +36,6 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 var MarkerNavigationWidget_1;
-const _moduleId = "vs/editor/contrib/gotoError/browser/gotoErrorWidget";
 class MessageWidget {
     constructor(parent, editor, onRelatedInformation, _openerService, _labelService) {
         this._openerService = _openerService;
@@ -177,21 +176,20 @@ class MessageWidget {
         let severityLabel = '';
         switch (marker.severity) {
             case MarkerSeverity.Error:
-                severityLabel = ( localizeWithPath(_moduleId, 0, "Error"));
+                severityLabel = ( localize(5024, "Error"));
                 break;
             case MarkerSeverity.Warning:
-                severityLabel = ( localizeWithPath(_moduleId, 1, "Warning"));
+                severityLabel = ( localize(5025, "Warning"));
                 break;
             case MarkerSeverity.Info:
-                severityLabel = ( localizeWithPath(_moduleId, 2, "Info"));
+                severityLabel = ( localize(5026, "Info"));
                 break;
             case MarkerSeverity.Hint:
-                severityLabel = ( localizeWithPath(_moduleId, 3, "Hint"));
+                severityLabel = ( localize(5027, "Hint"));
                 break;
         }
-        let ariaLabel = ( localizeWithPath(
-            _moduleId,
-            4,
+        let ariaLabel = ( localize(
+            5028,
             "{0} at {1}. ",
             severityLabel,
             marker.startLineNumber + ':' + marker.startColumn
@@ -262,10 +260,9 @@ let MarkerNavigationWidget = class MarkerNavigationWidget extends PeekViewWidget
         super._fillHead(container);
         this._disposables.add(this._actionbarWidget.actionRunner.onWillRun(e => this.editor.focus()));
         const actions = [];
-        const menu = this._menuService.createMenu(MarkerNavigationWidget_1.TitleMenu, this._contextKeyService);
-        createAndFillInActionBarActions(menu, undefined, actions);
+        const menu = this._menuService.getMenuActions(MarkerNavigationWidget_1.TitleMenu, this._contextKeyService);
+        createAndFillInActionBarActions(menu, actions);
         this._actionbarWidget.push(actions, { label: false, icon: true, index: 0 });
-        menu.dispose();
     }
     _fillTitleIcon(container) {
         this._icon = append(container, $(''));
@@ -301,8 +298,8 @@ let MarkerNavigationWidget = class MarkerNavigationWidget extends PeekViewWidget
         const model = this.editor.getModel();
         if (model) {
             const detail = markerCount > 1
-                ? ( localizeWithPath(_moduleId, 5, "{0} of {1} problems", markerIdx, markerCount))
-                : ( localizeWithPath(_moduleId, 6, "{0} of {1} problem", markerIdx, markerCount));
+                ? ( localize(5029, "{0} of {1} problems", markerIdx, markerCount))
+                : ( localize(5030, "{0} of {1} problem", markerIdx, markerCount));
             this.setTitle(basename(model.uri), detail);
         }
         this._icon.className = `codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(this._severity))}`;
@@ -344,15 +341,11 @@ MarkerNavigationWidget = MarkerNavigationWidget_1 = ( (__decorate([
 const errorDefault = oneOf(editorErrorForeground, editorErrorBorder);
 const warningDefault = oneOf(editorWarningForeground, editorWarningBorder);
 const infoDefault = oneOf(editorInfoForeground, editorInfoBorder);
-const editorMarkerNavigationError = registerColor('editorMarkerNavigationError.background', { dark: errorDefault, light: errorDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 7, 'Editor marker navigation widget error color.')));
-const editorMarkerNavigationErrorHeader = registerColor('editorMarkerNavigationError.headerBackground', { dark: ( (transparent(editorMarkerNavigationError, .1))), light: ( (transparent(editorMarkerNavigationError, .1))), hcDark: null, hcLight: null }, ( localizeWithPath(_moduleId, 8, 'Editor marker navigation widget error heading background.')));
-const editorMarkerNavigationWarning = registerColor('editorMarkerNavigationWarning.background', { dark: warningDefault, light: warningDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 9, 'Editor marker navigation widget warning color.')));
-const editorMarkerNavigationWarningHeader = registerColor('editorMarkerNavigationWarning.headerBackground', { dark: ( (transparent(editorMarkerNavigationWarning, .1))), light: ( (transparent(editorMarkerNavigationWarning, .1))), hcDark: '#0C141F', hcLight: ( (transparent(editorMarkerNavigationWarning, .2))) }, ( localizeWithPath(
-    _moduleId,
-    10,
-    'Editor marker navigation widget warning heading background.'
-)));
-const editorMarkerNavigationInfo = registerColor('editorMarkerNavigationInfo.background', { dark: infoDefault, light: infoDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 11, 'Editor marker navigation widget info color.')));
-const editorMarkerNavigationInfoHeader = registerColor('editorMarkerNavigationInfo.headerBackground', { dark: ( (transparent(editorMarkerNavigationInfo, .1))), light: ( (transparent(editorMarkerNavigationInfo, .1))), hcDark: null, hcLight: null }, ( localizeWithPath(_moduleId, 12, 'Editor marker navigation widget info heading background.')));
-const editorMarkerNavigationBackground = registerColor('editorMarkerNavigation.background', editorBackground, ( localizeWithPath(_moduleId, 13, 'Editor marker navigation widget background.')));
+const editorMarkerNavigationError = registerColor('editorMarkerNavigationError.background', { dark: errorDefault, light: errorDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(5031, 'Editor marker navigation widget error color.')));
+const editorMarkerNavigationErrorHeader = registerColor('editorMarkerNavigationError.headerBackground', { dark: ( (transparent(editorMarkerNavigationError, .1))), light: ( (transparent(editorMarkerNavigationError, .1))), hcDark: null, hcLight: null }, ( localize(5032, 'Editor marker navigation widget error heading background.')));
+const editorMarkerNavigationWarning = registerColor('editorMarkerNavigationWarning.background', { dark: warningDefault, light: warningDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(5033, 'Editor marker navigation widget warning color.')));
+const editorMarkerNavigationWarningHeader = registerColor('editorMarkerNavigationWarning.headerBackground', { dark: ( (transparent(editorMarkerNavigationWarning, .1))), light: ( (transparent(editorMarkerNavigationWarning, .1))), hcDark: '#0C141F', hcLight: ( (transparent(editorMarkerNavigationWarning, .2))) }, ( localize(5034, 'Editor marker navigation widget warning heading background.')));
+const editorMarkerNavigationInfo = registerColor('editorMarkerNavigationInfo.background', { dark: infoDefault, light: infoDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(5035, 'Editor marker navigation widget info color.')));
+const editorMarkerNavigationInfoHeader = registerColor('editorMarkerNavigationInfo.headerBackground', { dark: ( (transparent(editorMarkerNavigationInfo, .1))), light: ( (transparent(editorMarkerNavigationInfo, .1))), hcDark: null, hcLight: null }, ( localize(5036, 'Editor marker navigation widget info heading background.')));
+const editorMarkerNavigationBackground = registerColor('editorMarkerNavigation.background', editorBackground, ( localize(5037, 'Editor marker navigation widget background.')));
 export { MarkerNavigationWidget };

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js

@@ -19,7 +19,7 @@ import { ReferencesModel } from './referencesModel.js';
 import { ISymbolNavigationService } from './symbolNavigation.js';
 import { MessageController } from '../../message/browser/messageController.js';
 import { PeekContext } from '../../peekView/browser/peekView.js';
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { localize, localize2 } from '../../../../nls.js';
 import { MenuRegistry, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
@@ -33,10 +33,9 @@ import { getDefinitionsAtPosition, getDeclarationsAtPosition, getTypeDefinitions
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
-const _moduleId = "vs/editor/contrib/gotoSymbol/browser/goToCommands";
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.EditorContextPeek,
-    title: ( localizeWithPath(_moduleId, 0, "Peek")),
+    title: ( localize(1366, "Peek")),
     group: 'navigation',
     order: 100
 });
@@ -199,15 +198,15 @@ class DefinitionAction extends SymbolNavigationAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (
              (new ReferencesModel(
-                await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, token),
-                ( localizeWithPath(_moduleId, 1, 'Definitions'))
+                await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, false, token),
+                ( localize(1367, 'Definitions'))
             ))
         );
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localizeWithPath(_moduleId, 2, "No definition found for '{0}'", info.word))
-            : ( localizeWithPath(_moduleId, 3, "No definition found"));
+            ? ( localize(1368, "No definition found for '{0}'", info.word))
+            : ( localize(1369, "No definition found"));
     }
     _getAlternativeCommand(editor) {
         return editor.getOption(EditorOption.gotoLocation).alternativeDefinitionCommand;
@@ -226,8 +225,8 @@ registerAction2(class GoToDefinitionAction extends DefinitionAction {
         }, {
             id: GoToDefinitionAction.id,
             title: {
-                ...( localize2WithPath(_moduleId, 4, "Go to Definition")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 5, "Go to &&Definition")),
+                ...( localize2(1370, "Go to Definition")),
+                mnemonicTitle: ( localize(1371, "Go to &&Definition")),
             },
             precondition: EditorContextKeys.hasDefinitionProvider,
             keybinding: [{
@@ -262,7 +261,7 @@ registerAction2(class OpenDefinitionToSideAction extends DefinitionAction {
             muteMessage: false
         }, {
             id: OpenDefinitionToSideAction.id,
-            title: ( localize2WithPath(_moduleId, 6, "Open Definition to the Side")),
+            title: ( localize2(1372, "Open Definition to the Side")),
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.hasDefinitionProvider,
                  (EditorContextKeys.isInEmbeddedEditor.toNegated())
@@ -289,7 +288,7 @@ registerAction2(class PeekDefinitionAction extends DefinitionAction {
             muteMessage: false
         }, {
             id: PeekDefinitionAction.id,
-            title: ( localize2WithPath(_moduleId, 7, "Peek Definition")),
+            title: ( localize2(1373, "Peek Definition")),
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.hasDefinitionProvider,
                 PeekContext.notInPeekEditor,
@@ -314,15 +313,15 @@ class DeclarationAction extends SymbolNavigationAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (
              (new ReferencesModel(
-                await getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, token),
-                ( localizeWithPath(_moduleId, 8, 'Declarations'))
+                await getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, false, token),
+                ( localize(1374, 'Declarations'))
             ))
         );
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localizeWithPath(_moduleId, 9, "No declaration found for '{0}'", info.word))
-            : ( localizeWithPath(_moduleId, 10, "No declaration found"));
+            ? ( localize(1375, "No declaration found for '{0}'", info.word))
+            : ( localize(1376, "No declaration found"));
     }
     _getAlternativeCommand(editor) {
         return editor.getOption(EditorOption.gotoLocation).alternativeDeclarationCommand;
@@ -341,8 +340,8 @@ registerAction2(class GoToDeclarationAction extends DeclarationAction {
         }, {
             id: GoToDeclarationAction.id,
             title: {
-                ...( localize2WithPath(_moduleId, 11, "Go to Declaration")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 12, "Go to &&Declaration")),
+                ...( localize2(1377, "Go to Declaration")),
+                mnemonicTitle: ( localize(1378, "Go to &&Declaration")),
             },
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.hasDeclarationProvider,
@@ -362,8 +361,8 @@ registerAction2(class GoToDeclarationAction extends DeclarationAction {
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localizeWithPath(_moduleId, 9, "No declaration found for '{0}'", info.word))
-            : ( localizeWithPath(_moduleId, 10, "No declaration found"));
+            ? ( localize(1378, "No declaration found for '{0}'", info.word))
+            : ( localize(1378, "No declaration found"));
     }
 });
 registerAction2(class PeekDeclarationAction extends DeclarationAction {
@@ -374,7 +373,7 @@ registerAction2(class PeekDeclarationAction extends DeclarationAction {
             muteMessage: false
         }, {
             id: 'editor.action.peekDeclaration',
-            title: ( localize2WithPath(_moduleId, 13, "Peek Declaration")),
+            title: ( localize2(1379, "Peek Declaration")),
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.hasDeclarationProvider,
                 PeekContext.notInPeekEditor,
@@ -392,15 +391,15 @@ class TypeDefinitionAction extends SymbolNavigationAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (
              (new ReferencesModel(
-                await getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, token),
-                ( localizeWithPath(_moduleId, 14, 'Type Definitions'))
+                await getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, false, token),
+                ( localize(1380, 'Type Definitions'))
             ))
         );
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localizeWithPath(_moduleId, 15, "No type definition found for '{0}'", info.word))
-            : ( localizeWithPath(_moduleId, 16, "No type definition found"));
+            ? ( localize(1381, "No type definition found for '{0}'", info.word))
+            : ( localize(1382, "No type definition found"));
     }
     _getAlternativeCommand(editor) {
         return editor.getOption(EditorOption.gotoLocation).alternativeTypeDefinitionCommand;
@@ -419,8 +418,8 @@ registerAction2(class GoToTypeDefinitionAction extends TypeDefinitionAction {
         }, {
             id: GoToTypeDefinitionAction.ID,
             title: {
-                ...( localize2WithPath(_moduleId, 17, "Go to Type Definition")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 18, "Go to &&Type Definition")),
+                ...( localize2(1383, "Go to Type Definition")),
+                mnemonicTitle: ( localize(1384, "Go to &&Type Definition")),
             },
             precondition: EditorContextKeys.hasTypeDefinitionProvider,
             keybinding: {
@@ -450,7 +449,7 @@ registerAction2(class PeekTypeDefinitionAction extends TypeDefinitionAction {
             muteMessage: false
         }, {
             id: PeekTypeDefinitionAction.ID,
-            title: ( localize2WithPath(_moduleId, 19, "Peek Type Definition")),
+            title: ( localize2(1385, "Peek Type Definition")),
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.hasTypeDefinitionProvider,
                 PeekContext.notInPeekEditor,
@@ -468,15 +467,15 @@ class ImplementationAction extends SymbolNavigationAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (
              (new ReferencesModel(
-                await getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, token),
-                ( localizeWithPath(_moduleId, 20, 'Implementations'))
+                await getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, false, token),
+                ( localize(1386, 'Implementations'))
             ))
         );
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localizeWithPath(_moduleId, 21, "No implementation found for '{0}'", info.word))
-            : ( localizeWithPath(_moduleId, 22, "No implementation found"));
+            ? ( localize(1387, "No implementation found for '{0}'", info.word))
+            : ( localize(1388, "No implementation found"));
     }
     _getAlternativeCommand(editor) {
         return editor.getOption(EditorOption.gotoLocation).alternativeImplementationCommand;
@@ -495,8 +494,8 @@ registerAction2(class GoToImplementationAction extends ImplementationAction {
         }, {
             id: GoToImplementationAction.ID,
             title: {
-                ...( localize2WithPath(_moduleId, 23, "Go to Implementations")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 24, "Go to &&Implementations")),
+                ...( localize2(1389, "Go to Implementations")),
+                mnemonicTitle: ( localize(1390, "Go to &&Implementations")),
             },
             precondition: EditorContextKeys.hasImplementationProvider,
             keybinding: {
@@ -526,7 +525,7 @@ registerAction2(class PeekImplementationAction extends ImplementationAction {
             muteMessage: false
         }, {
             id: PeekImplementationAction.ID,
-            title: ( localize2WithPath(_moduleId, 25, "Peek Implementations")),
+            title: ( localize2(1391, "Peek Implementations")),
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.hasImplementationProvider,
                 PeekContext.notInPeekEditor,
@@ -548,8 +547,8 @@ registerAction2(class PeekImplementationAction extends ImplementationAction {
 class ReferencesAction extends SymbolNavigationAction {
     _getNoResultFoundMessage(info) {
         return info
-            ? ( localizeWithPath(_moduleId, 26, "No references found for '{0}'", info.word))
-            : ( localizeWithPath(_moduleId, 27, "No references found"));
+            ? ( localize(1392, "No references found for '{0}'", info.word))
+            : ( localize(1393, "No references found"));
     }
     _getAlternativeCommand(editor) {
         return editor.getOption(EditorOption.gotoLocation).alternativeReferenceCommand;
@@ -567,8 +566,8 @@ registerAction2(class GoToReferencesAction extends ReferencesAction {
         }, {
             id: 'editor.action.goToReferences',
             title: {
-                ...( localize2WithPath(_moduleId, 28, "Go to References")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 29, "Go to &&References")),
+                ...( localize2(1394, "Go to References")),
+                mnemonicTitle: ( localize(1395, "Go to &&References")),
             },
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.hasReferenceProvider,
@@ -595,8 +594,8 @@ registerAction2(class GoToReferencesAction extends ReferencesAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (
              (new ReferencesModel(
-                await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, true, token),
-                ( localizeWithPath(_moduleId, 30, 'References'))
+                await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, true, false, token),
+                ( localize(1396, 'References'))
             ))
         );
     }
@@ -609,7 +608,7 @@ registerAction2(class PeekReferencesAction extends ReferencesAction {
             muteMessage: false
         }, {
             id: 'editor.action.referenceSearch.trigger',
-            title: ( localize2WithPath(_moduleId, 31, "Peek References")),
+            title: ( localize2(1397, "Peek References")),
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.hasReferenceProvider,
                 PeekContext.notInPeekEditor,
@@ -625,8 +624,8 @@ registerAction2(class PeekReferencesAction extends ReferencesAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (
              (new ReferencesModel(
-                await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, token),
-                ( localizeWithPath(_moduleId, 30, 'References'))
+                await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, false, token),
+                ( localize(1397, 'References'))
             ))
         );
     }
@@ -635,7 +634,7 @@ class GenericGoToLocationAction extends SymbolNavigationAction {
     constructor(config, _references, _gotoMultipleBehaviour) {
         super(config, {
             id: 'editor.action.goToLocation',
-            title: ( localize2WithPath(_moduleId, 32, "Go to Any Symbol")),
+            title: ( localize2(1398, "Go to Any Symbol")),
             precondition: ( (ContextKeyExpr.and(
                 PeekContext.notInPeekEditor,
                  (EditorContextKeys.isInEmbeddedEditor.toNegated())
@@ -646,11 +645,11 @@ class GenericGoToLocationAction extends SymbolNavigationAction {
     }
     async _getLocationModel(languageFeaturesService, _model, _position, _token) {
         return (
-             (new ReferencesModel(this._references, ( localizeWithPath(_moduleId, 33, 'Locations'))))
+             (new ReferencesModel(this._references, ( localize(1399, 'Locations'))))
         );
     }
     _getNoResultFoundMessage(info) {
-        return info && ( localizeWithPath(_moduleId, 34, "No results for '{0}'", info.word)) || '';
+        return info && ( localize(1400, "No results for '{0}'", info.word)) || '';
     }
     _getGoToPreference(editor) {
         return this._gotoMultipleBehaviour ?? editor.getOption(EditorOption.gotoLocation).multipleReferences;
@@ -725,7 +724,7 @@ CommandsRegistry.registerCommand({
             if (!controller) {
                 return undefined;
             }
-            const references = createCancelablePromise(token => getReferencesAtPosition(languageFeaturesService.referenceProvider, control.getModel(), Position.lift(position), false, token).then(references => ( (new ReferencesModel(references, ( localizeWithPath(_moduleId, 30, 'References')))))));
+            const references = createCancelablePromise(token => getReferencesAtPosition(languageFeaturesService.referenceProvider, control.getModel(), Position.lift(position), false, false, token).then(references => ( (new ReferencesModel(references, ( localize(1400, 'References')))))));
             const range = ( (new Range(position.lineNumber, position.column, position.lineNumber, position.column)));
             return Promise.resolve(controller.toggleWidget(range, references, false));
         });

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.js

@@ -14,8 +14,8 @@ function shouldIncludeLocationLink(sourceModel, loc) {
     }
     return true;
 }
-async function getLocationLinks(model, position, registry, provide) {
-    const provider = registry.ordered(model);
+async function getLocationLinks(model, position, registry, recursive, provide) {
+    const provider = registry.ordered(model, recursive);
     const promises = ( provider.map((provider) => {
         return Promise.resolve(provide(provider, model, position)).then(undefined, err => {
             onUnexpectedExternalError(err);
@@ -25,28 +25,28 @@ async function getLocationLinks(model, position, registry, provide) {
     const values = await Promise.all(promises);
     return coalesce(values.flat()).filter(loc => shouldIncludeLocationLink(model, loc));
 }
-function getDefinitionsAtPosition(registry, model, position, token) {
-    return getLocationLinks(model, position, registry, (provider, model, position) => {
+function getDefinitionsAtPosition(registry, model, position, recursive, token) {
+    return getLocationLinks(model, position, registry, recursive, (provider, model, position) => {
         return provider.provideDefinition(model, position, token);
     });
 }
-function getDeclarationsAtPosition(registry, model, position, token) {
-    return getLocationLinks(model, position, registry, (provider, model, position) => {
+function getDeclarationsAtPosition(registry, model, position, recursive, token) {
+    return getLocationLinks(model, position, registry, recursive, (provider, model, position) => {
         return provider.provideDeclaration(model, position, token);
     });
 }
-function getImplementationsAtPosition(registry, model, position, token) {
-    return getLocationLinks(model, position, registry, (provider, model, position) => {
+function getImplementationsAtPosition(registry, model, position, recursive, token) {
+    return getLocationLinks(model, position, registry, recursive, (provider, model, position) => {
         return provider.provideImplementation(model, position, token);
     });
 }
-function getTypeDefinitionsAtPosition(registry, model, position, token) {
-    return getLocationLinks(model, position, registry, (provider, model, position) => {
+function getTypeDefinitionsAtPosition(registry, model, position, recursive, token) {
+    return getLocationLinks(model, position, registry, recursive, (provider, model, position) => {
         return provider.provideTypeDefinition(model, position, token);
     });
 }
-function getReferencesAtPosition(registry, model, position, compact, token) {
-    return getLocationLinks(model, position, registry, async (provider, model, position) => {
+function getReferencesAtPosition(registry, model, position, compact, recursive, token) {
+    return getLocationLinks(model, position, registry, recursive, async (provider, model, position) => {
         const result = (await provider.provideReferences(model, position, { includeDeclaration: true }, token))?.filter(ref => shouldIncludeLocationLink(model, ref));
         if (!compact || !result || result.length !== 2) {
             return result;
@@ -67,27 +67,52 @@ async function _sortedAndDeduped(callback) {
 }
 registerModelAndPositionCommand('_executeDefinitionProvider', (accessor, model, position) => {
     const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-    const promise = getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, CancellationToken.None);
+    const promise = getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, false, CancellationToken.None);
+    return _sortedAndDeduped(() => promise);
+});
+registerModelAndPositionCommand('_executeDefinitionProvider_recursive', (accessor, model, position) => {
+    const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+    const promise = getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, true, CancellationToken.None);
     return _sortedAndDeduped(() => promise);
 });
 registerModelAndPositionCommand('_executeTypeDefinitionProvider', (accessor, model, position) => {
     const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-    const promise = getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, CancellationToken.None);
+    const promise = getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, false, CancellationToken.None);
+    return _sortedAndDeduped(() => promise);
+});
+registerModelAndPositionCommand('_executeTypeDefinitionProvider_recursive', (accessor, model, position) => {
+    const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+    const promise = getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, true, CancellationToken.None);
     return _sortedAndDeduped(() => promise);
 });
 registerModelAndPositionCommand('_executeDeclarationProvider', (accessor, model, position) => {
     const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-    const promise = getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, CancellationToken.None);
+    const promise = getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, false, CancellationToken.None);
+    return _sortedAndDeduped(() => promise);
+});
+registerModelAndPositionCommand('_executeDeclarationProvider_recursive', (accessor, model, position) => {
+    const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+    const promise = getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, true, CancellationToken.None);
     return _sortedAndDeduped(() => promise);
 });
 registerModelAndPositionCommand('_executeReferenceProvider', (accessor, model, position) => {
     const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-    const promise = getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, CancellationToken.None);
+    const promise = getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, false, CancellationToken.None);
+    return _sortedAndDeduped(() => promise);
+});
+registerModelAndPositionCommand('_executeReferenceProvider_recursive', (accessor, model, position) => {
+    const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+    const promise = getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, true, CancellationToken.None);
     return _sortedAndDeduped(() => promise);
 });
 registerModelAndPositionCommand('_executeImplementationProvider', (accessor, model, position) => {
     const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-    const promise = getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, CancellationToken.None);
+    const promise = getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, false, CancellationToken.None);
+    return _sortedAndDeduped(() => promise);
+});
+registerModelAndPositionCommand('_executeImplementationProvider_recursive', (accessor, model, position) => {
+    const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+    const promise = getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, true, CancellationToken.None);
     return _sortedAndDeduped(() => promise);
 });
 export { getDeclarationsAtPosition, getDefinitionsAtPosition, getImplementationsAtPosition, getReferencesAtPosition, getTypeDefinitionsAtPosition };

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js

@@ -13,14 +13,13 @@ import { ILanguageService } from '../../../../common/languages/language.js';
 import { ITextModelService } from '../../../../common/services/resolverService.js';
 import { ClickLinkGesture } from './clickLinkGesture.js';
 import { PeekContext } from '../../../peekView/browser/peekView.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
 import { DefinitionAction } from '../goToCommands.js';
 import { getDefinitionsAtPosition } from '../goToSymbol.js';
 import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
 import { ModelDecorationInjectedTextOptions } from '../../../../common/model/textModel.js';
 var GotoDefinitionAtPositionEditorContribution_1;
-const _moduleId = "vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition";
 let GotoDefinitionAtPositionEditorContribution = class GotoDefinitionAtPositionEditorContribution {
     static { GotoDefinitionAtPositionEditorContribution_1 = this; }
     static { this.ID = 'editor.contrib.gotodefinitionatposition'; }
@@ -129,7 +128,7 @@ let GotoDefinitionAtPositionEditorContribution = class GotoDefinitionAtPositionE
                     combinedRange = Range.plusRange(combinedRange, originSelectionRange);
                 }
             }
-            this.addDecoration(combinedRange, ( (new MarkdownString())).appendText(( localizeWithPath(_moduleId, 0, "Click to show {0} definitions.", results.length))));
+            this.addDecoration(combinedRange, ( (new MarkdownString())).appendText(( localize(1401, "Click to show {0} definitions.", results.length))));
         }
         else {
             const result = results[0];
@@ -215,7 +214,7 @@ let GotoDefinitionAtPositionEditorContribution = class GotoDefinitionAtPositionE
         if (!model) {
             return Promise.resolve(null);
         }
-        return getDefinitionsAtPosition(this.languageFeaturesService.definitionProvider, model, position, token);
+        return getDefinitionsAtPosition(this.languageFeaturesService.definitionProvider, model, position, false, token);
     }
     gotoDefinition(position, openToSide) {
         this.editor.setPosition(position);