Terminal's with waitOnExit === true shouldn't print wait string (microsoft#61229)

alexr00 · web-flow · commit 26d62c4b9f7c · 2018-10-19T10:30:44.000+02:00
Fixes microsoft#58371
diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
@@ -531,7 +531,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 			} else if (task.command.presentation.showReuseMessage) {
 				waitOnExit = nls.localize('reuseTerminal', 'Terminal will be reused by tasks, press any key to close it.');
 			} else {
-				waitOnExit = '\u200B';
+				waitOnExit = true;
 			}
 		}
 		let shellLaunchConfig: IShellLaunchConfig | undefined = undefined;
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -834,12 +834,12 @@ export class TerminalInstance implements ITerminalInstance {
 			if (exitCode) {
 				this._xterm.writeln(exitCodeMessage);
 			}
-			let message = typeof this._shellLaunchConfig.waitOnExit === 'string'
-				? this._shellLaunchConfig.waitOnExit
-				: nls.localize('terminal.integrated.waitOnExit', 'Press any key to close the terminal');
-			// Bold the message and add an extra new line to make it stand out from the rest of the output
-			message = `\n\x1b[1m${message}\x1b[0m`;
-			this._xterm.writeln(message);
+			if (typeof this._shellLaunchConfig.waitOnExit === 'string') {
+				let message = this._shellLaunchConfig.waitOnExit;
+				// Bold the message and add an extra new line to make it stand out from the rest of the output
+				message = `\n\x1b[1m${message}\x1b[0m`;
+				this._xterm.writeln(message);
+			}
 			// Disable all input if the terminal is exiting and listen for next keypress
 			this._xterm.setOption('disableStdin', true);
 			if (this._xterm.textarea) {

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ export class TerminalTaskSystem implements ITaskSystem {`
`531`	`531`	`} else if (task.command.presentation.showReuseMessage) {`
`532`	`532`	`waitOnExit = nls.localize('reuseTerminal', 'Terminal will be reused by tasks, press any key to close it.');`
`533`	`533`	`} else {`
`534`		`- waitOnExit = '\u200B';`
	`534`	`+ waitOnExit = true;`
`535`	`535`	`}`
`536`	`536`	`}`
`537`	`537`	`let shellLaunchConfig: IShellLaunchConfig \| undefined = undefined;`