From 70b5e0e734b09f44787be8e509d2d84e489f557a Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 19 Oct 2021 12:38:55 -0700 Subject: [PATCH 1/2] fix #132578 --- src/vs/workbench/contrib/terminal/browser/terminalInstance.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts index e76a1dd02077e..6e60cc085ce38 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -1371,6 +1371,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { break; } this._exitCode = exitCodeOrError.code; + if (exitCodeOrError.message.includes('error code: 267')) { + exitCodeOrError.message = `Invalid starting directory ${this.initialCwd}, review your terminal.integrated.cwd setting.`; + } exitCodeMessage = nls.localize('launchFailed.errorMessage', "The terminal process failed to launch: {0}.", exitCodeOrError.message); break; } From 43d7b19464c1985b44a24d981573a0f0274742ee Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 19 Oct 2021 13:53:20 -0700 Subject: [PATCH 2/2] improve test expression --- src/vs/workbench/contrib/terminal/browser/terminalInstance.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts index 6e60cc085ce38..18ca706b56101 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -1371,7 +1371,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { break; } this._exitCode = exitCodeOrError.code; - if (exitCodeOrError.message.includes('error code: 267')) { + if (exitCodeOrError.message.match(/.*error code:\s*\d{3}.*$/)) { exitCodeOrError.message = `Invalid starting directory ${this.initialCwd}, review your terminal.integrated.cwd setting.`; } exitCodeMessage = nls.localize('launchFailed.errorMessage', "The terminal process failed to launch: {0}.", exitCodeOrError.message);