@codingame/monaco-vscode-api 21.6.0 → 22.0.1

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(1126, "Peek")),
+    title: ( localize(1129, "Peek")),
     group: 'navigation',
     order: 100
 });
@@ -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(1127, 'Definitions')
+            localize(1130, 'Definitions')
         ));
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localize(1128, "No definition found for '{0}'", info.word))
-            : ( localize(1129, "No definition found"));
+            ? ( localize(1131, "No definition found for '{0}'", info.word))
+            : ( localize(1132, "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(1130, "Go to Definition")),
-                mnemonicTitle: ( localize(1131, "Go to &&Definition")),
+                ...( localize2(1133, "Go to Definition")),
+                mnemonicTitle: ( localize(1134, "Go to &&Definition")),
             },
             precondition: EditorContextKeys.hasDefinitionProvider,
             keybinding: [{
@@ -259,7 +259,7 @@ registerAction2(class OpenDefinitionToSideAction extends DefinitionAction {
             muteMessage: false
         }, {
             id: OpenDefinitionToSideAction.id,
-            title: ( localize2(1132, "Open Definition to the Side")),
+            title: ( localize2(1135, "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(1133, "Peek Definition")),
+            title: ( localize2(1136, "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(1134, 'Declarations')
+            localize(1137, 'Declarations')
         ));
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localize(1135, "No declaration found for '{0}'", info.word))
-            : ( localize(1136, "No declaration found"));
+            ? ( localize(1138, "No declaration found for '{0}'", info.word))
+            : ( localize(1139, "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(1137, "Go to Declaration")),
-                mnemonicTitle: ( localize(1138, "Go to &&Declaration")),
+                ...( localize2(1140, "Go to Declaration")),
+                mnemonicTitle: ( localize(1141, "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(1135, "No declaration found for '{0}'", info.word))
-            : ( localize(1136, "No declaration found"));
+            ? ( localize(1138, "No declaration found for '{0}'", info.word))
+            : ( localize(1139, "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(1139, "Peek Declaration")),
+            title: ( localize2(1142, "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(1140, 'Type Definitions')
+            localize(1143, 'Type Definitions')
         ));
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localize(1141, "No type definition found for '{0}'", info.word))
-            : ( localize(1142, "No type definition found"));
+            ? ( localize(1144, "No type definition found for '{0}'", info.word))
+            : ( localize(1145, "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(1143, "Go to Type Definition")),
-                mnemonicTitle: ( localize(1144, "Go to &&Type Definition")),
+                ...( localize2(1146, "Go to Type Definition")),
+                mnemonicTitle: ( localize(1147, "Go to &&Type Definition")),
             },
             precondition: EditorContextKeys.hasTypeDefinitionProvider,
             keybinding: {
@@ -437,7 +437,7 @@ registerAction2(class PeekTypeDefinitionAction extends TypeDefinitionAction {
             muteMessage: false
         }, {
             id: PeekTypeDefinitionAction.ID,
-            title: ( localize2(1145, "Peek Type Definition")),
+            title: ( localize2(1148, "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(1146, 'Implementations')
+            localize(1149, 'Implementations')
         ));
     }
     _getNoResultFoundMessage(info) {
         return info && info.word
-            ? ( localize(1147, "No implementation found for '{0}'", info.word))
-            : ( localize(1148, "No implementation found"));
+            ? ( localize(1150, "No implementation found for '{0}'", info.word))
+            : ( localize(1151, "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(1149, "Go to Implementations")),
-                mnemonicTitle: ( localize(1150, "Go to &&Implementations")),
+                ...( localize2(1152, "Go to Implementations")),
+                mnemonicTitle: ( localize(1153, "Go to &&Implementations")),
             },
             precondition: EditorContextKeys.hasImplementationProvider,
             keybinding: {
@@ -511,7 +511,7 @@ registerAction2(class PeekImplementationAction extends ImplementationAction {
             muteMessage: false
         }, {
             id: PeekImplementationAction.ID,
-            title: ( localize2(1151, "Peek Implementations")),
+            title: ( localize2(1154, "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(1152, "No references found for '{0}'", info.word))
-            : ( localize(1153, "No references found"));
+            ? ( localize(1155, "No references found for '{0}'", info.word))
+            : ( localize(1156, "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(1154, "Go to References")),
-                mnemonicTitle: ( localize(1155, "Go to &&References")),
+                ...( localize2(1157, "Go to References")),
+                mnemonicTitle: ( localize(1158, "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(1156, 'References')
+            localize(1159, 'References')
         ));
     }
 });
@@ -592,7 +592,7 @@ registerAction2(class PeekReferencesAction extends ReferencesAction {
             muteMessage: false
         }, {
             id: 'editor.action.referenceSearch.trigger',
-            title: ( localize2(1157, "Peek References")),
+            title: ( localize2(1160, "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(1156, 'References')
+            localize(1159, 'References')
         ));
     }
 });
@@ -616,17 +616,17 @@ class GenericGoToLocationAction extends SymbolNavigationAction {
     constructor(config, _references, _gotoMultipleBehaviour) {
         super(config, {
             id: 'editor.action.goToLocation',
-            title: ( localize2(1158, "Go to Any Symbol")),
+            title: ( localize2(1161, "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(1159, 'Locations')));
+        return (new ReferencesModel(this._references, localize(1162, 'Locations')));
     }
     _getNoResultFoundMessage(info) {
-        return info && ( localize(1160, "No results for '{0}'", info.word)) || '';
+        return info && ( localize(1163, "No results for '{0}'", info.word)) || '';
     }
     _getGoToPreference(editor) {
         return this._gotoMultipleBehaviour ?? editor.getOption(EditorOption.gotoLocation).multipleReferences;
@@ -703,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(1156, 'References'))))));
+            const references = createCancelablePromise(token => getReferencesAtPosition(languageFeaturesService.referenceProvider, control.getModel(), Position.lift(position), false, false, token).then(references => ( new ReferencesModel(references, ( localize(1159, '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/clickLinkGesture.d.ts

@@ -3,6 +3,7 @@ import { Event } from "../../../../../base/common/event.js";
 import { KeyCode } from "../../../../../base/common/keyCodes.js";
 import { Disposable } from "../../../../../base/common/lifecycle.js";
 import { ICodeEditor, IEditorMouseEvent, IMouseTarget } from "../../../../browser/editorBrowser.js";
+import { MouseMiddleClickAction } from "../../../../common/config/editorOptions.js";
 /**
  * An event that encapsulates the various trigger modifiers logic needed for go to definition.
  */
@@ -14,6 +15,7 @@ export declare class ClickLinkMouseEvent {
     readonly isLeftClick: boolean;
     readonly isMiddleClick: boolean;
     readonly isRightClick: boolean;
+    readonly mouseMiddleClickAction: MouseMiddleClickAction;
     constructor(source: IEditorMouseEvent, opts: ClickLinkOptions);
 }
 /**
@@ -27,11 +29,12 @@ export declare class ClickLinkKeyboardEvent {
 }
 export type TriggerModifier = "ctrlKey" | "shiftKey" | "altKey" | "metaKey";
 export declare class ClickLinkOptions {
+    readonly mouseMiddleClickAction: MouseMiddleClickAction;
     readonly triggerKey: KeyCode;
     readonly triggerModifier: TriggerModifier;
     readonly triggerSideBySideKey: KeyCode;
     readonly triggerSideBySideModifier: TriggerModifier;
-    constructor(triggerKey: KeyCode, triggerModifier: TriggerModifier, triggerSideBySideKey: KeyCode, triggerSideBySideModifier: TriggerModifier);
+    constructor(triggerKey: KeyCode, triggerModifier: TriggerModifier, triggerSideBySideKey: KeyCode, triggerSideBySideModifier: TriggerModifier, mouseMiddleClickAction: MouseMiddleClickAction);
     equals(other: ClickLinkOptions): boolean;
 }
 export interface IClickLinkGestureOptions {

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

@@ -14,7 +14,13 @@ class ClickLinkMouseEvent {
         this.isLeftClick = source.event.leftButton;
         this.isMiddleClick = source.event.middleButton;
         this.isRightClick = source.event.rightButton;
+        this.mouseMiddleClickAction = opts.mouseMiddleClickAction;
         this.hasTriggerModifier = hasModifier(source.event, opts.triggerModifier);
+        if (this.isMiddleClick && opts.mouseMiddleClickAction === 'ctrlLeftClick') {
+            this.isMiddleClick = false;
+            this.isLeftClick = true;
+            this.hasTriggerModifier = true;
+        }
         this.hasSideBySideModifier = hasModifier(source.event, opts.triggerSideBySideModifier);
         this.isNoneOrSingleMouseDown = (source.event.detail <= 1);
     }
@@ -27,7 +33,8 @@ class ClickLinkKeyboardEvent {
     }
 }
 class ClickLinkOptions {
-    constructor(triggerKey, triggerModifier, triggerSideBySideKey, triggerSideBySideModifier) {
+    constructor(triggerKey, triggerModifier, triggerSideBySideKey, triggerSideBySideModifier, mouseMiddleClickAction) {
+        this.mouseMiddleClickAction = mouseMiddleClickAction;
         this.triggerKey = triggerKey;
         this.triggerModifier = triggerModifier;
         this.triggerSideBySideKey = triggerSideBySideKey;
@@ -37,20 +44,21 @@ class ClickLinkOptions {
         return (this.triggerKey === other.triggerKey
             && this.triggerModifier === other.triggerModifier
             && this.triggerSideBySideKey === other.triggerSideBySideKey
-            && this.triggerSideBySideModifier === other.triggerSideBySideModifier);
+            && this.triggerSideBySideModifier === other.triggerSideBySideModifier
+            && this.mouseMiddleClickAction === other.mouseMiddleClickAction);
     }
 }
-function createOptions(multiCursorModifier) {
+function createOptions(multiCursorModifier, mouseMiddleClickAction) {
     if (multiCursorModifier === 'altKey') {
         if (isMacintosh) {
-            return ( new ClickLinkOptions(KeyCode.Meta, 'metaKey', KeyCode.Alt, 'altKey'));
+            return ( new ClickLinkOptions(KeyCode.Meta, 'metaKey', KeyCode.Alt, 'altKey', mouseMiddleClickAction));
         }
-        return ( new ClickLinkOptions(KeyCode.Ctrl, 'ctrlKey', KeyCode.Alt, 'altKey'));
+        return ( new ClickLinkOptions(KeyCode.Ctrl, 'ctrlKey', KeyCode.Alt, 'altKey', mouseMiddleClickAction));
     }
     if (isMacintosh) {
-        return ( new ClickLinkOptions(KeyCode.Alt, 'altKey', KeyCode.Meta, 'metaKey'));
+        return ( new ClickLinkOptions(KeyCode.Alt, 'altKey', KeyCode.Meta, 'metaKey', mouseMiddleClickAction));
     }
-    return ( new ClickLinkOptions(KeyCode.Alt, 'altKey', KeyCode.Ctrl, 'ctrlKey'));
+    return ( new ClickLinkOptions(KeyCode.Alt, 'altKey', KeyCode.Ctrl, 'ctrlKey', mouseMiddleClickAction));
 }
 class ClickLinkGesture extends Disposable {
     constructor(editor, opts) {
@@ -63,13 +71,13 @@ class ClickLinkGesture extends Disposable {
         this.onCancel = this._onCancel.event;
         this._editor = editor;
         this._extractLineNumberFromMouseEvent = opts?.extractLineNumberFromMouseEvent ?? ((e) => e.target.position ? e.target.position.lineNumber : 0);
-        this._opts = createOptions(this._editor.getOption(EditorOption.multiCursorModifier));
+        this._opts = createOptions(this._editor.getOption(EditorOption.multiCursorModifier), this._editor.getOption(EditorOption.mouseMiddleClickAction));
         this._lastMouseMoveEvent = null;
         this._hasTriggerKeyOnMouseDown = false;
         this._lineNumberOnMouseDown = 0;
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(EditorOption.multiCursorModifier)) {
-                const newOpts = createOptions(this._editor.getOption(EditorOption.multiCursorModifier));
+            if (e.hasChanged(EditorOption.multiCursorModifier) || e.hasChanged(EditorOption.mouseMiddleClickAction)) {
+                const newOpts = createOptions(this._editor.getOption(EditorOption.multiCursorModifier), this._editor.getOption(EditorOption.mouseMiddleClickAction));
                 if (this._opts.equals(newOpts)) {
                     return;
                 }
@@ -110,7 +118,8 @@ class ClickLinkGesture extends Disposable {
     }
     _onEditorMouseUp(mouseEvent) {
         const currentLineNumber = this._extractLineNumberFromMouseEvent(mouseEvent);
-        if (this._hasTriggerKeyOnMouseDown && this._lineNumberOnMouseDown && this._lineNumberOnMouseDown === currentLineNumber) {
+        const lineNumbersCorrect = !!this._lineNumberOnMouseDown && this._lineNumberOnMouseDown === currentLineNumber;
+        if (lineNumbersCorrect && (this._hasTriggerKeyOnMouseDown || (mouseEvent.isMiddleClick && mouseEvent.mouseMiddleClickAction === 'openLink'))) {
             this._onExecute.fire(mouseEvent);
         }
     }

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

@@ -132,7 +132,7 @@ let GotoDefinitionAtPositionEditorContribution = class GotoDefinitionAtPositionE
                     combinedRange = Range.plusRange(combinedRange, originSelectionRange);
                 }
             }
-            this.addDecoration(combinedRange, ( new MarkdownString()).appendText(( localize(1161, "Click to show {0} definitions.", results.length))));
+            this.addDecoration(combinedRange, ( new MarkdownString()).appendText(( localize(1164, "Click to show {0} definitions.", results.length))));
         }
         else {
             const result = results[0];

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

@@ -30,7 +30,7 @@ import { InputFocusedContext } from '../../../../../platform/contextkey/common/c
 
 var ReferencesController_1;
 const ctxReferenceSearchVisible = ( new RawContextKey('referenceSearchVisible', false, ( localize(
-    1162,
+    1165,
     "Whether reference peek is visible, like 'Peek References' or 'Peek Definition'"
 ))));
 let ReferencesController = class ReferencesController {
@@ -80,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(1163, "Loading...")));
+        this._widget.setTitle(( localize(1166, "Loading...")));
         this._widget.show(range);
         this._disposables.add(this._widget.onDidClose(() => {
             modelPromise.cancel();
@@ -130,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(1164, "{0} ({1})", this._model.title, this._model.references.length)));
+                        this._widget.setMetaTitle(( localize(1167, "{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(1165, "{0} references", len)));
+            this.badge.setTitleFormat(( localize(1168, "{0} references", len)));
         }
         else {
-            this.badge.setTitleFormat(( localize(1166, "{0} reference", len)));
+            this.badge.setTitleFormat(( localize(1169, "{0} reference", len)));
         }
     }
 };
@@ -168,7 +168,7 @@ class OneReferenceRenderer {
 }
 class AccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(1167, "References");
+        return localize(1170, "References");
     }
     getAriaLabel(element) {
         return element.ariaMessage;

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

@@ -290,7 +290,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(1168, "no preview available")), PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null);
+        this._previewNotAvailableMessage = this._instantiationService.createInstance(TextModel, ( localize(1171, "no preview available")), PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null);
         this._treeContainer = append(containerElement, $('div.ref-tree.inline'));
         const treeOptions = {
             keyboardSupport: this._defaultTreeKeyboardSupport,
@@ -397,7 +397,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
         }
         if (this._model.isEmpty) {
             this.setTitle('');
-            this._messageContainer.innerText = ( localize(1169, "No results"));
+            this._messageContainer.innerText = ( localize(1172, "No results"));
             show(this._messageContainer);
             return Promise.resolve(undefined);
         }
@@ -452,7 +452,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
             this.setTitle(basenameOrAuthority(reference.uri), this._uriLabel.getUriLabel(dirname(reference.uri)));
         }
         else {
-            this.setTitle(( localize(1170, "References")));
+            this.setTitle(( localize(1173, "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(
-                1171,
+                1174,
                 "in {0} on line {1} at column {2}",
                 basename(this.uri),
                 this.range.startLineNumber,
@@ -41,7 +41,7 @@ class OneReference {
         }
         else {
             return localize(
-                1172,
+                1175,
                 "{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(
-                1173,
+                1176,
                 "1 symbol in {0}, full path {1}",
                 basename(this.uri),
                 this.uri.fsPath
@@ -102,7 +102,7 @@ class FileReferences {
         }
         else {
             return localize(
-                1174,
+                1177,
                 "{0} symbols in {1}, full path {2}",
                 len,
                 basename(this.uri),
@@ -173,14 +173,14 @@ class ReferencesModel {
     }
     get ariaMessage() {
         if (this.isEmpty) {
-            return localize(1175, "No results found");
+            return localize(1178, "No results found");
         }
         else if (this.references.length === 1) {
-            return localize(1176, "Found 1 symbol in {0}", this.references[0].uri.fsPath);
+            return localize(1179, "Found 1 symbol in {0}", this.references[0].uri.fsPath);
         }
         else if (this.groups.length === 1) {
             return localize(
-                1177,
+                1180,
                 "Found {0} symbols in {1}",
                 this.references.length,
                 this.groups[0].uri.fsPath
@@ -188,7 +188,7 @@ class ReferencesModel {
         }
         else {
             return localize(
-                1178,
+                1181,
                 "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 { INotificationService } from '../../../../platform/notification/common/n
 import { ISymbolNavigationService } from './symbolNavigation.service.js';
 
 const ctxHasSymbols = ( new RawContextKey('hasSymbols', false, ( localize(
-    1179,
+    1182,
     "Whether there are symbol locations that can be navigated via keyboard-only."
 ))));
 let SymbolNavigationService = class SymbolNavigationService {
@@ -103,14 +103,14 @@ let SymbolNavigationService = class SymbolNavigationService {
         const kb = this._keybindingService.lookupKeybinding('editor.gotoNextSymbolFromResult');
         const message = kb
             ? ( localize(
-            1180,
+            1183,
             "Symbol {0} of {1}, {2} for next",
             this._currentIdx + 1,
             this._currentModel.references.length,
             kb.getLabel()
         ))
             : ( localize(
-            1181,
+            1184,
             "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(1182, "Developer: Debug Editor GPU Renderer")),
+            label: ( localize2(1185, "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(1183, "Log Texture Atlas Stats")),
+                label: ( localize(1186, "Log Texture Atlas Stats")),
                 id: 'logTextureAtlasStats',
             },
             {
-                label: ( localize(1184, "Save Texture Atlas")),
+                label: ( localize(1187, "Save Texture Atlas")),
                 id: 'saveTextureAtlas',
             },
             {
-                label: ( localize(1185, "Draw Glyph")),
+                label: ( localize(1188, "Draw Glyph")),
                 id: 'drawGlyph',
             },
         ], { canPickMany: false });

package/vscode/src/vs/editor/contrib/hover/browser/contentHoverController.js

@@ -16,6 +16,7 @@ import { Emitter } from '../../../../base/common/event.js';
 import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPicker.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { getActiveElement } from '../../../../base/browser/dom.js';
 
 var ContentHoverController_1;
 registerCss(hover);
@@ -156,7 +157,7 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             if (!view) {
                 return false;
             }
-            return sticky && contentWidget.containsNode(view.document.activeElement) && !view.getSelection()?.isCollapsed;
+            return sticky && contentWidget.containsNode(getActiveElement(view.document)) && !view.getSelection()?.isCollapsed;
         };
         const isFocused = contentWidget.isFocused;
         const isResizing = contentWidget.isResizing;

package/vscode/src/vs/editor/contrib/hover/browser/contentHoverRendered.js

@@ -250,19 +250,19 @@ let RenderedContentHoverParts = class RenderedContentHoverParts extends Disposab
             return '';
         }
         if (renderedPart.type === 'statusBar') {
-            const statusBarDescription = [( localize(1186, "This is a hover status bar."))];
+            const statusBarDescription = [( localize(1189, "This is a hover status bar."))];
             for (const action of renderedPart.actions) {
                 const keybinding = action.actionKeybindingLabel;
                 if (keybinding) {
                     statusBarDescription.push(( localize(
-                        1187,
+                        1190,
                         "It has an action with label {0} and keybinding {1}.",
                         action.actionLabel,
                         keybinding
                     )));
                 }
                 else {
-                    statusBarDescription.push(( localize(1188, "It has an action with label {0}.", action.actionLabel)));
+                    statusBarDescription.push(( localize(1191, "It has an action with label {0}.", action.actionLabel)));
                 }
             }
             return statusBarDescription.join('\n');

package/vscode/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.js

@@ -20,12 +20,12 @@ import { labelForHoverVerbosityAction } from './markdownHoverParticipant.js';
 var HoverAccessibilityHelpNLS;
 (function (HoverAccessibilityHelpNLS) {
     HoverAccessibilityHelpNLS.increaseVerbosity = ( localize(
-        1189,
+        1192,
         '- The focused hover part verbosity level can be increased with the Increase Hover Verbosity command.',
         `<keybinding:${INCREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));
     HoverAccessibilityHelpNLS.decreaseVerbosity = ( localize(
-        1190,
+        1193,
         '- The focused hover part verbosity level can be decreased with the Decrease Hover Verbosity command.',
         `<keybinding:${DECREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));

package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js

@@ -14,9 +14,9 @@ const GO_TO_TOP_HOVER_ACTION_ID = 'editor.action.goToTopHover';
 const GO_TO_BOTTOM_HOVER_ACTION_ID = 'editor.action.goToBottomHover';
 const INCREASE_HOVER_VERBOSITY_ACTION_ID = 'editor.action.increaseHoverVerbosityLevel';
 const INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID = 'editor.action.increaseHoverVerbosityLevelFromAccessibleView';
-const INCREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1191, "Increase Hover Verbosity Level"));
+const INCREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1194, "Increase Hover Verbosity Level"));
 const DECREASE_HOVER_VERBOSITY_ACTION_ID = 'editor.action.decreaseHoverVerbosityLevel';
 const DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID = 'editor.action.decreaseHoverVerbosityLevelFromAccessibleView';
-const DECREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1192, "Decrease Hover Verbosity Level"));
+const DECREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1195, "Decrease Hover Verbosity Level"));
 
 export { DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL, GO_TO_BOTTOM_HOVER_ACTION_ID, GO_TO_TOP_HOVER_ACTION_ID, HIDE_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_LABEL, PAGE_DOWN_HOVER_ACTION_ID, PAGE_UP_HOVER_ACTION_ID, SCROLL_DOWN_HOVER_ACTION_ID, SCROLL_LEFT_HOVER_ACTION_ID, SCROLL_RIGHT_HOVER_ACTION_ID, SCROLL_UP_HOVER_ACTION_ID, SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID };