Fix Cannot Read property 'cwd' of undefined (#9747)

Fixes #9743 by improving check for taskConfig.options.cwd from #9695. Also ensures that lastCwd field on terminal-widget is never undefined as to ensure get cwd() will always return a URI. Signed-off-by: Kenneth Marut <[email protected]>
eclipse-theia · Jul 16, 2021 · a7c35d7 · a7c35d7
1 parent 3181ed3
commit a7c35d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/packages/task/src/browser/task-terminal-widget-manager.ts b/packages/task/src/browser/task-terminal-widget-manager.ts
@@ -196,7 +196,8 @@ export class TaskTerminalWidgetManager {
         }
 
         // we are unable to find a terminal widget to run the task, or `taskPresentation === 'new'`
-        const lastCwd = new URI(taskConfig?.options.cwd);
+        const lastCwd = taskConfig?.options?.cwd ? new URI(taskConfig.options.cwd) : new URI();
+
         if (!reusableTerminalWidget) {
             const widget = await this.newTaskTerminal(factoryOptions);
             widget.lastCwd = lastCwd;

diff --git a/packages/terminal/src/browser/base/terminal-widget.ts b/packages/terminal/src/browser/base/terminal-widget.ts
@@ -46,7 +46,7 @@ export abstract class TerminalWidget extends BaseWidget {
     abstract readonly dimensions: TerminalDimensions;
 
     /** The last CWD assigned to the terminal, useful when attempting getCwdURI on a task terminal fails */
-    lastCwd: URI | undefined;
+    lastCwd: URI;
 
     /**
      * Start terminal and return terminal id.

diff --git a/packages/terminal/src/browser/terminal-widget-impl.ts b/packages/terminal/src/browser/terminal-widget-impl.ts
@@ -61,7 +61,7 @@ export class TerminalWidgetImpl extends TerminalWidget implements StatefulWidget
     protected hoverMessage: HTMLDivElement;
     protected lastTouchEnd: TouchEvent | undefined;
     protected isAttachedCloseListener: boolean = false;
-    lastCwd: URI;
+    lastCwd = new URI();
 
     @inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
     @inject(WebSocketConnectionProvider) protected readonly webSocketConnectionProvider: WebSocketConnectionProvider;