Remove windows shellArgs config

This doesn't actually work due to an upstream issue Related #8429
microsoft · Jun 30, 2016 · 0acee44 · 0acee44
1 parent f0419d4
commit 0acee44
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -55,14 +55,6 @@ configurationRegistry.registerConfiguration({
 			'type': 'string',
 			'default': TERMINAL_DEFAULT_SHELL_WINDOWS
 		},
-		'terminal.integrated.shellArgs.windows': {
-			'description': nls.localize('terminal.integrated.shellArgs.windows', "The command line arguments to use when on the Windows terminal."),
-			'type': 'array',
-			'items': {
-				'type': 'string'
-			},
-			'default': []
-		},
 		'terminal.integrated.fontFamily': {
 			'description': nls.localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to editor.fontFamily's value."),
 			'type': 'string'

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.ts
@@ -32,8 +32,7 @@ export interface ITerminalConfiguration {
 			},
 			shellArgs: {
 				linux: string[],
-				osx: string[],
-				windows: string[]
+				osx: string[]
 			},
 			fontFamily: string,
 			fontSize: number,

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
@@ -150,7 +150,6 @@ export class TerminalConfigHelper {
 		};
 		if (this.platform === Platform.Windows) {
 			shell.executable = config.terminal.integrated.shell.windows;
-			shell.args = config.terminal.integrated.shellArgs.windows;
 		} else if (this.platform === Platform.Mac) {
 			shell.executable = config.terminal.integrated.shell.osx;
 			shell.args = config.terminal.integrated.shellArgs.osx;

diff --git a/src/vs/workbench/parts/terminal/test/terminalConfigHelper.test.ts b/src/vs/workbench/parts/terminal/test/terminalConfigHelper.test.ts
@@ -164,9 +164,6 @@ suite('Workbench - TerminalConfigHelper', () => {
 				integrated: {
 					shell: {
 						windows: 'foo'
-					},
-					shellArgs: {
-						windows: []
 					}
 				}
 			}