@codingame/monaco-vscode-api 13.1.6 → 14.0.0

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { binarySearch } from '../../../../base/common/arrays.js';
+import { equals, binarySearch2 } from '../../../../base/common/arrays.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { LinkedList } from '../../../../base/common/linkedList.js';
@@ -12,6 +12,7 @@ import { createDecorator } from '../../../../platform/instantiation/common/insta
 import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IMarkerService } from '../../../../platform/markers/common/markers.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { isEqual } from '../../../../base/common/resources.js';
 
 class MarkerCoordinate {
     constructor(marker, index, total) {
@@ -49,21 +50,33 @@ let MarkerList = class MarkerList {
             return res;
         };
         const updateMarker = () => {
-            this._markers = this._markerService.read({
+            let newMarkers = this._markerService.read({
                 resource: URI.isUri(resourceFilter) ? resourceFilter : undefined,
                 severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info
             });
             if (typeof resourceFilter === 'function') {
-                this._markers = this._markers.filter(m => this._resourceFilter(m.resource));
+                newMarkers = newMarkers.filter(m => this._resourceFilter(m.resource));
             }
-            this._markers.sort(compareMarker);
+            newMarkers.sort(compareMarker);
+            if (equals(newMarkers, this._markers, (a, b) => ( a.resource.toString()) === ( b.resource.toString())
+                && a.startLineNumber === b.startLineNumber
+                && a.startColumn === b.startColumn
+                && a.endLineNumber === b.endLineNumber
+                && a.endColumn === b.endColumn
+                && a.severity === b.severity
+                && a.message === b.message)) {
+                return false;
+            }
+            this._markers = newMarkers;
+            return true;
         };
         updateMarker();
         this._dispoables.add(_markerService.onMarkerChanged(uris => {
             if (!this._resourceFilter || ( uris.some(uri => this._resourceFilter(uri)))) {
-                updateMarker();
-                this._nextIdx = -1;
-                this._onDidChange.fire();
+                if (updateMarker()) {
+                    this._nextIdx = -1;
+                    this._onDidChange.fire();
+                }
             }
         }));
     }
@@ -85,39 +98,52 @@ let MarkerList = class MarkerList {
         return marker && ( new MarkerCoordinate(marker, this._nextIdx + 1, this._markers.length));
     }
     _initIdx(model, position, fwd) {
-        let found = false;
-        let idx = this._markers.findIndex(marker => ( marker.resource.toString()) === ( model.uri.toString()));
+        let idx = this._markers.findIndex(marker => isEqual(marker.resource, model.uri));
         if (idx < 0) {
-            idx = binarySearch(this._markers, { resource: model.uri }, (a, b) => compare(( a.resource.toString()), ( b.resource.toString())));
+            idx = binarySearch2(this._markers.length, idx => compare(( this._markers[idx].resource.toString()), ( model.uri.toString())));
             if (idx < 0) {
                 idx = ~idx;
             }
+            if (fwd) {
+                this._nextIdx = idx;
+            }
+            else {
+                this._nextIdx = (this._markers.length + idx - 1) % this._markers.length;
+            }
         }
-        for (let i = idx; i < this._markers.length; i++) {
-            let range = Range.lift(this._markers[i]);
-            if (range.isEmpty()) {
-                const word = model.getWordAtPosition(range.getStartPosition());
-                if (word) {
-                    range = ( new Range(
-                        range.startLineNumber,
-                        word.startColumn,
-                        range.startLineNumber,
-                        word.endColumn
-                    ));
+        else {
+            let found = false;
+            let wentPast = false;
+            for (let i = idx; i < this._markers.length; i++) {
+                let range = Range.lift(this._markers[i]);
+                if (range.isEmpty()) {
+                    const word = model.getWordAtPosition(range.getStartPosition());
+                    if (word) {
+                        range = ( new Range(
+                            range.startLineNumber,
+                            word.startColumn,
+                            range.startLineNumber,
+                            word.endColumn
+                        ));
+                    }
+                }
+                if (position && (range.containsPosition(position) || position.isBeforeOrEqual(range.getStartPosition()))) {
+                    this._nextIdx = i;
+                    found = true;
+                    wentPast = !range.containsPosition(position);
+                    break;
+                }
+                if (( this._markers[i].resource.toString()) !== ( model.uri.toString())) {
+                    break;
                 }
             }
-            if (position && (range.containsPosition(position) || position.isBeforeOrEqual(range.getStartPosition()))) {
-                this._nextIdx = i;
-                found = true;
-                break;
+            if (!found) {
+                this._nextIdx = fwd ? 0 : this._markers.length - 1;
             }
-            if (( this._markers[i].resource.toString()) !== ( model.uri.toString())) {
-                break;
+            else if (wentPast && !fwd) {
+                this._nextIdx -= 1;
             }
         }
-        if (!found) {
-            this._nextIdx = fwd ? 0 : this._markers.length - 1;
-        }
         if (this._nextIdx < 0) {
             this._nextIdx = this._markers.length - 1;
         }

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.d.ts

@@ -30,7 +30,7 @@ export declare abstract class SymbolNavigationAction extends EditorAction2 {
     runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, arg?: SymbolNavigationAnchor | unknown, range?: Range): Promise<void>;
     protected abstract _getLocationModel(languageFeaturesService: ILanguageFeaturesService, model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<ReferencesModel | undefined>;
     protected abstract _getNoResultFoundMessage(info: IWordAtPosition | null): string;
-    protected abstract _getAlternativeCommand(editor: IActiveCodeEditor): string;
+    protected abstract _getAlternativeCommand(editor: IActiveCodeEditor): string | undefined;
     protected abstract _getGoToPreference(editor: IActiveCodeEditor): GoToLocationValues;
     private _onResult;
     private _openReference;

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

@@ -37,7 +37,7 @@ import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys
 
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.EditorContextPeek,
-    title: ( localize(1053, "Peek")),
+    title: ( localize(1062, "Peek")),
     group: 'navigation',
     order: 100
 });
@@ -103,7 +103,7 @@ class SymbolNavigationAction extends EditorAction2 {
             let altAction;
             if (references.referenceAt(model.uri, position)) {
                 const altActionId = this._getAlternativeCommand(editor);
-                if (!( SymbolNavigationAction._activeAlternativeCommands.has(altActionId)) && ( SymbolNavigationAction._allSymbolNavigationCommands.has(altActionId))) {
+                if (altActionId !== undefined && !( SymbolNavigationAction._activeAlternativeCommands.has(altActionId)) && ( SymbolNavigationAction._allSymbolNavigationCommands.has(altActionId))) {
                     altAction = SymbolNavigationAction._allSymbolNavigationCommands.get(altActionId);
                 }
             }
@@ -198,13 +198,13 @@ class DefinitionAction extends SymbolNavigationAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (new ReferencesModel(
             await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, false, token),
-            localize(1054, 'Definitions')
+            localize(1063, 'Definitions')
         ));
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localize(1055, "No definition found for '{0}'", info.word))
-            : ( localize(1056, "No definition found"));
+            ? ( localize(1064, "No definition found for '{0}'", info.word))
+            : ( localize(1065, "No definition found"));
     }
     _getAlternativeCommand(editor) {
         return editor.getOption(EditorOption.gotoLocation).alternativeDefinitionCommand;
@@ -223,8 +223,8 @@ registerAction2(class GoToDefinitionAction extends DefinitionAction {
         }, {
             id: GoToDefinitionAction.id,
             title: {
-                ...( localize2(1057, "Go to Definition")),
-                mnemonicTitle: ( localize(1058, "Go to &&Definition")),
+                ...( localize2(1066, "Go to Definition")),
+                mnemonicTitle: ( localize(1067, "Go to &&Definition")),
             },
             precondition: EditorContextKeys.hasDefinitionProvider,
             keybinding: [{
@@ -259,7 +259,7 @@ registerAction2(class OpenDefinitionToSideAction extends DefinitionAction {
             muteMessage: false
         }, {
             id: OpenDefinitionToSideAction.id,
-            title: ( localize2(1059, "Open Definition to the Side")),
+            title: ( localize2(1068, "Open Definition to the Side")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.hasDefinitionProvider, ( EditorContextKeys.isInEmbeddedEditor.toNegated()))),
             keybinding: [{
                     when: EditorContextKeys.editorTextFocus,
@@ -283,7 +283,7 @@ registerAction2(class PeekDefinitionAction extends DefinitionAction {
             muteMessage: false
         }, {
             id: PeekDefinitionAction.id,
-            title: ( localize2(1060, "Peek Definition")),
+            title: ( localize2(1069, "Peek Definition")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.hasDefinitionProvider,
                 PeekContext.notInPeekEditor,
@@ -308,13 +308,13 @@ class DeclarationAction extends SymbolNavigationAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (new ReferencesModel(
             await getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, false, token),
-            localize(1061, 'Declarations')
+            localize(1070, 'Declarations')
         ));
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localize(1062, "No declaration found for '{0}'", info.word))
-            : ( localize(1063, "No declaration found"));
+            ? ( localize(1071, "No declaration found for '{0}'", info.word))
+            : ( localize(1072, "No declaration found"));
     }
     _getAlternativeCommand(editor) {
         return editor.getOption(EditorOption.gotoLocation).alternativeDeclarationCommand;
@@ -333,8 +333,8 @@ registerAction2(class GoToDeclarationAction extends DeclarationAction {
         }, {
             id: GoToDeclarationAction.id,
             title: {
-                ...( localize2(1064, "Go to Declaration")),
-                mnemonicTitle: ( localize(1065, "Go to &&Declaration")),
+                ...( localize2(1073, "Go to Declaration")),
+                mnemonicTitle: ( localize(1074, "Go to &&Declaration")),
             },
             precondition: ( ContextKeyExpr.and(EditorContextKeys.hasDeclarationProvider, ( EditorContextKeys.isInEmbeddedEditor.toNegated()))),
             menu: [{
@@ -351,8 +351,8 @@ registerAction2(class GoToDeclarationAction extends DeclarationAction {
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localize(1062, "No declaration found for '{0}'", info.word))
-            : ( localize(1063, "No declaration found"));
+            ? ( localize(1071, "No declaration found for '{0}'", info.word))
+            : ( localize(1072, "No declaration found"));
     }
 });
 registerAction2(class PeekDeclarationAction extends DeclarationAction {
@@ -363,7 +363,7 @@ registerAction2(class PeekDeclarationAction extends DeclarationAction {
             muteMessage: false
         }, {
             id: 'editor.action.peekDeclaration',
-            title: ( localize2(1066, "Peek Declaration")),
+            title: ( localize2(1075, "Peek Declaration")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.hasDeclarationProvider,
                 PeekContext.notInPeekEditor,
@@ -381,13 +381,13 @@ class TypeDefinitionAction extends SymbolNavigationAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (new ReferencesModel(
             await getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, false, token),
-            localize(1067, 'Type Definitions')
+            localize(1076, 'Type Definitions')
         ));
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localize(1068, "No type definition found for '{0}'", info.word))
-            : ( localize(1069, "No type definition found"));
+            ? ( localize(1077, "No type definition found for '{0}'", info.word))
+            : ( localize(1078, "No type definition found"));
     }
     _getAlternativeCommand(editor) {
         return editor.getOption(EditorOption.gotoLocation).alternativeTypeDefinitionCommand;
@@ -406,8 +406,8 @@ registerAction2(class GoToTypeDefinitionAction extends TypeDefinitionAction {
         }, {
             id: GoToTypeDefinitionAction.ID,
             title: {
-                ...( localize2(1070, "Go to Type Definition")),
-                mnemonicTitle: ( localize(1071, "Go to &&Type Definition")),
+                ...( localize2(1079, "Go to Type Definition")),
+                mnemonicTitle: ( localize(1080, "Go to &&Type Definition")),
             },
             precondition: EditorContextKeys.hasTypeDefinitionProvider,
             keybinding: {
@@ -437,7 +437,7 @@ registerAction2(class PeekTypeDefinitionAction extends TypeDefinitionAction {
             muteMessage: false
         }, {
             id: PeekTypeDefinitionAction.ID,
-            title: ( localize2(1072, "Peek Type Definition")),
+            title: ( localize2(1081, "Peek Type Definition")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.hasTypeDefinitionProvider,
                 PeekContext.notInPeekEditor,
@@ -455,13 +455,13 @@ class ImplementationAction extends SymbolNavigationAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (new ReferencesModel(
             await getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, false, token),
-            localize(1073, 'Implementations')
+            localize(1082, 'Implementations')
         ));
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localize(1074, "No implementation found for '{0}'", info.word))
-            : ( localize(1075, "No implementation found"));
+            ? ( localize(1083, "No implementation found for '{0}'", info.word))
+            : ( localize(1084, "No implementation found"));
     }
     _getAlternativeCommand(editor) {
         return editor.getOption(EditorOption.gotoLocation).alternativeImplementationCommand;
@@ -480,8 +480,8 @@ registerAction2(class GoToImplementationAction extends ImplementationAction {
         }, {
             id: GoToImplementationAction.ID,
             title: {
-                ...( localize2(1076, "Go to Implementations")),
-                mnemonicTitle: ( localize(1077, "Go to &&Implementations")),
+                ...( localize2(1085, "Go to Implementations")),
+                mnemonicTitle: ( localize(1086, "Go to &&Implementations")),
             },
             precondition: EditorContextKeys.hasImplementationProvider,
             keybinding: {
@@ -511,7 +511,7 @@ registerAction2(class PeekImplementationAction extends ImplementationAction {
             muteMessage: false
         }, {
             id: PeekImplementationAction.ID,
-            title: ( localize2(1078, "Peek Implementations")),
+            title: ( localize2(1087, "Peek Implementations")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.hasImplementationProvider,
                 PeekContext.notInPeekEditor,
@@ -533,8 +533,8 @@ registerAction2(class PeekImplementationAction extends ImplementationAction {
 class ReferencesAction extends SymbolNavigationAction {
     _getNoResultFoundMessage(info) {
         return info
-            ? ( localize(1079, "No references found for '{0}'", info.word))
-            : ( localize(1080, "No references found"));
+            ? ( localize(1088, "No references found for '{0}'", info.word))
+            : ( localize(1089, "No references found"));
     }
     _getAlternativeCommand(editor) {
         return editor.getOption(EditorOption.gotoLocation).alternativeReferenceCommand;
@@ -552,8 +552,8 @@ registerAction2(class GoToReferencesAction extends ReferencesAction {
         }, {
             id: 'editor.action.goToReferences',
             title: {
-                ...( localize2(1081, "Go to References")),
-                mnemonicTitle: ( localize(1082, "Go to &&References")),
+                ...( localize2(1090, "Go to References")),
+                mnemonicTitle: ( localize(1091, "Go to &&References")),
             },
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.hasReferenceProvider,
@@ -580,7 +580,7 @@ registerAction2(class GoToReferencesAction extends ReferencesAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (new ReferencesModel(
             await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, true, false, token),
-            localize(1083, 'References')
+            localize(1092, 'References')
         ));
     }
 });
@@ -592,7 +592,7 @@ registerAction2(class PeekReferencesAction extends ReferencesAction {
             muteMessage: false
         }, {
             id: 'editor.action.referenceSearch.trigger',
-            title: ( localize2(1084, "Peek References")),
+            title: ( localize2(1093, "Peek References")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.hasReferenceProvider,
                 PeekContext.notInPeekEditor,
@@ -608,7 +608,7 @@ registerAction2(class PeekReferencesAction extends ReferencesAction {
     async _getLocationModel(languageFeaturesService, model, position, token) {
         return (new ReferencesModel(
             await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, false, token),
-            localize(1083, 'References')
+            localize(1092, 'References')
         ));
     }
 });
@@ -616,22 +616,24 @@ class GenericGoToLocationAction extends SymbolNavigationAction {
     constructor(config, _references, _gotoMultipleBehaviour) {
         super(config, {
             id: 'editor.action.goToLocation',
-            title: ( localize2(1085, "Go to Any Symbol")),
+            title: ( localize2(1094, "Go to Any Symbol")),
             precondition: ( ContextKeyExpr.and(PeekContext.notInPeekEditor, ( EditorContextKeys.isInEmbeddedEditor.toNegated()))),
         });
         this._references = _references;
         this._gotoMultipleBehaviour = _gotoMultipleBehaviour;
     }
     async _getLocationModel(languageFeaturesService, _model, _position, _token) {
-        return (new ReferencesModel(this._references, localize(1086, 'Locations')));
+        return (new ReferencesModel(this._references, localize(1095, 'Locations')));
     }
     _getNoResultFoundMessage(info) {
-        return info && ( localize(1087, "No results for '{0}'", info.word)) || '';
+        return info && ( localize(1096, "No results for '{0}'", info.word)) || '';
     }
     _getGoToPreference(editor) {
         return this._gotoMultipleBehaviour ?? editor.getOption(EditorOption.gotoLocation).multipleReferences;
     }
-    _getAlternativeCommand() { return ''; }
+    _getAlternativeCommand() {
+        return undefined;
+    }
 }
 CommandsRegistry.registerCommand({
     id: 'editor.action.goToLocations',
@@ -701,7 +703,7 @@ CommandsRegistry.registerCommand({
             if (!controller) {
                 return undefined;
             }
-            const references = createCancelablePromise(token => getReferencesAtPosition(languageFeaturesService.referenceProvider, control.getModel(), Position.lift(position), false, false, token).then(references => ( new ReferencesModel(references, ( localize(1083, 'References'))))));
+            const references = createCancelablePromise(token => getReferencesAtPosition(languageFeaturesService.referenceProvider, control.getModel(), Position.lift(position), false, false, token).then(references => ( new ReferencesModel(references, ( localize(1092, '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/link/goToDefinitionAtPosition.js

@@ -130,14 +130,14 @@ let GotoDefinitionAtPositionEditorContribution = class GotoDefinitionAtPositionE
                     combinedRange = Range.plusRange(combinedRange, originSelectionRange);
                 }
             }
-            this.addDecoration(combinedRange, ( new MarkdownString()).appendText(( localize(1088, "Click to show {0} definitions.", results.length))));
+            this.addDecoration(combinedRange, ( new MarkdownString()).appendText(( localize(1097, "Click to show {0} definitions.", results.length))));
         }
         else {
             const result = results[0];
             if (!result.uri) {
                 return;
             }
-            this.textModelResolverService.createModelReference(result.uri).then(ref => {
+            return this.textModelResolverService.createModelReference(result.uri).then(ref => {
                 if (!ref.object || !ref.object.textEditorModel) {
                     ref.dispose();
                     return;
@@ -161,6 +161,7 @@ let GotoDefinitionAtPositionEditorContribution = class GotoDefinitionAtPositionE
         if (numberOfLinesInRange >= GotoDefinitionAtPositionEditorContribution_1.MAX_SOURCE_PREVIEW_LINES) {
             rangeToUse = this.getPreviewRangeBasedOnIndentation(textEditorModel, startLineNumber);
         }
+        rangeToUse = textEditorModel.validateRange(rangeToUse);
         const previewValue = this.stripIndentationFromPreviewRange(textEditorModel, startLineNumber, rangeToUse);
         return previewValue;
     }

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

@@ -8,7 +8,8 @@ import { ICodeEditorService } from '../../../../browser/services/codeEditorServi
 import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
-import { getOuterEditor, PeekContext } from '../../../peekView/browser/peekView.js';
+import { PeekContext } from '../../../peekView/browser/peekView.js';
+import { getOuterEditor } from '../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { localize } from '../../../../../nls.js';
 import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
@@ -29,7 +30,7 @@ import { InputFocusedContext } from '../../../../../platform/contextkey/common/c
 
 var ReferencesController_1;
 const ctxReferenceSearchVisible = ( new RawContextKey('referenceSearchVisible', false, ( localize(
-    1089,
+    1098,
     "Whether reference peek is visible, like 'Peek References' or 'Peek Definition'"
 ))));
 let ReferencesController = class ReferencesController {
@@ -79,7 +80,7 @@ let ReferencesController = class ReferencesController {
         const storageKey = 'peekViewLayout';
         const data = LayoutData.fromJSON(this._storageService.get(storageKey, StorageScope.PROFILE, '{}'));
         this._widget = this._instantiationService.createInstance(ReferenceWidget, this._editor, this._defaultTreeKeyboardSupport, data);
-        this._widget.setTitle(( localize(1090, "Loading...")));
+        this._widget.setTitle(( localize(1099, "Loading...")));
         this._widget.show(range);
         this._disposables.add(this._widget.onDidClose(() => {
             modelPromise.cancel();
@@ -129,7 +130,7 @@ let ReferencesController = class ReferencesController {
             return this._widget.setModel(this._model).then(() => {
                 if (this._widget && this._model && this._editor.hasModel()) {
                     if (!this._model.isEmpty) {
-                        this._widget.setMetaTitle(( localize(1091, "{0} ({1})", this._model.title, this._model.references.length)));
+                        this._widget.setMetaTitle(( localize(1100, "{0} ({1})", this._model.title, this._model.references.length)));
                     }
                     else {
                         this._widget.setMetaTitle('');

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

@@ -98,10 +98,10 @@ let FileReferencesTemplate = class FileReferencesTemplate extends Disposable {
         const len = element.children.length;
         this.badge.setCount(len);
         if (len > 1) {
-            this.badge.setTitleFormat(( localize(1092, "{0} references", len)));
+            this.badge.setTitleFormat(( localize(1101, "{0} references", len)));
         }
         else {
-            this.badge.setTitleFormat(( localize(1093, "{0} reference", len)));
+            this.badge.setTitleFormat(( localize(1102, "{0} reference", len)));
         }
     }
 };
@@ -168,7 +168,7 @@ class OneReferenceRenderer {
 }
 class AccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(1094, "References");
+        return localize(1103, "References");
     }
     getAriaLabel(element) {
         return element.ariaMessage;

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

@@ -246,7 +246,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
         };
         this._preview = this._instantiationService.createInstance(EmbeddedCodeEditorWidget, this._previewContainer, options, {}, this.editor);
         hide(this._previewContainer);
-        this._previewNotAvailableMessage = this._instantiationService.createInstance(TextModel, ( localize(1095, "no preview available")), PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null);
+        this._previewNotAvailableMessage = this._instantiationService.createInstance(TextModel, ( localize(1104, "no preview available")), PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null);
         this._treeContainer = append(containerElement, $('div.ref-tree.inline'));
         const treeOptions = {
             keyboardSupport: this._defaultTreeKeyboardSupport,
@@ -352,7 +352,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
         }
         if (this._model.isEmpty) {
             this.setTitle('');
-            this._messageContainer.innerText = ( localize(1096, "No results"));
+            this._messageContainer.innerText = ( localize(1105, "No results"));
             show(this._messageContainer);
             return Promise.resolve(undefined);
         }
@@ -407,7 +407,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
             this.setTitle(basenameOrAuthority(reference.uri), this._uriLabel.getUriLabel(dirname(reference.uri)));
         }
         else {
-            this.setTitle(( localize(1097, "References")));
+            this.setTitle(( localize(1106, "References")));
         }
         const promise = this._textModelResolverService.createModelReference(reference.uri);
         if (this._tree.getInput() === reference.parent) {

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

@@ -32,7 +32,7 @@ class OneReference {
         const preview = this.parent.getPreview(this)?.preview(this.range);
         if (!preview) {
             return localize(
-                1098,
+                1107,
                 "in {0} on line {1} at column {2}",
                 basename(this.uri),
                 this.range.startLineNumber,
@@ -41,7 +41,7 @@ class OneReference {
         }
         else {
             return localize(
-                1099,
+                1108,
                 "{0} in {1} on line {2} at column {3}",
                 preview.value,
                 basename(this.uri),
@@ -94,7 +94,7 @@ class FileReferences {
         const len = this.children.length;
         if (len === 1) {
             return localize(
-                1100,
+                1109,
                 "1 symbol in {0}, full path {1}",
                 basename(this.uri),
                 this.uri.fsPath
@@ -102,7 +102,7 @@ class FileReferences {
         }
         else {
             return localize(
-                1101,
+                1110,
                 "{0} symbols in {1}, full path {2}",
                 len,
                 basename(this.uri),
@@ -173,14 +173,14 @@ class ReferencesModel {
     }
     get ariaMessage() {
         if (this.isEmpty) {
-            return localize(1102, "No results found");
+            return localize(1111, "No results found");
         }
         else if (this.references.length === 1) {
-            return localize(1103, "Found 1 symbol in {0}", this.references[0].uri.fsPath);
+            return localize(1112, "Found 1 symbol in {0}", this.references[0].uri.fsPath);
         }
         else if (this.groups.length === 1) {
             return localize(
-                1104,
+                1113,
                 "Found {0} symbols in {1}",
                 this.references.length,
                 this.groups[0].uri.fsPath
@@ -188,7 +188,7 @@ class ReferencesModel {
         }
         else {
             return localize(
-                1105,
+                1114,
                 "Found {0} symbols in {1} files",
                 this.references.length,
                 this.groups.length

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

@@ -18,7 +18,7 @@ import { KeybindingWeight, KeybindingsRegistry } from '../../../../platform/keyb
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 
 const ctxHasSymbols = ( new RawContextKey('hasSymbols', false, ( localize(
-    1106,
+    1115,
     "Whether there are symbol locations that can be navigated via keyboard-only."
 ))));
 const ISymbolNavigationService = ( createDecorator('ISymbolNavigationService'));
@@ -104,14 +104,14 @@ let SymbolNavigationService = class SymbolNavigationService {
         const kb = this._keybindingService.lookupKeybinding('editor.gotoNextSymbolFromResult');
         const message = kb
             ? ( localize(
-            1107,
+            1116,
             "Symbol {0} of {1}, {2} for next",
             this._currentIdx + 1,
             this._currentModel.references.length,
             kb.getLabel()
         ))
             : ( localize(
-            1108,
+            1117,
             "Symbol {0} of {1}",
             this._currentIdx + 1,
             this._currentModel.references.length

package/vscode/src/vs/editor/contrib/gpu/browser/gpuActions.js

@@ -19,7 +19,7 @@ class DebugEditorGpuRendererAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.debugEditorGpuRenderer',
-            label: ( localize2(1109, "Developer: Debug Editor GPU Renderer")),
+            label: ( localize2(1118, "Developer: Debug Editor GPU Renderer")),
             precondition: ContextKeyExpr.true(),
         });
     }
@@ -28,15 +28,15 @@ class DebugEditorGpuRendererAction extends EditorAction {
         const quickInputService = accessor.get(IQuickInputService);
         const choice = await quickInputService.pick([
             {
-                label: ( localize(1110, "Log Texture Atlas Stats")),
+                label: ( localize(1119, "Log Texture Atlas Stats")),
                 id: 'logTextureAtlasStats',
             },
             {
-                label: ( localize(1111, "Save Texture Atlas")),
+                label: ( localize(1120, "Save Texture Atlas")),
                 id: 'saveTextureAtlas',
             },
             {
-                label: ( localize(1112, "Draw Glyph")),
+                label: ( localize(1121, "Draw Glyph")),
                 id: 'drawGlyph',
             },
         ], { canPickMany: false });
@@ -100,7 +100,7 @@ class DebugEditorGpuRendererAction extends EditorAction {
                     }
                     const tokenMetadata = 0;
                     const charMetadata = 0;
-                    const rasterizedGlyph = atlas.getGlyph(rasterizer, chars, tokenMetadata, charMetadata);
+                    const rasterizedGlyph = atlas.getGlyph(rasterizer, chars, tokenMetadata, charMetadata, 0);
                     if (!rasterizedGlyph) {
                         return;
                     }