Correctly pass selected workspace root to terminal profile

Fixes eclipse-theia#12197 Contributed on behalf of STMicroelectronics Signed-off-by: Thomas Mäder <t.s.maeder@gmail.com>
tsmaeder · Feb 20, 2023 · 1c11c52 · 1c11c52
1 parent 79ce67d
commit 1c11c52
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/terminal/src/browser/shell-terminal-profile.ts b/packages/terminal/src/browser/shell-terminal-profile.ts
@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { IShellTerminalServerOptions } from '../common/shell-terminal-protocol';
+import { URI } from '@theia/core';
 import { TerminalService } from './base/terminal-service';
 import { TerminalWidget, TerminalWidgetOptions } from './base/terminal-widget';
 import { TerminalProfile } from './terminal-profile-service';
@@ -34,7 +34,7 @@ export class ShellTerminalProfile implements TerminalProfile {
      * @param options the options to override
      * @returns a modified copy of this profile
      */
-    modify(options: IShellTerminalServerOptions): TerminalProfile {
+    modify(options: { cwd?: string | URI }): TerminalProfile {
         return new ShellTerminalProfile(this.terminalService, { ...this.options, ...options });
     }
 }
diff --git a/packages/terminal/src/browser/terminal-frontend-contribution.ts b/packages/terminal/src/browser/terminal-frontend-contribution.ts
@@ -932,14 +932,17 @@ export class TerminalFrontendContribution implements FrontendApplicationContribu
     }
 
     protected async openTerminal(options?: ApplicationShell.WidgetOptions): Promise<void> {
-        const cwd = await this.selectTerminalCwd();
         let profile = this.profileService.defaultProfile;
 
         if (!profile) {
             throw new Error('There are not profiles registered');
         }
         if (profile instanceof ShellTerminalProfile) {
-            profile = profile.modify({ rootURI: cwd });
+            const cwd = await this.selectTerminalCwd();
+            if (!cwd) {
+                return;
+            }
+            profile = profile.modify({ cwd });
         }
 
         const termWidget = await profile?.start();
@@ -955,7 +958,10 @@ export class TerminalFrontendContribution implements FrontendApplicationContribu
         let profile = result[1];
         if (profile instanceof ShellTerminalProfile) {
             const cwd = await this.selectTerminalCwd();
-            profile = profile.modify({ rootURI: cwd });
+            if (!cwd) {
+                return;
+            }
+            profile = profile.modify({ cwd });
         }
         const termWidget = await profile.start();
         this.open(termWidget, { widgetOptions: options });