ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-30 16:50:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts
View File

@@ -297,7 +297,7 @@ export class TerminalConfigHelper implements IBrowserTerminalConfigHelper {
],
{
sticky: true,
neverShowAgain: { id: 'terminalConfigHelper/launchRecommendationsIgnore', scope: NeverShowAgainScope.WORKSPACE },
neverShowAgain: { id: 'terminalConfigHelper/launchRecommendationsIgnore', scope: NeverShowAgainScope.GLOBAL },
onCancel: () => {
/* __GDPR__
"terminalLaunchRecommendation:popup" : {

2
src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts
View File

@@ -22,8 +22,6 @@ export class TerminalInstanceService implements ITerminalInstanceService {
private readonly _onRequestDefaultShellAndArgs = new Emitter<IDefaultShellAndArgsRequest>();
public get onRequestDefaultShellAndArgs(): Event<IDefaultShellAndArgsRequest> { return this._onRequestDefaultShellAndArgs.event; }
constructor() { }
public async getXtermConstructor(): Promise<typeof XTermTerminal> {
if (!Terminal) {
Terminal = (await import('xterm')).Terminal;

2
src/vs/workbench/contrib/terminal/browser/terminalLinkHandler.ts
View File

@@ -238,7 +238,7 @@ export class TerminalLinkHandler {
private _handleHypertextLink(url: string): void {
const uri = URI.parse(url);
this._openerService.open(uri);
this._openerService.open(uri, { allowTunneling: !!(this._processManager && this._processManager.remoteAuthority) });
}
private _isLinkActivationModifierDown(event: MouseEvent): boolean {

2
src/vs/workbench/contrib/terminal/browser/terminalNativeService.ts
View File

@@ -18,8 +18,6 @@ export class TerminalNativeService implements ITerminalNativeService {
private readonly _onOsResume = new Emitter<void>();
public get onOsResume(): Event<void> { return this._onOsResume.event; }
constructor() { }
public whenFileDeleted(): Promise<void> {
throw new Error('Not implemented');
}

4
src/vs/workbench/contrib/terminal/node/terminalProcess.ts
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);