@codingame/monaco-vscode-api 8.0.4 → 9.0.0

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

@@ -0,0 +1,166 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { isMousePositionWithinElement } from './hoverUtils.js';
+import './hover.css.js';
+import { MarginHoverWidget } from './marginHoverWidget.js';
+var MarginHoverController_1;
+let MarginHoverController = class MarginHoverController extends Disposable {
+    static { MarginHoverController_1 = this; }
+    static { this.ID = 'editor.contrib.marginHover'; }
+    constructor(_editor, _instantiationService) {
+        super();
+        this._editor = _editor;
+        this._instantiationService = _instantiationService;
+        this.shouldKeepOpenOnEditorMouseMoveOrLeave = false;
+        this._listenersStore = ( new DisposableStore());
+        this._hoverState = {
+            mouseDown: false
+        };
+        this._reactToEditorMouseMoveRunner = this._register(( new RunOnceScheduler(() => this._reactToEditorMouseMove(this._mouseMoveEvent), 0)));
+        this._hookListeners();
+        this._register(this._editor.onDidChangeConfiguration((e) => {
+            if (e.hasChanged(EditorOption.hover)) {
+                this._unhookListeners();
+                this._hookListeners();
+            }
+        }));
+    }
+    static get(editor) {
+        return editor.getContribution(MarginHoverController_1.ID);
+    }
+    _hookListeners() {
+        const hoverOpts = this._editor.getOption(EditorOption.hover);
+        this._hoverSettings = {
+            enabled: hoverOpts.enabled,
+            sticky: hoverOpts.sticky,
+            hidingDelay: hoverOpts.hidingDelay
+        };
+        if (hoverOpts.enabled) {
+            this._listenersStore.add(this._editor.onMouseDown((e) => this._onEditorMouseDown(e)));
+            this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
+            this._listenersStore.add(this._editor.onMouseMove((e) => this._onEditorMouseMove(e)));
+            this._listenersStore.add(this._editor.onKeyDown((e) => this._onKeyDown(e)));
+        }
+        else {
+            this._listenersStore.add(this._editor.onMouseMove((e) => this._onEditorMouseMove(e)));
+            this._listenersStore.add(this._editor.onKeyDown((e) => this._onKeyDown(e)));
+        }
+        this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
+        this._listenersStore.add(this._editor.onDidChangeModel(() => {
+            this._cancelScheduler();
+            this._hideWidgets();
+        }));
+        this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
+        this._listenersStore.add(this._editor.onDidScrollChange((e) => this._onEditorScrollChanged(e)));
+    }
+    _unhookListeners() {
+        this._listenersStore.clear();
+    }
+    _cancelScheduler() {
+        this._mouseMoveEvent = undefined;
+        this._reactToEditorMouseMoveRunner.cancel();
+    }
+    _onEditorScrollChanged(e) {
+        if (e.scrollTopChanged || e.scrollLeftChanged) {
+            this._hideWidgets();
+        }
+    }
+    _onEditorMouseDown(mouseEvent) {
+        this._hoverState.mouseDown = true;
+        const shouldNotHideCurrentHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
+        if (shouldNotHideCurrentHoverWidget) {
+            return;
+        }
+        this._hideWidgets();
+    }
+    _isMouseOnMarginHoverWidget(mouseEvent) {
+        const marginHoverWidgetNode = this._glyphWidget?.getDomNode();
+        if (marginHoverWidgetNode) {
+            return isMousePositionWithinElement(marginHoverWidgetNode, mouseEvent.event.posx, mouseEvent.event.posy);
+        }
+        return false;
+    }
+    _onEditorMouseUp() {
+        this._hoverState.mouseDown = false;
+    }
+    _onEditorMouseLeave(mouseEvent) {
+        if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
+            return;
+        }
+        this._cancelScheduler();
+        const shouldNotHideCurrentHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
+        if (shouldNotHideCurrentHoverWidget) {
+            return;
+        }
+        this._hideWidgets();
+    }
+    _shouldNotRecomputeCurrentHoverWidget(mouseEvent) {
+        const isHoverSticky = this._hoverSettings.sticky;
+        const isMouseOnMarginHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
+        return isHoverSticky && isMouseOnMarginHoverWidget;
+    }
+    _onEditorMouseMove(mouseEvent) {
+        if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
+            return;
+        }
+        this._mouseMoveEvent = mouseEvent;
+        const shouldNotRecomputeCurrentHoverWidget = this._shouldNotRecomputeCurrentHoverWidget(mouseEvent);
+        if (shouldNotRecomputeCurrentHoverWidget) {
+            this._reactToEditorMouseMoveRunner.cancel();
+            return;
+        }
+        this._reactToEditorMouseMove(mouseEvent);
+    }
+    _reactToEditorMouseMove(mouseEvent) {
+        if (!mouseEvent) {
+            return;
+        }
+        const glyphWidgetShowsOrWillShow = this._tryShowHoverWidget(mouseEvent);
+        if (glyphWidgetShowsOrWillShow) {
+            return;
+        }
+        this._hideWidgets();
+    }
+    _tryShowHoverWidget(mouseEvent) {
+        const glyphWidget = this._getOrCreateGlyphWidget();
+        return glyphWidget.showsOrWillShow(mouseEvent);
+    }
+    _onKeyDown(e) {
+        if (!this._editor.hasModel()) {
+            return;
+        }
+        if (e.keyCode === KeyCode.Ctrl
+            || e.keyCode === KeyCode.Alt
+            || e.keyCode === KeyCode.Meta
+            || e.keyCode === KeyCode.Shift) {
+            return;
+        }
+        this._hideWidgets();
+    }
+    _hideWidgets() {
+        this._glyphWidget?.hide();
+    }
+    _getOrCreateGlyphWidget() {
+        if (!this._glyphWidget) {
+            this._glyphWidget = this._instantiationService.createInstance(MarginHoverWidget, this._editor);
+        }
+        return this._glyphWidget;
+    }
+    hideContentHover() {
+        this._hideWidgets();
+    }
+    dispose() {
+        super.dispose();
+        this._unhookListeners();
+        this._listenersStore.dispose();
+        this._glyphWidget?.dispose();
+    }
+};
+MarginHoverController = MarginHoverController_1 = ( __decorate([
+    ( __param(1, IInstantiationService))
+], MarginHoverController));
+export { MarginHoverController };

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

@@ -1,13 +1,19 @@
-import { append, $ as $$1 } from '../../../../base/browser/dom.js';
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { addStandardDisposableListener, append, $ as $$1 } from '../../../../base/browser/dom.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { MarkdownRenderer } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { MouseTargetType } from '../../../browser/editorBrowser.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
+import { ILanguageService } from '../../../common/languages/language.js';
 import { HoverOperation, HoverStartMode } from './hoverOperation.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { HoverWidget } from '../../../../base/browser/ui/hover/hoverWidget.js';
 import { MarginHoverComputer } from './marginHoverComputer.js';
+import { isMousePositionWithinElement } from './hoverUtils.js';
+var MarginHoverWidget_1;
 const $ = $$1;
-class MarginHoverWidget extends Disposable {
+let MarginHoverWidget = class MarginHoverWidget extends Disposable {
+    static { MarginHoverWidget_1 = this; }
     static { this.ID = 'editor.contrib.modesGlyphHoverWidget'; }
     constructor(editor, languageService, openerService) {
         super();
@@ -29,6 +35,9 @@ class MarginHoverWidget extends Disposable {
                 this._updateFont();
             }
         }));
+        this._register(addStandardDisposableListener(this._hover.containerDomNode, 'mouseleave', (e) => {
+            this._onMouseLeave(e);
+        }));
         this._editor.addOverlayWidget(this);
     }
     dispose() {
@@ -36,7 +45,7 @@ class MarginHoverWidget extends Disposable {
         super.dispose();
     }
     getId() {
-        return MarginHoverWidget.ID;
+        return MarginHoverWidget_1.ID;
     }
     getDomNode() {
         return this._hover.containerDomNode;
@@ -127,5 +136,16 @@ class MarginHoverWidget extends Disposable {
         this._hover.containerDomNode.style.left = `${left}px`;
         this._hover.containerDomNode.style.top = `${Math.max(Math.round(top), 0)}px`;
     }
-}
+    _onMouseLeave(e) {
+        const editorDomNode = this._editor.getDomNode();
+        const isMousePositionOutsideOfEditor = !editorDomNode || !isMousePositionWithinElement(editorDomNode, e.x, e.y);
+        if (isMousePositionOutsideOfEditor) {
+            this.hide();
+        }
+    }
+};
+MarginHoverWidget = MarginHoverWidget_1 = ( __decorate([
+    ( __param(1, ILanguageService)),
+    ( __param(2, IOpenerService))
+], MarginHoverWidget));
 export { MarginHoverWidget };

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

@@ -28,8 +28,8 @@ import { AsyncIterableObject } from '../../../../base/common/async.js';
 import { getHoverProviderResultsAsAsyncIterable } from './getHover.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 const $ = $$1;
-const increaseHoverVerbosityIcon = registerIcon('hover-increase-verbosity', Codicon.add, ( localize(5160, 'Icon for increaseing hover verbosity.')));
-const decreaseHoverVerbosityIcon = registerIcon('hover-decrease-verbosity', Codicon.remove, ( localize(5161, 'Icon for decreasing hover verbosity.')));
+const increaseHoverVerbosityIcon = registerIcon('hover-increase-verbosity', Codicon.add, ( localize(5140, 'Icon for increaseing hover verbosity.')));
+const decreaseHoverVerbosityIcon = registerIcon('hover-decrease-verbosity', Codicon.remove, ( localize(5141, 'Icon for decreasing hover verbosity.')));
 class MarkdownHover {
     constructor(owner, range, contents, isBeforeContent, ordinal, source = undefined) {
         this.owner = owner;
@@ -77,7 +77,7 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
              (new MarkdownHover(
                 this,
                 anchor.range,
-                [( (new MarkdownString())).appendText(( localize(5162, "Loading...")))],
+                [( (new MarkdownString())).appendText(( localize(5142, "Loading...")))],
                 false,
                 2000
             ))
@@ -103,7 +103,7 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
             stopRenderingMessage = true;
             result.push(( (new MarkdownHover(this, anchor.range, [{
                     value: ( localize(
-                        5163,
+                        5143,
                         "Rendering paused for long line for performance reasons. This can be configured via `editor.stopRenderingLineAfter`."
                     ))
                 }], false, index++))));
@@ -111,7 +111,7 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
         if (!stopRenderingMessage && typeof maxTokenizationLineLength === 'number' && lineLength >= maxTokenizationLineLength) {
             result.push(( (new MarkdownHover(this, anchor.range, [{
                     value: ( localize(
-                        5164,
+                        5144,
                         "Tokenization is skipped for long lines for performance reasons. This can be configured via `editor.maxTokenizationLineLength`."
                     ))
                 }], false, index++))));
@@ -440,14 +440,14 @@ function labelForHoverVerbosityAction(keybindingService, action) {
         case HoverVerbosityAction.Increase: {
             const kb = keybindingService.lookupKeybinding(INCREASE_HOVER_VERBOSITY_ACTION_ID);
             return kb ?
-                ( localize(5165, "Increase Hover Verbosity ({0})", kb.getLabel())) :
-                ( localize(5166, "Increase Hover Verbosity"));
+                ( localize(5145, "Increase Hover Verbosity ({0})", kb.getLabel())) :
+                ( localize(5146, "Increase Hover Verbosity"));
         }
         case HoverVerbosityAction.Decrease: {
             const kb = keybindingService.lookupKeybinding(DECREASE_HOVER_VERBOSITY_ACTION_ID);
             return kb ?
-                ( localize(5167, "Decrease Hover Verbosity ({0})", kb.getLabel())) :
-                ( localize(5168, "Decrease Hover Verbosity"));
+                ( localize(5147, "Decrease Hover Verbosity ({0})", kb.getLabel())) :
+                ( localize(5148, "Decrease Hover Verbosity"));
         }
     }
 }

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

@@ -140,9 +140,10 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                     e.stopPropagation();
                     e.preventDefault();
                     if (this._openerService) {
+                        const editorOptions = { selection: { startLineNumber, startColumn } };
                         this._openerService.open(resource, {
                             fromUserGesture: true,
-                            editorOptions: { selection: { startLineNumber, startColumn } }
+                            editorOptions
                         }).catch(onUnexpectedError);
                     }
                 }));
@@ -163,7 +164,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
             const markerController = MarkerController.get(this._editor);
             if (markerController) {
                 context.statusBar.addAction({
-                    label: ( localize(5169, "View Problem")),
+                    label: ( localize(5149, "View Problem")),
                     commandId: NextMarkerAction.ID,
                     run: () => {
                         context.hide();
@@ -178,14 +179,14 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
             if (this.recentMarkerCodeActionsInfo) {
                 if (IMarkerData.makeKey(this.recentMarkerCodeActionsInfo.marker) === IMarkerData.makeKey(markerHover.marker)) {
                     if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
-                        quickfixPlaceholderElement.textContent = ( localize(5170, "No quick fixes available"));
+                        quickfixPlaceholderElement.textContent = ( localize(5150, "No quick fixes available"));
                     }
                 }
                 else {
                     this.recentMarkerCodeActionsInfo = undefined;
                 }
             }
-            const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposableTimeout(() => quickfixPlaceholderElement.textContent = ( localize(5171, "Checking for quick fixes...")), 200, disposables);
+            const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposableTimeout(() => quickfixPlaceholderElement.textContent = ( localize(5151, "Checking for quick fixes...")), 200, disposables);
             if (!quickfixPlaceholderElement.textContent) {
                 quickfixPlaceholderElement.textContent = String.fromCharCode(0xA0);
             }
@@ -196,7 +197,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                 this.recentMarkerCodeActionsInfo = { marker: markerHover.marker, hasCodeActions: actions.validActions.length > 0 };
                 if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
                     actions.dispose();
-                    quickfixPlaceholderElement.textContent = ( localize(5170, "No quick fixes available"));
+                    quickfixPlaceholderElement.textContent = ( localize(5150, "No quick fixes available"));
                     return;
                 }
                 quickfixPlaceholderElement.style.display = 'none';
@@ -207,7 +208,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                     }
                 }));
                 context.statusBar.addAction({
-                    label: ( localize(5172, "Quick Fix...")),
+                    label: ( localize(5152, "Quick Fix...")),
                     commandId: quickFixCommandId,
                     run: (target) => {
                         showing = true;

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

@@ -93,7 +93,7 @@ class InPlaceReplaceUp extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inPlaceReplace.up',
-            label: ( localize(1473, "Replace with Previous Value")),
+            label: ( localize(1482, "Replace with Previous Value")),
             alias: 'Replace with Previous Value',
             precondition: EditorContextKeys.writable,
             kbOpts: {
@@ -115,7 +115,7 @@ class InPlaceReplaceDown extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inPlaceReplace.down',
-            label: ( localize(1474, "Replace with Next Value")),
+            label: ( localize(1483, "Replace with Next Value")),
             alias: 'Replace with Next Value',
             precondition: EditorContextKeys.writable,
             kbOpts: {

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

@@ -21,11 +21,11 @@ class IndentationToSpacesAction extends EditorAction {
     constructor() {
         super({
             id: IndentationToSpacesAction.ID,
-            label: ( localize(1453, "Convert Indentation to Spaces")),
+            label: ( localize(1462, "Convert Indentation to Spaces")),
             alias: 'Convert Indentation to Spaces',
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1454, "Convert the tab indentation to spaces.")),
+                description: ( localize2(1463, "Convert the tab indentation to spaces.")),
             }
         });
     }
@@ -53,11 +53,11 @@ class IndentationToTabsAction extends EditorAction {
     constructor() {
         super({
             id: IndentationToTabsAction.ID,
-            label: ( localize(1455, "Convert Indentation to Tabs")),
+            label: ( localize(1464, "Convert Indentation to Tabs")),
             alias: 'Convert Indentation to Tabs',
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1456, "Convert the spaces indentation to tabs.")),
+                description: ( localize2(1465, "Convert the spaces indentation to tabs.")),
             }
         });
     }
@@ -99,16 +99,16 @@ class ChangeIndentationSizeAction extends EditorAction {
             id: ( (n.toString())),
             label: ( (n.toString())),
             description: (n === creationOpts.tabSize && n === modelOpts.tabSize
-                ? ( localize(1457, "Configured Tab Size"))
+                ? ( localize(1466, "Configured Tab Size"))
                 : n === creationOpts.tabSize
-                    ? ( localize(1458, "Default Tab Size"))
+                    ? ( localize(1467, "Default Tab Size"))
                     : n === modelOpts.tabSize
-                        ? ( localize(1459, "Current Tab Size"))
+                        ? ( localize(1468, "Current Tab Size"))
                         : undefined)
         }))));
         const autoFocusIndex = Math.min(model.getOptions().tabSize - 1, 7);
         setTimeout(() => {
-            quickInputService.pick(picks, { placeHolder: ( localize(1460, "Select Tab Size for Current File")), activeItem: picks[autoFocusIndex] }).then(pick => {
+            quickInputService.pick(picks, { placeHolder: ( localize(1469, "Select Tab Size for Current File")), activeItem: picks[autoFocusIndex] }).then(pick => {
                 if (pick) {
                     if (model && !model.isDisposed()) {
                         const pickedVal = parseInt(pick.label, 10);
@@ -135,11 +135,11 @@ class IndentUsingTabs extends ChangeIndentationSizeAction {
     constructor() {
         super(false, false, {
             id: IndentUsingTabs.ID,
-            label: ( localize(1461, "Indent Using Tabs")),
+            label: ( localize(1470, "Indent Using Tabs")),
             alias: 'Indent Using Tabs',
             precondition: undefined,
             metadata: {
-                description: ( localize2(1462, "Use indentation with tabs.")),
+                description: ( localize2(1471, "Use indentation with tabs.")),
             }
         });
     }
@@ -149,11 +149,11 @@ class IndentUsingSpaces extends ChangeIndentationSizeAction {
     constructor() {
         super(true, false, {
             id: IndentUsingSpaces.ID,
-            label: ( localize(1463, "Indent Using Spaces")),
+            label: ( localize(1472, "Indent Using Spaces")),
             alias: 'Indent Using Spaces',
             precondition: undefined,
             metadata: {
-                description: ( localize2(1464, "Use indentation with spaces.")),
+                description: ( localize2(1473, "Use indentation with spaces.")),
             }
         });
     }
@@ -163,11 +163,11 @@ class ChangeTabDisplaySize extends ChangeIndentationSizeAction {
     constructor() {
         super(true, true, {
             id: ChangeTabDisplaySize.ID,
-            label: ( localize(1465, "Change Tab Display Size")),
+            label: ( localize(1474, "Change Tab Display Size")),
             alias: 'Change Tab Display Size',
             precondition: undefined,
             metadata: {
-                description: ( localize2(1466, "Change the space size equivalent of the tab.")),
+                description: ( localize2(1475, "Change the space size equivalent of the tab.")),
             }
         });
     }
@@ -177,11 +177,11 @@ class DetectIndentation extends EditorAction {
     constructor() {
         super({
             id: DetectIndentation.ID,
-            label: ( localize(1467, "Detect Indentation from Content")),
+            label: ( localize(1476, "Detect Indentation from Content")),
             alias: 'Detect Indentation from Content',
             precondition: undefined,
             metadata: {
-                description: ( localize2(1468, "Detect the indentation from content.")),
+                description: ( localize2(1477, "Detect the indentation from content.")),
             }
         });
     }
@@ -199,11 +199,11 @@ class ReindentLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentlines',
-            label: ( localize(1469, "Reindent Lines")),
+            label: ( localize(1478, "Reindent Lines")),
             alias: 'Reindent Lines',
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1470, "Reindent the lines of the editor.")),
+                description: ( localize2(1479, "Reindent the lines of the editor.")),
             }
         });
     }
@@ -225,11 +225,11 @@ class ReindentSelectedLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentselectedlines',
-            label: ( localize(1471, "Reindent Selected Lines")),
+            label: ( localize(1480, "Reindent Selected Lines")),
             alias: 'Reindent Selected Lines',
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1472, "Reindent the selected lines of the editor.")),
+                description: ( localize2(1481, "Reindent the selected lines of the editor.")),
             }
         });
     }

package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js

@@ -77,7 +77,7 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                     executor.emitOne(( (new MarkdownHover(
                         this,
                         anchor.range,
-                        [( (new MarkdownString())).appendText(( localize(5175, "Double-click to insert")))],
+                        [( (new MarkdownString())).appendText(( localize(5155, "Double-click to insert")))],
                         false,
                         10001
                     ))));
@@ -97,19 +97,19 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                     const useMetaKey = this._editor.getOption(EditorOption.multiCursorModifier) === 'altKey';
                     const kb = useMetaKey
                         ? isMacintosh
-                            ? ( localize(5176, "cmd + click"))
-                            : ( localize(5177, "ctrl + click"))
+                            ? ( localize(5156, "cmd + click"))
+                            : ( localize(5157, "ctrl + click"))
                         : isMacintosh
-                            ? ( localize(5178, "option + click"))
-                            : ( localize(5179, "alt + click"));
+                            ? ( localize(5158, "option + click"))
+                            : ( localize(5159, "alt + click"));
                     if (part.part.location && part.part.command) {
-                        linkHint = ( (new MarkdownString())).appendText(( localize(5180, 'Go to Definition ({0}), right click for more', kb)));
+                        linkHint = ( (new MarkdownString())).appendText(( localize(5160, 'Go to Definition ({0}), right click for more', kb)));
                     }
                     else if (part.part.location) {
-                        linkHint = ( (new MarkdownString())).appendText(( localize(5181, 'Go to Definition ({0})', kb)));
+                        linkHint = ( (new MarkdownString())).appendText(( localize(5161, 'Go to Definition ({0})', kb)));
                     }
                     else if (part.part.command) {
-                        linkHint = ( (new MarkdownString(`[${( localize(5182, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true })));
+                        linkHint = ( (new MarkdownString(`[${( localize(5162, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true })));
                     }
                     if (linkHint) {
                         executor.emitOne(( (new MarkdownHover(this, anchor.range, [linkHint], false, 10000))));

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{commands.js → controller/commands.js}

@@ -1,27 +1,27 @@
-import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
-import { transaction, asyncTransaction } from '../../../../base/common/observableInternal/base.js';
-import '../../../../base/common/observableInternal/derived.js';
-import '../../../../base/common/observableInternal/autorun.js';
-import '../../../../base/common/observableInternal/utils.js';
-import '../../../../base/common/cancellation.js';
-import '../../../../base/common/arrays.js';
-import { EditorAction } from '../../../browser/editorExtensions.js';
-import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../../base/common/keyCodes.js';
+import { transaction, asyncTransaction } from '../../../../../base/common/observableInternal/base.js';
+import '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/arrays.js';
+import { EditorAction } from '../../../../browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../../common/editorContextKeys.js';
 import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId } from './commandIds.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 import { InlineCompletionsController } from './inlineCompletionsController.js';
-import { Context } from '../../suggest/browser/suggest.js';
-import { localize } from '../../../../nls.js';
-import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Context } from '../../../suggest/browser/suggest.js';
+import { localize } from '../../../../../nls.js';
+import { Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 class ShowNextInlineSuggestionAction extends EditorAction {
     static { this.ID = showNextInlineSuggestionActionId; }
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: ( localize(5080, "Show Next Inline Suggestion")),
+            label: ( localize(5060, "Show Next Inline Suggestion")),
             alias: 'Show Next Inline Suggestion',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -43,7 +43,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: ( localize(5081, "Show Previous Inline Suggestion")),
+            label: ( localize(5061, "Show Previous Inline Suggestion")),
             alias: 'Show Previous Inline Suggestion',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -64,7 +64,7 @@ class TriggerInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.trigger',
-            label: ( localize(5082, "Trigger Inline Suggestion")),
+            label: ( localize(5062, "Trigger Inline Suggestion")),
             alias: 'Trigger Inline Suggestion',
             precondition: EditorContextKeys.writable
         });
@@ -81,7 +81,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextWord',
-            label: ( localize(5083, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize(5063, "Accept Next Word Of Inline Suggestion")),
             alias: 'Accept Next Word Of Inline Suggestion',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -97,7 +97,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(5084, 'Accept Word')),
+                    title: ( localize(5064, 'Accept Word')),
                     group: 'primary',
                     order: 2,
                 }],
@@ -112,7 +112,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextLine',
-            label: ( localize(5085, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize(5065, "Accept Next Line Of Inline Suggestion")),
             alias: 'Accept Next Line Of Inline Suggestion',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -123,7 +123,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(5086, 'Accept Line')),
+                    title: ( localize(5066, 'Accept Line')),
                     group: 'secondary',
                     order: 2,
                 }],
@@ -138,12 +138,12 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize(5087, "Accept Inline Suggestion")),
+            label: ( localize(5067, "Accept Inline Suggestion")),
             alias: 'Accept Inline Suggestion',
             precondition: InlineCompletionContextKeys.inlineSuggestionVisible,
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(5088, "Accept")),
+                    title: ( localize(5068, "Accept")),
                     group: 'primary',
                     order: 1,
                 }],
@@ -173,7 +173,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize(5089, "Hide Inline Suggestion")),
+            label: ( localize(5069, "Hide Inline Suggestion")),
             alias: 'Hide Inline Suggestion',
             precondition: InlineCompletionContextKeys.inlineSuggestionVisible,
             kbOpts: {
@@ -194,7 +194,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(5090, "Always Show Toolbar")),
+            title: ( localize(5070, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{