npm - @codingame/monaco-vscode-api - Versions diffs - 5.2.0 → 6.0.0 - Mend

@codingame/monaco-vscode-api 5.2.0 → 6.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1002) hide show

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from '../../../../base/common/event.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { combinedDisposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { registerEditorCommand, EditorCommand } from '../../../browser/editorExtensions.js';
@@ -8,10 +9,11 @@ import { Range } from '../../../common/core/range.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingWeight, KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 const _moduleId = "vs/editor/contrib/gotoSymbol/browser/symbolNavigation";
 const ctxHasSymbols = ( (new RawContextKey('hasSymbols', false, ( localizeWithPath(
@@ -91,7 +93,7 @@ let SymbolNavigationService = class SymbolNavigationService {
             resource: reference.uri,
             options: {
                 selection: Range.collapseToStart(reference.range),
-                selectionRevealType: 3
+                selectionRevealType: TextEditorSelectionRevealType.NearTopIfOutsideViewport
             }
         }, source).finally(() => {
             this._ignoreEditorChange = false;
@@ -125,15 +127,15 @@ SymbolNavigationService = ( (__decorate([
     ( (__param(2, INotificationService))),
     ( (__param(3, IKeybindingService)))
 ], SymbolNavigationService)));
-registerSingleton(ISymbolNavigationService, SymbolNavigationService, 1 );
+registerSingleton(ISymbolNavigationService, SymbolNavigationService, InstantiationType.Delayed);
 registerEditorCommand(new (class extends EditorCommand {
     constructor() {
         super({
             id: 'editor.gotoNextSymbolFromResult',
             precondition: ctxHasSymbols,
             kbOpts: {
-                weight: 100 ,
-                primary: 70
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyCode.F12
             }
         });
     }
@@ -143,9 +145,9 @@ registerEditorCommand(new (class extends EditorCommand {
 }));
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'editor.gotoNextSymbolFromResult.cancel',
-    weight: 100 ,
+    weight: KeybindingWeight.EditorContrib,
     when: ctxHasSymbols,
-    primary: 9 ,
+    primary: KeyCode.Escape,
     handler(accessor) {
         accessor.get(ISymbolNavigationService).reset();
     }

package/vscode/src/vs/editor/contrib/hover/browser/contentHoverComputer.js CHANGED Viewed

@@ -1,4 +1,6 @@
 import { coalesce } from '../../../../base/common/arrays.js';
+import { HoverStartSource } from './hoverOperation.js';
+import { HoverAnchorType } from './hoverTypes.js';
 import { AsyncIterableObject } from '../../../../base/common/async.js';
 class ContentHoverComputer {
     get anchor() { return this._anchor; }
@@ -14,11 +16,11 @@ class ContentHoverComputer {
         this._participants = _participants;
         this._anchor = null;
         this._shouldFocus = false;
-        this._source = 0 ;
+        this._source = HoverStartSource.Mouse;
         this._insistOnKeepingHoverVisible = false;
     }
     static _getLineDecorations(editor, anchor) {
-        if (anchor.type !== 1  && !anchor.supportsMarkerHover) {
+        if (anchor.type !== HoverAnchorType.Range && !anchor.supportsMarkerHover) {
             return [];
         }
         const model = editor.getModel();

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

@@ -1,11 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { addStandardDisposableListener } from '../../../../base/browser/dom.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { TokenizationRegistry } from '../../../common/languages.js';
-import { HoverOperation } from './hoverOperation.js';
+import { HoverOperation, HoverStartMode, HoverStartSource } from './hoverOperation.js';
 import { HoverParticipantRegistry, HoverRangeAnchor } from './hoverTypes.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
@@ -15,6 +18,7 @@ import { ContentHoverWidget } from './contentHoverWidget.js';
 import { ContentHoverComputer } from './contentHoverComputer.js';
 import { HoverResult, ContentHoverVisibleData } from './contentHoverTypes.js';
 import { EditorHoverStatusBar } from './contentHoverStatusBar.js';
+import { Emitter } from '../../../../base/common/event.js';
 var ContentHoverController_1;
 let ContentHoverController = class ContentHoverController extends Disposable {
     static { ContentHoverController_1 = this; }
@@ -24,6 +28,8 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         this._instantiationService = _instantiationService;
         this._keybindingService = _keybindingService;
         this._currentResult = null;
+        this._onContentsChanged = this._register(( new Emitter()));
+        this.onContentsChanged = this._onContentsChanged.event;
         this._widget = this._register(this._instantiationService.createInstance(ContentHoverWidget, this._editor));
         this._participants = [];
         for (const participant of HoverParticipantRegistry.getAll()) {
@@ -44,7 +50,7 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             this._withResult(( new HoverResult(this._computer.anchor, messages, result.isComplete)));
         }));
         this._register(addStandardDisposableListener(this._widget.getDomNode(), 'keydown', (e) => {
-            if (e.equals(9 )) {
+            if (e.equals(KeyCode.Escape)) {
                 this.hide();
             }
         }));
@@ -62,7 +68,7 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             }
             return false;
         }
-        const isHoverSticky = this._editor.getOption(60 ).sticky;
+        const isHoverSticky = this._editor.getOption(EditorOption.hover).sticky;
         const isGettingCloser = (isHoverSticky
             && mouseEvent
             && this._widget.isMouseGettingCloser(mouseEvent.event.posx, mouseEvent.event.posy));
@@ -148,7 +154,7 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             fragment,
             statusBar,
             setColorPicker: (widget) => colorPicker = widget,
-            onContentsChanged: () => this._widget.onContentsChanged(),
+            onContentsChanged: () => this._doOnContentsChanged(),
             setMinimumDimensions: (dimensions) => this._widget.setMinimumDimensions(dimensions),
             hide: () => this.hide()
         };
@@ -179,7 +185,7 @@ let ContentHoverController = class ContentHoverController extends Disposable {
                 colorPicker,
                 showAtPosition,
                 showAtSecondaryPosition,
-                this._editor.getOption(60 ).above,
+                this._editor.getOption(EditorOption.hover).above,
                 this._computer.shouldFocus,
                 this._computer.source,
                 isBeforeContent,
@@ -190,6 +196,10 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             disposables.dispose();
         }
     }
+    _doOnContentsChanged() {
+        this._onContentsChanged.fire();
+        this._widget.onContentsChanged();
+    }
     static { this._DECORATION_OPTIONS = ModelDecorationOptions.register({
         description: 'content-hover-highlight',
         className: 'hoverHighlight'
@@ -241,11 +251,11 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             }
         }
         const target = mouseEvent.target;
-        if (target.type === 6 ) {
+        if (target.type === MouseTargetType.CONTENT_TEXT) {
             anchorCandidates.push(( new HoverRangeAnchor(0, target.range, mouseEvent.event.posx, mouseEvent.event.posy)));
         }
-        if (target.type === 7 ) {
-            const epsilon = this._editor.getOption(50 ).typicalHalfwidthCharacterWidth / 2;
+        if (target.type === MouseTargetType.CONTENT_EMPTY) {
+            const epsilon = this._editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth / 2;
             if (!target.detail.isAfterLines
                 && typeof target.detail.horizontalDistanceToText === 'number'
                 && target.detail.horizontalDistanceToText < epsilon) {
@@ -253,16 +263,25 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             }
         }
         if (anchorCandidates.length === 0) {
-            return this._startShowingOrUpdateHover(null, 0 , 0 , false, mouseEvent);
+            return this._startShowingOrUpdateHover(null, HoverStartMode.Delayed, HoverStartSource.Mouse, false, mouseEvent);
         }
         anchorCandidates.sort((a, b) => b.priority - a.priority);
-        return this._startShowingOrUpdateHover(anchorCandidates[0], 0 , 0 , false, mouseEvent);
+        return this._startShowingOrUpdateHover(anchorCandidates[0], HoverStartMode.Delayed, HoverStartSource.Mouse, false, mouseEvent);
     }
     startShowingAtRange(range, mode, source, focus) {
         this._startShowingOrUpdateHover(( new HoverRangeAnchor(0, range, undefined, undefined)), mode, source, focus, null);
     }
-    async updateFocusedMarkdownHoverVerbosityLevel(action) {
-        this._markdownHoverParticipant?.updateFocusedMarkdownHoverPartVerbosityLevel(action);
+    async updateMarkdownHoverVerbosityLevel(action, index, focus) {
+        this._markdownHoverParticipant?.updateMarkdownHoverVerbosityLevel(action, index, focus);
+    }
+    focusedMarkdownHoverIndex() {
+        return this._markdownHoverParticipant?.focusedMarkdownHoverIndex() ?? -1;
+    }
+    markdownHoverContentAtIndex(index) {
+        return this._markdownHoverParticipant?.markdownHoverContentAtIndex(index) ?? '';
+    }
+    doesMarkdownHoverAtIndexSupportVerbosityAction(index, action) {
+        return this._markdownHoverParticipant?.doesMarkdownHoverAtIndexSupportVerbosityAction(index, action) ?? false;
     }
     getWidgetContent() {
         const node = this._widget.getDomNode();

package/vscode/src/vs/editor/contrib/hover/browser/contentHoverWidget.js CHANGED Viewed

@@ -1,5 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Dimension, append, trackFocus, getClientArea, getDomNodePagePosition, getTotalHeight, getTotalWidth } from '../../../../base/browser/dom.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { HoverStartSource } from './hoverOperation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { ResizableContentWidget } from './resizableContentWidget.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -7,6 +10,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { HoverWidget, getHoverAccessibleViewHint } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { PositionAffinity } from '../../../common/model.js';
 var ContentHoverWidget_1;
 const HORIZONTAL_SCROLLING_BY = 30;
 const CONTAINER_HEIGHT_PADDING = 6;
@@ -18,7 +22,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         return Boolean(this._visibleData?.colorPicker);
     }
     get isVisibleFromKeyboard() {
-        return (this._visibleData?.source === 1) ;
+        return (this._visibleData?.source === HoverStartSource.Keyboard);
     }
     get isVisible() {
         return this._hoverVisibleKey.get() ?? false;
@@ -27,7 +31,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         return this._hoverFocusedKey.get() ?? false;
     }
     constructor(editor, contextKeyService, _configurationService, _accessibilityService, _keybindingService) {
-        const minimumHeight = editor.getOption(67 ) + 8;
+        const minimumHeight = editor.getOption(EditorOption.lineHeight) + 8;
         const minimumWidth = 150;
         const minimumSize = new Dimension(minimumWidth, minimumHeight);
         super(editor, minimumSize);
@@ -46,7 +50,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
             }
         }));
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(50 )) {
+            if (e.hasChanged(EditorOption.fontInfo)) {
                 this._updateFont();
             }
         }));
@@ -125,7 +129,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         if (!position) {
             return;
         }
-        return this._positionPreference === 1  ?
+        return this._positionPreference === ContentWidgetPositionPreference.ABOVE ?
             this._availableVerticalSpaceAbove(position)
             : this._availableVerticalSpaceBelow(position);
     }
@@ -194,7 +198,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         this._hover.containerDomNode.classList.toggle('hidden', !hoverData);
     }
     _updateFont() {
-        const { fontSize, lineHeight } = this._editor.getOption(50 );
+        const { fontSize, lineHeight } = this._editor.getOption(EditorOption.fontInfo);
         const contentsDomNode = this._hover.contentsDomNode;
         contentsDomNode.style.fontSize = `${fontSize}px`;
         contentsDomNode.style.lineHeight = `${lineHeight / fontSize}`;
@@ -231,8 +235,8 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         return {
             position: this._visibleData.showAtPosition,
             secondaryPosition: this._visibleData.showAtSecondaryPosition,
-            positionAffinity: this._visibleData.isBeforeContent ? 3  : undefined,
-            preference: [this._positionPreference ?? 1 ]
+            positionAffinity: this._visibleData.isBeforeContent ? PositionAffinity.LeftOfInjectedText : undefined,
+            preference: [this._positionPreference ?? ContentWidgetPositionPreference.ABOVE]
         };
     }
     showAt(node, hoverData) {
@@ -242,7 +246,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         this._render(node, hoverData);
         const widgetHeight = getTotalHeight(this._hover.containerDomNode);
         const widgetPosition = hoverData.showAtPosition;
-        this._positionPreference = this._findPositionPreference(widgetHeight, widgetPosition) ?? 1 ;
+        this._positionPreference = this._findPositionPreference(widgetHeight, widgetPosition) ?? ContentWidgetPositionPreference.ABOVE;
         this.onContentsChanged();
         if (hoverData.stoleFocus) {
             this._hover.containerDomNode.focus();
@@ -306,12 +310,12 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
     }
     scrollUp() {
         const scrollTop = this._hover.scrollbar.getScrollPosition().scrollTop;
-        const fontInfo = this._editor.getOption(50 );
+        const fontInfo = this._editor.getOption(EditorOption.fontInfo);
         this._hover.scrollbar.setScrollPosition({ scrollTop: scrollTop - fontInfo.lineHeight });
     }
     scrollDown() {
         const scrollTop = this._hover.scrollbar.getScrollPosition().scrollTop;
-        const fontInfo = this._editor.getOption(50 );
+        const fontInfo = this._editor.getOption(EditorOption.fontInfo);
         this._hover.scrollbar.setScrollPosition({ scrollTop: scrollTop + fontInfo.lineHeight });
     }
     scrollLeft() {

package/vscode/src/vs/editor/contrib/hover/browser/hover.css.js CHANGED Viewed

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .hoverHighlight{background-color:var(--vscode-editor-hoverHighlightBackground)}.monaco-editor .monaco-hover{background-color:var(--vscode-editorHoverWidget-background);border:1px solid var(--vscode-editorHoverWidget-border);border-radius:3px;color:var(--vscode-editorHoverWidget-foreground)}.monaco-editor .monaco-hover a{color:var(--vscode-textLink-foreground)}.monaco-editor .monaco-hover a:hover{color:var(--vscode-textLink-activeForeground)}.monaco-editor .monaco-hover .hover-row{display:flex}.monaco-editor .monaco-hover .hover-row .hover-row-contents{display:flex;flex-direction:column;min-width:0}.monaco-editor .monaco-hover .hover-row .verbosity-actions{border-right:1px solid var(--vscode-editorHoverWidget-border);display:flex;flex-direction:column;justify-content:end;padding-left:5px;padding-right:5px}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon{cursor:pointer;font-size:11px}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon.enabled{color:var(--vscode-textLink-foreground)}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon.disabled{opacity:.6}.monaco-editor .monaco-hover .hover-row .actions{background-color:var(--vscode-editorHoverWidget-statusBarBackground)}.monaco-editor .monaco-hover code{background-color:var(--vscode-textCodeBlock-background)}";
+var css = ".monaco-editor .hoverHighlight{background-color:var(--vscode-editor-hoverHighlightBackground)}.monaco-editor .monaco-hover-content{box-sizing:border-box;padding-bottom:2px;padding-right:2px}.monaco-editor .monaco-hover{background-color:var(--vscode-editorHoverWidget-background);border:1px solid var(--vscode-editorHoverWidget-border);border-radius:3px;color:var(--vscode-editorHoverWidget-foreground)}.monaco-editor .monaco-hover a{color:var(--vscode-textLink-foreground)}.monaco-editor .monaco-hover a:hover{color:var(--vscode-textLink-activeForeground)}.monaco-editor .monaco-hover .hover-row{display:flex}.monaco-editor .monaco-hover .hover-row .hover-row-contents{display:flex;flex-direction:column;min-width:0}.monaco-editor .monaco-hover .hover-row .verbosity-actions{border-right:1px solid var(--vscode-editorHoverWidget-border);display:flex;flex-direction:column;justify-content:end;padding-left:5px;padding-right:5px}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon{cursor:pointer;font-size:11px}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon.enabled{color:var(--vscode-textLink-foreground)}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon.disabled{opacity:.6}.monaco-editor .monaco-hover .hover-row .actions{background-color:var(--vscode-editorHoverWidget-statusBarBackground)}.monaco-editor .monaco-hover code{background-color:var(--vscode-textCodeBlock-background)}";
 n(css,{});
 export { css, css as default };

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

@@ -0,0 +1,247 @@
+import { localizeWithPath } from '../../../../nls.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { HoverController } from './hoverController.js';
+import { AccessibleViewType, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { HoverVerbosityAction } from '../../../common/languages.js';
+import { INCREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID } from './hoverActionIds.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { Action } from '../../../../base/common/actions.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { labelForHoverVerbosityAction } from './markdownHoverParticipant.js';
+const _moduleId = "vs/editor/contrib/hover/browser/hoverAccessibleViews";
+var HoverAccessibilityHelpNLS;
+( ((function(HoverAccessibilityHelpNLS) {
+    HoverAccessibilityHelpNLS.intro = ( localizeWithPath(
+        _moduleId,
+        0,
+        "Focus on the hover widget to cycle through the hover parts with the Tab key."
+    ));
+    HoverAccessibilityHelpNLS.increaseVerbosity = ( localizeWithPath(
+        _moduleId,
+        1,
+        "- The focused hover part verbosity level can be increased with the Increase Hover Verbosity command<keybinding:{0}>.",
+        INCREASE_HOVER_VERBOSITY_ACTION_ID
+    ));
+    HoverAccessibilityHelpNLS.decreaseVerbosity = ( localizeWithPath(
+        _moduleId,
+        2,
+        "- The focused hover part verbosity level can be decreased with the Decrease Hover Verbosity command<keybinding:{0}>.",
+        DECREASE_HOVER_VERBOSITY_ACTION_ID
+    ));
+    HoverAccessibilityHelpNLS.hoverContent = ( localizeWithPath(_moduleId, 3, "The last focused hover content is the following."));
+})(HoverAccessibilityHelpNLS || (HoverAccessibilityHelpNLS = {}))));
+class HoverAccessibleView {
+    constructor() {
+        this.type = AccessibleViewType.View;
+        this.priority = 95;
+        this.name = 'hover';
+        this.when = EditorContextKeys.hoverFocused;
+    }
+    getProvider(accessor) {
+        const codeEditorService = accessor.get(ICodeEditorService);
+        const codeEditor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
+        if (!codeEditor) {
+            throw ( (new Error('No active or focused code editor')));
+        }
+        const hoverController = HoverController.get(codeEditor);
+        if (!hoverController) {
+            return;
+        }
+        const keybindingService = accessor.get(IKeybindingService);
+        this._provider = accessor.get(IInstantiationService).createInstance(HoverAccessibleViewProvider, keybindingService, codeEditor, hoverController);
+        return this._provider;
+    }
+    dispose() {
+        this._provider?.dispose();
+    }
+}
+class HoverAccessibilityHelp {
+    constructor() {
+        this.priority = 100;
+        this.name = 'hover';
+        this.type = AccessibleViewType.Help;
+        this.when = EditorContextKeys.hoverVisible;
+    }
+    getProvider(accessor) {
+        const codeEditorService = accessor.get(ICodeEditorService);
+        const codeEditor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
+        if (!codeEditor) {
+            throw ( (new Error('No active or focused code editor')));
+        }
+        const hoverController = HoverController.get(codeEditor);
+        if (!hoverController) {
+            return;
+        }
+        return accessor.get(IInstantiationService).createInstance(HoverAccessibilityHelpProvider, hoverController);
+    }
+    dispose() {
+        this._provider?.dispose();
+    }
+}
+class BaseHoverAccessibleViewProvider extends Disposable {
+    constructor(_hoverController) {
+        super();
+        this._hoverController = _hoverController;
+        this.id = AccessibleViewProviderId.Hover;
+        this.verbositySettingKey = 'accessibility.verbosity.hover';
+        this._onDidChangeContent = this._register(( (new Emitter())));
+        this.onDidChangeContent = this._onDidChangeContent.event;
+        this._markdownHoverFocusedIndex = -1;
+    }
+    onOpen() {
+        if (!this._hoverController) {
+            return;
+        }
+        this._hoverController.shouldKeepOpenOnEditorMouseMoveOrLeave = true;
+        this._markdownHoverFocusedIndex = this._hoverController.focusedMarkdownHoverIndex();
+        this._onHoverContentsChanged = this._register(this._hoverController.onHoverContentsChanged(() => {
+            this._onDidChangeContent.fire();
+        }));
+    }
+    onClose() {
+        if (!this._hoverController) {
+            return;
+        }
+        this._markdownHoverFocusedIndex = -1;
+        this._hoverController.focus();
+        this._hoverController.shouldKeepOpenOnEditorMouseMoveOrLeave = false;
+        this._onHoverContentsChanged?.dispose();
+    }
+}
+class HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvider {
+    constructor(hoverController) {
+        super(hoverController);
+        this.options = { type: AccessibleViewType.Help };
+    }
+    provideContent() {
+        return this.provideContentAtIndex(this._markdownHoverFocusedIndex);
+    }
+    provideContentAtIndex(index) {
+        const content = [];
+        content.push(HoverAccessibilityHelpNLS.intro);
+        content.push(...this._descriptionsOfVerbosityActionsForIndex(index));
+        content.push(...this._descriptionOfFocusedMarkdownHoverAtIndex(index));
+        return content.join('\n');
+    }
+    _descriptionsOfVerbosityActionsForIndex(index) {
+        const content = [];
+        const descriptionForIncreaseAction = this._descriptionOfVerbosityActionForIndex(HoverVerbosityAction.Increase, index);
+        if (descriptionForIncreaseAction !== undefined) {
+            content.push(descriptionForIncreaseAction);
+        }
+        const descriptionForDecreaseAction = this._descriptionOfVerbosityActionForIndex(HoverVerbosityAction.Decrease, index);
+        if (descriptionForDecreaseAction !== undefined) {
+            content.push(descriptionForDecreaseAction);
+        }
+        return content;
+    }
+    _descriptionOfVerbosityActionForIndex(action, index) {
+        const isActionSupported = this._hoverController.doesMarkdownHoverAtIndexSupportVerbosityAction(index, action);
+        if (!isActionSupported) {
+            return;
+        }
+        switch (action) {
+            case HoverVerbosityAction.Increase:
+                return HoverAccessibilityHelpNLS.increaseVerbosity;
+            case HoverVerbosityAction.Decrease:
+                return HoverAccessibilityHelpNLS.decreaseVerbosity;
+        }
+    }
+    _descriptionOfFocusedMarkdownHoverAtIndex(index) {
+        const content = [];
+        const hoverContent = this._hoverController.markdownHoverContentAtIndex(index);
+        if (hoverContent) {
+            content.push('\n' + HoverAccessibilityHelpNLS.hoverContent);
+            content.push('\n' + hoverContent);
+        }
+        return content;
+    }
+}
+class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider {
+    constructor(_keybindingService, _editor, hoverController) {
+        super(hoverController);
+        this._keybindingService = _keybindingService;
+        this._editor = _editor;
+        this.options = { type: AccessibleViewType.View };
+        this._initializeOptions(this._editor, hoverController);
+    }
+    provideContent() {
+        const hoverContent = this._hoverController.markdownHoverContentAtIndex(this._markdownHoverFocusedIndex);
+        return hoverContent.length > 0 ? hoverContent : this._hoverController.getWidgetContent() || HoverAccessibilityHelpNLS.intro;
+    }
+    get actions() {
+        const actions = [];
+        actions.push(this._getActionFor(this._editor, HoverVerbosityAction.Increase));
+        actions.push(this._getActionFor(this._editor, HoverVerbosityAction.Decrease));
+        return actions;
+    }
+    _getActionFor(editor, action) {
+        let actionId;
+        let accessibleActionId;
+        let actionCodicon;
+        switch (action) {
+            case HoverVerbosityAction.Increase:
+                actionId = INCREASE_HOVER_VERBOSITY_ACTION_ID;
+                accessibleActionId = INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID;
+                actionCodicon = Codicon.add;
+                break;
+            case HoverVerbosityAction.Decrease:
+                actionId = DECREASE_HOVER_VERBOSITY_ACTION_ID;
+                accessibleActionId = DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID;
+                actionCodicon = Codicon.remove;
+                break;
+        }
+        const actionLabel = labelForHoverVerbosityAction(this._keybindingService, action);
+        const actionEnabled = this._hoverController.doesMarkdownHoverAtIndexSupportVerbosityAction(this._markdownHoverFocusedIndex, action);
+        return (
+             (new Action(
+                accessibleActionId,
+                actionLabel,
+                ThemeIcon.asClassName(actionCodicon),
+                actionEnabled,
+                () => {
+                    editor.getAction(actionId)?.run({ index: this._markdownHoverFocusedIndex, focus: false });
+                }
+            ))
+        );
+    }
+    _initializeOptions(editor, hoverController) {
+        const helpProvider = this._register(( (new HoverAccessibilityHelpProvider(hoverController))));
+        this.options.language = editor.getModel()?.getLanguageId();
+        this.options.customHelp = () => { return helpProvider.provideContentAtIndex(this._markdownHoverFocusedIndex); };
+    }
+}
+class ExtHoverAccessibleView {
+    constructor() {
+        this.type = AccessibleViewType.View;
+        this.priority = 90;
+        this.name = 'extension-hover';
+    }
+    getProvider(accessor) {
+        const contextViewService = accessor.get(IContextViewService);
+        const contextViewElement = contextViewService.getContextViewElement();
+        const extensionHoverContent = contextViewElement?.textContent ?? undefined;
+        const hoverService = accessor.get(IHoverService);
+        if (contextViewElement.classList.contains('accessible-view-container') || !extensionHoverContent) {
+            return;
+        }
+        return {
+            id: AccessibleViewProviderId.Hover,
+            verbositySettingKey: 'accessibility.verbosity.hover',
+            provideContent() { return extensionHoverContent; },
+            onClose() {
+                hoverService.showAndFocusLastHover();
+            },
+            options: { language: 'typescript', type: AccessibleViewType.View }
+        };
+    }
+    dispose() { }
+}
+export { ExtHoverAccessibleView, HoverAccessibilityHelp, HoverAccessibilityHelpProvider, HoverAccessibleView, HoverAccessibleViewProvider };

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

@@ -1,3 +1,5 @@
+import { localizeWithPath } from '../../../../nls.js';
+const _moduleId = "vs/editor/contrib/hover/browser/hoverActionIds";
 const SHOW_OR_FOCUS_HOVER_ACTION_ID = 'editor.action.showHover';
 const SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID = 'editor.action.showDefinitionPreviewHover';
 const SCROLL_UP_HOVER_ACTION_ID = 'editor.action.scrollUpHover';
@@ -9,5 +11,9 @@ const PAGE_DOWN_HOVER_ACTION_ID = 'editor.action.pageDownHover';
 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 = ( localizeWithPath(_moduleId, 0, "Increase Hover Verbosity Level"));
 const DECREASE_HOVER_VERBOSITY_ACTION_ID = 'editor.action.decreaseHoverVerbosityLevel';
-export { DECREASE_HOVER_VERBOSITY_ACTION_ID, GO_TO_BOTTOM_HOVER_ACTION_ID, GO_TO_TOP_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, 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 };
+const DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID = 'editor.action.decreaseHoverVerbosityLevelFromAccessibleView';
+const DECREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localizeWithPath(_moduleId, 1, "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, 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 };