ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 17:20:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 1b314ab317fbff7d799b21754326b7d849889ceb

Browse Source
This commit is contained in:
ADS Merger
2020-07-15 23:51:18 +00:00
parent aae013d498
commit 9d3f12d0b7
554 changed files with 15159 additions and 8223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vs/workbench/contrib/terminal/node/terminalProcess.ts
View File

@@ -111,7 +111,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
try {
const result = await stat(slc.executable);
if (!result.isFile() && !result.isSymbolicLink()) {
return { message: localize('launchFail.executableIsNotFileOrSymlink', "Shell path \"{0}\" is not a file of a symlink", slc.executable) };
return { message: localize('launchFail.executableIsNotFileOrSymlink', "Path to shell executable \"{0}\" is not a file of a symlink", slc.executable) };
}
} catch (err) {
if (err?.code === 'ENOENT') {
@@ -120,7 +120,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
const envPaths: string[] | undefined = (slc.env && slc.env.PATH) ? slc.env.PATH.split(path.delimiter) : undefined;
const executable = await findExecutable(slc.executable!, cwd, envPaths);
if (!executable) {
return { message: localize('launchFail.executableDoesNotExist', "Shell path \"{0}\" does not exist", slc.executable) };
return { message: localize('launchFail.executableDoesNotExist', "Path to shell executable \"{0}\" does not exist", slc.executable) };
}
}
}
@@ -253,7 +253,8 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
this._ptyProcess.resize(cols, rows);
} catch (e) {
// Swallow error if the pty has already exited
if (this._exitCode !== undefined) {
this._logService.trace('IPty#resize exception ' + e.message);
if (this._exitCode !== undefined && e.message !== 'ioctl(2) failed, EBADF') {
throw e;
}
}