Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

screencast mode: look for commands in command registry (#193797)

Browse Source 
fixes #188938
This commit is contained in:
João Moreno
2023-09-22 13:42:16 +01:00
committed by GitHub
parent d488158485
commit 2a691f77e4
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/vs/workbench/browser/actions/developerActions.ts
View File

@@ -38,6 +38,7 @@ import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/commo
import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import product from 'vs/platform/product/common/product';
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
class InspectContextKeysAction extends Action2 {
@@ -295,16 +296,14 @@ class ToggleScreencastModeAction extends Action2 {
}
const keybinding = keybindingService.resolveKeyboardEvent(event);
const command = (this._isKbFound(shortcut) && shortcut.commandId) ? MenuRegistry.getCommand(shortcut.commandId) : null;
const commandDetails = (this._isKbFound(shortcut) && shortcut.commandId) ? this.getCommandDetails(shortcut.commandId) : undefined;
let commandAndGroupLabel = '';
let commandAndGroupLabel = commandDetails?.title;
let keyLabel: string | undefined | null = keybinding.getLabel();
if (command) {
commandAndGroupLabel = typeof command.title === 'string' ? command.title : command.title.value;
if ((options.showCommandGroups ?? false) && command.category) {
commandAndGroupLabel = `${typeof command.category === 'string' ? command.category : command.category.value}: ${commandAndGroupLabel} `;
if (commandDetails) {
if ((options.showCommandGroups ?? false) && commandDetails.category) {
commandAndGroupLabel = `${commandDetails.category}: ${commandAndGroupLabel} `;
}
if (this._isKbFound(shortcut) && shortcut.commandId) {
@@ -321,7 +320,7 @@ class ToggleScreencastModeAction extends Action2 {
append(keyboardMarker, $('span.title', {}, `${commandAndGroupLabel} `));
}
if ((options.showKeys ?? true) || (command && (options.showKeybindings ?? true))) {
if ((options.showKeys ?? true) || (commandDetails && (options.showKeybindings ?? true))) {
// Fix label for arrow keys
keyLabel = keyLabel?.replace('UpArrow', '↑')
?.replace('DownArrow', '↓')
@@ -341,6 +340,25 @@ class ToggleScreencastModeAction extends Action2 {
private _isKbFound(resolutionResult: ResolutionResult): resolutionResult is { kind: ResultKind.KbFound; commandId: string | null; commandArgs: any; isBubble: boolean } {
return resolutionResult.kind === ResultKind.KbFound;
}
private getCommandDetails(commandId: string): { title: string; category?: string } | undefined {
const fromMenuRegistry = MenuRegistry.getCommand(commandId);
if (fromMenuRegistry) {
return {
title: typeof fromMenuRegistry.title === 'string' ? fromMenuRegistry.title : fromMenuRegistry.title.value,
category: fromMenuRegistry.category ? (typeof fromMenuRegistry.category === 'string' ? fromMenuRegistry.category : fromMenuRegistry.category.value) : undefined
};
}
const fromCommandsRegistry = CommandsRegistry.getCommand(commandId);
if (fromCommandsRegistry && fromCommandsRegistry.description?.description) {
return { title: fromCommandsRegistry.description.description };
}
return undefined;
}
}
class LogStorageAction extends Action2 {