Skip to content

Commit

Permalink
Re-enable integrated term windows shell args
Browse files Browse the repository at this point in the history
Fixes #8429
  • Loading branch information
Tyriar committed Oct 12, 2016
1 parent 74d0241 commit 52690ed
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@ 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'
Expand Down
3 changes: 2 additions & 1 deletion src/vs/workbench/parts/terminal/electron-browser/terminal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ export interface ITerminalConfiguration {
},
shellArgs: {
linux: string[],
osx: string[]
osx: string[],
windows: string[]
},
cursorBlinking: boolean,
fontFamily: string,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ 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;
Expand Down

0 comments on commit 52690ed

Please sign in to comment.