@codingame/monaco-vscode-api 6.0.2 → 7.0.0

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

@@ -6,7 +6,7 @@ import { IContextViewService } from '../../../../platform/contextview/browser/co
 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 { DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, INCREASE_HOVER_VERBOSITY_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';
@@ -18,24 +18,20 @@ 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.introHoverPart = ( localizeWithPath(_moduleId, 0, 'The focused hover part content is the following:'));
+    HoverAccessibilityHelpNLS.introHoverFull = ( localizeWithPath(_moduleId, 1, 'The full focused hover content is the following:'));
     HoverAccessibilityHelpNLS.increaseVerbosity = ( localizeWithPath(
         _moduleId,
-        1,
-        "- The focused hover part verbosity level can be increased with the Increase Hover Verbosity command<keybinding:{0}>.",
+        2,
+        '- 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}>.",
+        3,
+        '- 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() {
@@ -93,15 +89,15 @@ class BaseHoverAccessibleViewProvider extends Disposable {
         this.verbositySettingKey = 'accessibility.verbosity.hover';
         this._onDidChangeContent = this._register(( (new Emitter())));
         this.onDidChangeContent = this._onDidChangeContent.event;
-        this._markdownHoverFocusedIndex = -1;
+        this._focusedHoverPartIndex = -1;
     }
     onOpen() {
         if (!this._hoverController) {
             return;
         }
         this._hoverController.shouldKeepOpenOnEditorMouseMoveOrLeave = true;
-        this._markdownHoverFocusedIndex = this._hoverController.focusedMarkdownHoverIndex();
-        this._onHoverContentsChanged = this._register(this._hoverController.onHoverContentsChanged(() => {
+        this._focusedHoverPartIndex = this._hoverController.focusedHoverPartIndex();
+        this._register(this._hoverController.onHoverContentsChanged(() => {
             this._onDidChangeContent.fire();
         }));
     }
@@ -109,26 +105,40 @@ class BaseHoverAccessibleViewProvider extends Disposable {
         if (!this._hoverController) {
             return;
         }
-        this._markdownHoverFocusedIndex = -1;
-        this._hoverController.focus();
+        if (this._focusedHoverPartIndex === -1) {
+            this._hoverController.focus();
+        }
+        else {
+            this._hoverController.focusHoverPartWithIndex(this._focusedHoverPartIndex);
+        }
+        this._focusedHoverPartIndex = -1;
         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);
+        this.dispose();
     }
-    provideContentAtIndex(index) {
-        const content = [];
-        content.push(HoverAccessibilityHelpNLS.intro);
-        content.push(...this._descriptionsOfVerbosityActionsForIndex(index));
-        content.push(...this._descriptionOfFocusedMarkdownHoverAtIndex(index));
-        return content.join('\n');
+    provideContentAtIndex(focusedHoverIndex, includeVerbosityActions) {
+        if (focusedHoverIndex !== -1) {
+            const accessibleContent = this._hoverController.getAccessibleWidgetContentAtIndex(focusedHoverIndex);
+            if (accessibleContent === undefined) {
+                return '';
+            }
+            const contents = [];
+            if (includeVerbosityActions) {
+                contents.push(...this._descriptionsOfVerbosityActionsForIndex(focusedHoverIndex));
+            }
+            contents.push(HoverAccessibilityHelpNLS.introHoverPart);
+            contents.push(accessibleContent);
+            return contents.join('\n\n');
+        }
+        else {
+            const accessibleContent = this._hoverController.getAccessibleWidgetContent();
+            if (accessibleContent === undefined) {
+                return '';
+            }
+            const contents = [];
+            contents.push(HoverAccessibilityHelpNLS.introHoverFull);
+            contents.push(accessibleContent);
+            return contents.join('\n\n');
+        }
     }
     _descriptionsOfVerbosityActionsForIndex(index) {
         const content = [];
@@ -143,7 +153,7 @@ class HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvider {
         return content;
     }
     _descriptionOfVerbosityActionForIndex(action, index) {
-        const isActionSupported = this._hoverController.doesMarkdownHoverAtIndexSupportVerbosityAction(index, action);
+        const isActionSupported = this._hoverController.doesHoverAtIndexSupportVerbosityAction(index, action);
         if (!isActionSupported) {
             return;
         }
@@ -154,14 +164,14 @@ class HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvider {
                 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 HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvider {
+    constructor(hoverController) {
+        super(hoverController);
+        this.options = { type: AccessibleViewType.Help };
+    }
+    provideContent() {
+        return this.provideContentAtIndex(this._focusedHoverPartIndex, true);
     }
 }
 class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider {
@@ -173,8 +183,7 @@ class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider {
         this._initializeOptions(this._editor, hoverController);
     }
     provideContent() {
-        const hoverContent = this._hoverController.markdownHoverContentAtIndex(this._markdownHoverFocusedIndex);
-        return hoverContent.length > 0 ? hoverContent : this._hoverController.getWidgetContent() || HoverAccessibilityHelpNLS.intro;
+        return this.provideContentAtIndex(this._focusedHoverPartIndex, false);
     }
     get actions() {
         const actions = [];
@@ -199,7 +208,7 @@ class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider {
                 break;
         }
         const actionLabel = labelForHoverVerbosityAction(this._keybindingService, action);
-        const actionEnabled = this._hoverController.doesMarkdownHoverAtIndexSupportVerbosityAction(this._markdownHoverFocusedIndex, action);
+        const actionEnabled = this._hoverController.doesHoverAtIndexSupportVerbosityAction(this._focusedHoverPartIndex, action);
         return (
              (new Action(
                 accessibleActionId,
@@ -207,7 +216,7 @@ class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider {
                 ThemeIcon.asClassName(actionCodicon),
                 actionEnabled,
                 () => {
-                    editor.getAction(actionId)?.run({ index: this._markdownHoverFocusedIndex, focus: false });
+                    editor.getAction(actionId)?.run({ index: this._focusedHoverPartIndex, focus: false });
                 }
             ))
         );
@@ -215,7 +224,7 @@ class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider {
     _initializeOptions(editor, hoverController) {
         const helpProvider = this._register(( (new HoverAccessibilityHelpProvider(hoverController))));
         this.options.language = editor.getModel()?.getLanguageId();
-        this.options.customHelp = () => { return helpProvider.provideContentAtIndex(this._markdownHoverFocusedIndex); };
+        this.options.customHelp = () => { return helpProvider.provideContentAtIndex(this._focusedHoverPartIndex, true); };
     }
 }
 class ExtHoverAccessibleView {

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

@@ -339,7 +339,12 @@ class IncreaseHoverVerbosityLevel extends EditorAction {
         });
     }
     run(accessor, editor, args) {
-        HoverController.get(editor)?.updateMarkdownHoverVerbosityLevel(HoverVerbosityAction.Increase, args?.index, args?.focus);
+        const hoverController = HoverController.get(editor);
+        if (!hoverController) {
+            return;
+        }
+        const index = args?.index !== undefined ? args.index : hoverController.focusedHoverPartIndex();
+        hoverController.updateHoverVerbosityLevel(HoverVerbosityAction.Increase, index, args?.focus);
     }
 }
 class DecreaseHoverVerbosityLevel extends EditorAction {
@@ -352,7 +357,12 @@ class DecreaseHoverVerbosityLevel extends EditorAction {
         });
     }
     run(accessor, editor, args) {
-        HoverController.get(editor)?.updateMarkdownHoverVerbosityLevel(HoverVerbosityAction.Decrease, args?.index, args?.focus);
+        const hoverController = HoverController.get(editor);
+        if (!hoverController) {
+            return;
+        }
+        const index = args?.index !== undefined ? args.index : hoverController.focusedHoverPartIndex();
+        HoverController.get(editor)?.updateHoverVerbosityLevel(HoverVerbosityAction.Decrease, index, args?.focus);
     }
 }
 export { DecreaseHoverVerbosityLevel, GoToBottomHoverAction, GoToTopHoverAction, IncreaseHoverVerbosityLevel, PageDownHoverAction, PageUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, ScrollUpHoverAction, ShowDefinitionPreviewHoverAction, ShowOrFocusHoverAction };

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

@@ -286,21 +286,21 @@ let HoverController = class HoverController extends Disposable {
     _isContentWidgetResizing() {
         return this._contentWidget?.widget.isResizing || false;
     }
-    focusedMarkdownHoverIndex() {
-        return this._getOrCreateContentWidget().focusedMarkdownHoverIndex();
+    focusedHoverPartIndex() {
+        return this._getOrCreateContentWidget().focusedHoverPartIndex();
     }
-    markdownHoverContentAtIndex(index) {
-        return this._getOrCreateContentWidget().markdownHoverContentAtIndex(index);
+    doesHoverAtIndexSupportVerbosityAction(index, action) {
+        return this._getOrCreateContentWidget().doesHoverAtIndexSupportVerbosityAction(index, action);
     }
-    doesMarkdownHoverAtIndexSupportVerbosityAction(index, action) {
-        return this._getOrCreateContentWidget().doesMarkdownHoverAtIndexSupportVerbosityAction(index, action);
-    }
-    updateMarkdownHoverVerbosityLevel(action, index, focus) {
-        this._getOrCreateContentWidget().updateMarkdownHoverVerbosityLevel(action, index, focus);
+    updateHoverVerbosityLevel(action, index, focus) {
+        this._getOrCreateContentWidget().updateHoverVerbosityLevel(action, index, focus);
     }
     focus() {
         this._contentWidget?.focus();
     }
+    focusHoverPartWithIndex(index) {
+        this._contentWidget?.focusHoverPartWithIndex(index);
+    }
     scrollUp() {
         this._contentWidget?.scrollUp();
     }
@@ -328,6 +328,12 @@ let HoverController = class HoverController extends Disposable {
     getWidgetContent() {
         return this._contentWidget?.getWidgetContent();
     }
+    getAccessibleWidgetContent() {
+        return this._contentWidget?.getAccessibleWidgetContent();
+    }
+    getAccessibleWidgetContentAtIndex(index) {
+        return this._contentWidget?.getAccessibleWidgetContentAtIndex(index);
+    }
     get isColorPickerVisible() {
         return this._contentWidget?.isColorPickerVisible;
     }

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

@@ -35,6 +35,16 @@ class HoverForeignElementAnchor {
         return (lastAnchor.type === HoverAnchorType.ForeignElement && this.owner === lastAnchor.owner);
     }
 }
+class RenderedHoverParts {
+    constructor(renderedHoverParts) {
+        this.renderedHoverParts = renderedHoverParts;
+    }
+    dispose() {
+        for (const part of this.renderedHoverParts) {
+            part.dispose();
+        }
+    }
+}
 const HoverParticipantRegistry = (new (class HoverParticipantRegistry {
     constructor() {
         this._participants = [];
@@ -46,4 +56,4 @@ const HoverParticipantRegistry = (new (class HoverParticipantRegistry {
         return this._participants;
     }
 })());
-export { HoverAnchorType, HoverForeignElementAnchor, HoverParticipantRegistry, HoverRangeAnchor };
+export { HoverAnchorType, HoverForeignElementAnchor, HoverParticipantRegistry, HoverRangeAnchor, RenderedHoverParts };