Reusing NLS label of markdown verbose hover in accessible view (microsoft#213680)

* reusing nls label

* polishing

Author: aiday-mar

src/vs/editor/contrib/hover/browser/hoverAccessibleViews.ts

@@ -11,14 +11,16 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { HoverVerbosityAction } from 'vs/editor/common/languages';
-import { DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL, INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_LABEL } from 'vs/editor/contrib/hover/browser/hoverActionIds';
+import { DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID } from 'vs/editor/contrib/hover/browser/hoverActionIds';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { Action, IAction } from 'vs/base/common/actions';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { Codicon } from 'vs/base/common/codicons';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { labelForHoverVerbosityAction } from 'vs/editor/contrib/hover/browser/markdownHoverParticipant';
 
 namespace HoverAccessibilityHelpNLS {
 	export const intro = localize('intro', "Focus on the hover widget to cycle through the hover parts with the Tab key.");
@@ -46,7 +48,8 @@ export class HoverAccessibleView implements IAccessibleViewImplentation {
 		if (!hoverController) {
 			return;
 		}
-		this._provider = accessor.get(IInstantiationService).createInstance(HoverAccessibleViewProvider, codeEditor, hoverController);
+		const keybindingService = accessor.get(IKeybindingService);
+		this._provider = accessor.get(IInstantiationService).createInstance(HoverAccessibleViewProvider, keybindingService, codeEditor, hoverController);
 		return this._provider;
 	}
 
@@ -125,7 +128,6 @@ abstract class BaseHoverAccessibleViewProvider extends Disposable implements IAc
 	}
 }
 
-
 export class HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvider implements IAccessibleViewContentProvider {
 
 	public readonly options: IAccessibleViewOptions = { type: AccessibleViewType.Help };
@@ -190,6 +192,7 @@ export class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider
 	public readonly options: IAccessibleViewOptions = { type: AccessibleViewType.View };
 
 	constructor(
+		private readonly _keybindingService: IKeybindingService,
 		private readonly _editor: ICodeEditor,
 		hoverController: HoverController,
 	) {
@@ -212,22 +215,20 @@ export class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider
 	private _getActionFor(editor: ICodeEditor, action: HoverVerbosityAction): IAction {
 		let actionId: string;
 		let accessibleActionId: string;
-		let actionLabel: string;
 		let actionCodicon: ThemeIcon;
 		switch (action) {
 			case HoverVerbosityAction.Increase:
 				actionId = INCREASE_HOVER_VERBOSITY_ACTION_ID;
 				accessibleActionId = INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID;
-				actionLabel = INCREASE_HOVER_VERBOSITY_ACTION_LABEL;
 				actionCodicon = Codicon.add;
 				break;
 			case HoverVerbosityAction.Decrease:
 				actionId = DECREASE_HOVER_VERBOSITY_ACTION_ID;
 				accessibleActionId = DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID;
-				actionLabel = DECREASE_HOVER_VERBOSITY_ACTION_LABEL;
 				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 });

src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts

@@ -324,17 +324,7 @@ class MarkdownRenderedHoverParts extends Disposable {
 		const actionElement = dom.append(container, $(ThemeIcon.asCSSSelector(isActionIncrease ? increaseHoverVerbosityIcon : decreaseHoverVerbosityIcon)));
 		actionElement.tabIndex = 0;
 		const hoverDelegate = new WorkbenchHoverDelegate('mouse', false, { target: container, position: { hoverPosition: HoverPosition.LEFT } }, this._configurationService, this._hoverService);
-		if (isActionIncrease) {
-			const kb = this._keybindingService.lookupKeybinding(INCREASE_HOVER_VERBOSITY_ACTION_ID);
-			store.add(this._hoverService.setupUpdatableHover(hoverDelegate, actionElement, kb ?
-				nls.localize('increaseVerbosityWithKb', "Increase Verbosity ({0})", kb.getLabel()) :
-				nls.localize('increaseVerbosity', "Increase Verbosity")));
-		} else {
-			const kb = this._keybindingService.lookupKeybinding(DECREASE_HOVER_VERBOSITY_ACTION_ID);
-			store.add(this._hoverService.setupUpdatableHover(hoverDelegate, actionElement, kb ?
-				nls.localize('decreaseVerbosityWithKb', "Decrease Verbosity ({0})", kb.getLabel()) :
-				nls.localize('decreaseVerbosity', "Decrease Verbosity")));
-		}
+		store.add(this._hoverService.setupUpdatableHover(hoverDelegate, actionElement, labelForHoverVerbosityAction(this._keybindingService, action)));
 		if (!actionEnabled) {
 			actionElement.classList.add('disabled');
 			return store;
@@ -485,3 +475,20 @@ function renderMarkdownInContainer(
 	}
 	return store;
 }
+
+export function labelForHoverVerbosityAction(keybindingService: IKeybindingService, action: HoverVerbosityAction): string {
+	switch (action) {
+		case HoverVerbosityAction.Increase: {
+			const kb = keybindingService.lookupKeybinding(INCREASE_HOVER_VERBOSITY_ACTION_ID);
+			return kb ?
+				nls.localize('increaseVerbosityWithKb', "Increase Hover Verbosity ({0})", kb.getLabel()) :
+				nls.localize('increaseVerbosity', "Increase Hover Verbosity");
+		}
+		case HoverVerbosityAction.Decrease: {
+			const kb = keybindingService.lookupKeybinding(DECREASE_HOVER_VERBOSITY_ACTION_ID);
+			return kb ?
+				nls.localize('decreaseVerbosityWithKb', "Decrease Hover Verbosity ({0})", kb.getLabel()) :
+				nls.localize('decreaseVerbosity', "Decrease Hover Verbosity");
+		}
+	}
+}