提交 5dd716ea 编写于 作者: B Benjamin Pasero

fix tests

上级 d402f9b0
...@@ -158,15 +158,18 @@ export class TerminalConfigHelper { ...@@ -158,15 +158,18 @@ export class TerminalConfigHelper {
executable: '', executable: '',
args: [] args: []
}; };
if (this._platform === Platform.Windows) { const integrated = config && config.terminal && config.terminal.integrated;
shell.executable = config.terminal.integrated.shell.windows; if (integrated && integrated.shell && integrated.shellArgs) {
shell.args = config.terminal.integrated.shellArgs.windows; if (this._platform === Platform.Windows) {
} else if (this._platform === Platform.Mac) { shell.executable = integrated.shell.windows;
shell.executable = config.terminal.integrated.shell.osx; shell.args = integrated.shellArgs.windows;
shell.args = config.terminal.integrated.shellArgs.osx; } else if (this._platform === Platform.Mac) {
} else if (this._platform === Platform.Linux) { shell.executable = integrated.shell.osx;
shell.executable = config.terminal.integrated.shell.linux; shell.args = integrated.shellArgs.osx;
shell.args = config.terminal.integrated.shellArgs.linux; } else if (this._platform === Platform.Linux) {
shell.executable = integrated.shell.linux;
shell.args = integrated.shellArgs.linux;
}
} }
return shell; return shell;
} }
......
...@@ -210,6 +210,9 @@ suite('Workbench - TerminalConfigHelper', () => { ...@@ -210,6 +210,9 @@ suite('Workbench - TerminalConfigHelper', () => {
integrated: { integrated: {
shell: { shell: {
windows: 'foo' windows: 'foo'
},
shellArgs: {
windows: []
} }
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册