Merge remote-tracking branch 'origin/master' into tyriar/69865_remove_renderers

Tyriar · Tyriar · commit c15881397925 · 2019-08-05T15:12:40.000-07:00
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -775,18 +775,6 @@ declare module 'vscode' {
 		readonly onDidWriteData: Event<string>;
 	}
 
-
-	export interface TerminalOptions {
-		/**
-		 * When enabled the terminal will run the process as normal but not be surfaced to the user
-		 * until `Terminal.show` is called. The typical usage for this is when you need to run
-		 * something that may need interactivity but only want to tell the user about it when
-		 * interaction is needed. Note that the terminals will still be exposed to all extensions
-		 * as normal.
-		 */
-		runInBackground?: boolean;
-	}
-
 	/**
 	 * Represents the dimensions of a terminal.
 	 */
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -532,10 +532,8 @@ export function createApiFactory(
 				if (typeof nameOrOptions === 'object') {
 					if ('pty' in nameOrOptions) {
 						return extHostTerminalService.createExtensionTerminal(nameOrOptions);
-					} else {
-						nameOrOptions.hideFromUser = nameOrOptions.hideFromUser || (nameOrOptions.runInBackground && extension.enableProposedApi);
-						return extHostTerminalService.createTerminalFromOptions(nameOrOptions);
 					}
+					return extHostTerminalService.createTerminalFromOptions(nameOrOptions);
 				}
 				return extHostTerminalService.createTerminal(<string>nameOrOptions, shellPath, shellArgs);
 			},

Original file line number	Diff line number	Diff line change
`@@ -532,10 +532,8 @@ export function createApiFactory(`
`532`	`532`	`if (typeof nameOrOptions === 'object') {`
`533`	`533`	`if ('pty' in nameOrOptions) {`
`534`	`534`	`return extHostTerminalService.createExtensionTerminal(nameOrOptions);`
`535`		`- } else {`
`536`		`- nameOrOptions.hideFromUser = nameOrOptions.hideFromUser \|\| (nameOrOptions.runInBackground && extension.enableProposedApi);`
`537`		`- return extHostTerminalService.createTerminalFromOptions(nameOrOptions);`
`538`	`535`	`}`
	`536`	`+ return extHostTerminalService.createTerminalFromOptions(nameOrOptions);`
`539`	`537`	`}`
`540`	`538`	`return extHostTerminalService.createTerminal(<string>nameOrOptions, shellPath, shellArgs);`
`541`	`539`	`},`