Align terminal command ids with VS Code. Fixes #12084

Contributed on behalf of STMicroelectronics Signed-off-by: Thomas Mäder <[email protected]>
eclipse-theia · Jan 31, 2023 · a85241b · a85241b
1 parent d850c16
commit a85241b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/packages/plugin-ext/src/plugin/dialogs.ts b/packages/plugin-ext/src/plugin/dialogs.ts
@@ -30,8 +30,8 @@ export class DialogsExtImpl {
             title: options.title,
             openLabel: options.openLabel,
             defaultUri: options.defaultUri ? options.defaultUri.path : undefined,
-            canSelectFiles: options.canSelectFiles ? options.canSelectFiles : true,
-            canSelectFolders: options.canSelectFolders ? options.canSelectFolders : false,
+            canSelectFiles: typeof options.canSelectFiles === 'boolean' ? options.canSelectFiles : true,
+            canSelectFolders: typeof options.canSelectFolders === 'boolean' ? options.canSelectFolders : false,
             canSelectMany: options.canSelectMany,
             filters: options.filters
         } as OpenDialogOptionsMain;

diff --git a/packages/plugin-ext/src/plugin/known-commands.ts b/packages/plugin-ext/src/plugin/known-commands.ts
@@ -27,6 +27,8 @@ import {
     isModelCallHierarchyOutgoingCall, toCallHierarchyOutgoingCall, fromTextDocumentShowOptions
 } from './type-converters';
 
+import { URI as TheiaURI } from '@theia/core/lib/common/uri';
+
 // Here is a mapping of VSCode commands to monaco commands with their conversions
 export namespace KnownCommands {
 
@@ -63,6 +65,9 @@ export namespace KnownCommands {
         }
     };
 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const ID = (args: any[]) => args;
+
     mappings['editor.action.select.all'] = ['editor.action.select.all', CONVERT_VSCODE_TO_MONACO];
     mappings['editor.action.toggleHighContrast'] = ['editor.action.toggleHighContrast', CONVERT_VSCODE_TO_MONACO];
     mappings['editor.action.moveCarretLeftAction'] = ['editor.action.moveCarretLeftAction', CONVERT_VSCODE_TO_MONACO];
@@ -302,6 +307,17 @@ export namespace KnownCommands {
     mappings['vscode.open'] = ['vscode.open', CONVERT_VSCODE_TO_MONACO];
     mappings['vscode.diff'] = ['vscode.diff', CONVERT_VSCODE_TO_MONACO];
 
+    // terminal commands
+    mappings['workbench.action.terminal.new'] = ['terminal:new', ID];
+    mappings['workbench.action.terminal.newWithProfile'] = ['terminal:new:profile', ID];
+    mappings['workbench.action.terminal.selectDefaultShell'] = ['terminal:profile:default', ID];
+    mappings['workbench.action.terminal.newInActiveWorkspace'] = ['terminal:new:active:workspace', ID];
+    mappings['workbench.action.terminal.clear'] = ['terminal:clear', ID];
+    mappings['openInTerminal'] = ['terminal:context', createConversionFunction((uri: URI) => new TheiaURI(uri))];
+    mappings['workbench.action.terminal.split'] = ['terminal:split', ID];
+    mappings['workbench.action.terminal.focusFind'] = ['terminal:find', ID];
+    mappings['workbench.action.terminal.hideFind'] = ['terminal:find:cancel', ID];
+
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     export function map<T>(id: string, args: any[] | undefined, toDo: (mappedId: string, mappedArgs: any[] | undefined, mappedResult: ConversionFunction | undefined) => T): T {
         if (mappings[id]) {