Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

This commit is contained in:
Anthony Dresser
2019-09-24 21:36:17 -07:00
committed by GitHub
parent a29ae4d3b9
commit 6a6048d40f
541 changed files with 7045 additions and 7287 deletions

View File

@@ -82,7 +82,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
}
});
const exectuableVerification = stat(shellLaunchConfig.executable!).then(async stat => {
const executableVerification = stat(shellLaunchConfig.executable!).then(async stat => {
if (!stat.isFile() && !stat.isSymbolicLink()) {
return Promise.reject(stat.isDirectory() ? SHELL_PATH_DIRECTORY_EXIT_CODE : SHELL_PATH_INVALID_EXIT_CODE);
}
@@ -98,7 +98,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
}
});
Promise.all([cwdVerification, exectuableVerification]).then(() => {
Promise.all([cwdVerification, executableVerification]).then(() => {
this.setupPtyProcess(shellLaunchConfig, options);
}).catch((exitCode: number) => {
return this._launchFailed(exitCode);