Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get terminal re-use and task restart working

Browse Source
This commit is contained in:
Gabriel DeBacker
2019-01-19 08:00:36 -08:00
parent 50d49c8c36
commit 75f82ce09a
14 changed files with 189 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -534,6 +534,7 @@ export interface MainThreadTaskShape extends IDisposable {
$executeTask(task: TaskHandleDTO | TaskDTO): Promise<TaskExecutionDTO>;
$terminateTask(id: string): Promise<void>;
$registerTaskSystem(scheme: string, info: TaskSystemInfoDTO): void;
$extensionCallbackTaskComplete(id: string): Promise<void>;
}
export interface MainThreadExtensionServiceShape extends IDisposable {

21
src/vs/workbench/api/node/extHostTask.ts
View File

@@ -28,7 +28,7 @@ import {
import { ExtHostVariableResolverService } from 'vs/workbench/api/node/extHostDebugService';
import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
import { ExtHostTerminalService, ExtHostTerminal, ExtHostTerminalRenderer } from 'vs/workbench/api/node/extHostTerminalService';
import { ExtHostTerminalService, ExtHostTerminalRenderer } from 'vs/workbench/api/node/extHostTerminalService';
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -353,8 +353,8 @@ class ExtensionCallbackExecutionData implements IDisposable {
return this._onTaskExecutionComplete.event;
}
private onDidCloseTerminal(terminal: vscode.Terminal): void {
if (terminal instanceof ExtHostTerminal && terminal._id === this._terminalId) {
private onDidCloseTerminalRenderer(terminalRenderer: vscode.TerminalRenderer): void {
if (terminalRenderer instanceof ExtHostTerminalRenderer && terminalRenderer._id === this._terminalId) {
this._cancellationSource.cancel();
}
}
@@ -383,16 +383,14 @@ class ExtensionCallbackExecutionData implements IDisposable {
this._cancellationSource = new CancellationTokenSource();
this._disposables.push(this._cancellationSource);
this._disposables.push(this.terminalService.onDidCloseTerminal(this.onDidCloseTerminal.bind(this)));
this._disposables.push(this.terminalService.onDidCloseTerminalRenderer(this.onDidCloseTerminalRenderer.bind(this)));
// Regardless of how the task completes, we are done with this extension callback task execution.
return this.callbackData.callback(terminalRenderer, this._cancellationSource.token).then(
(success) => {
this._onTaskExecutionComplete.fire(this);
terminalRenderer.terminal.dispose();
}, (rejected) => {
this._onTaskExecutionComplete.fire(this);
terminalRenderer.terminal.dispose();
});
}
@@ -411,7 +409,7 @@ class ExtensionCallbackExecutionData implements IDisposable {
// ever changes, this code continues to function.
// Check to see if the extension host already knows about this terminal.
for (let terminal of this.terminalService.rendererTerminals) {
for (let terminal of this.terminalService.terminalRenderers) {
if (terminal._id === terminalId) {
this.onDidOpenRenderTerminal(terminal);
return;
@@ -420,7 +418,7 @@ class ExtensionCallbackExecutionData implements IDisposable {
// If we get here, then the terminal is unknown to the extension host. Let's wait
// for it to be created and the start our extension callback.
this._disposables.push(this.terminalService.onDidOpenRendererTerminal(this.onDidOpenRenderTerminal.bind(this)));
this._disposables.push(this.terminalService.onDidOpenTerminalRenderer(this.onDidOpenRenderTerminal.bind(this)));
}
}
@@ -539,7 +537,7 @@ export class ExtHostTask implements ExtHostTaskShape {
}
const taskExecutionComplete: IDisposable = extensionCallback.onTaskExecutionComplete(() => {
this.terminateExtensionCallbackExecution(execution);
this.extensionCallbackTaskComplete(execution);
taskExecutionComplete.dispose();
});
@@ -558,7 +556,7 @@ export class ExtHostTask implements ExtHostTaskShape {
public $OnDidEndTask(execution: TaskExecutionDTO): void {
const _execution = this.getTaskExecution(execution);
this._taskExecutions.delete(execution.id);
this.terminateExtensionCallbackExecution(execution);
this.extensionCallbackTaskComplete(execution);
this._onDidTerminateTask.fire({
execution: _execution
});
@@ -703,11 +701,12 @@ export class ExtHostTask implements ExtHostTaskShape {
return result;
}
private terminateExtensionCallbackExecution(execution: TaskExecutionDTO): void {
private extensionCallbackTaskComplete(execution: TaskExecutionDTO): void {
const extensionCallback: ExtensionCallbackExecutionData | undefined = this._activeExtensionCallbacks.get(execution.id);
if (extensionCallback) {
extensionCallback.dispose();
this._activeExtensionCallbacks.delete(execution.id);
this._proxy.$extensionCallbackTaskComplete(execution.id);
}
}
}

26
src/vs/workbench/api/node/extHostTerminalService.ts
View File

@@ -248,14 +248,16 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
public get activeTerminal(): ExtHostTerminal { return this._activeTerminal; }
public get terminals(): ExtHostTerminal[] { return this._terminals; }
public get rendererTerminals(): ExtHostTerminalRenderer[] { return this._terminalRenderers; }
public get terminalRenderers(): ExtHostTerminalRenderer[] { return this._terminalRenderers; }
private readonly _onDidCloseTerminal: Emitter<vscode.Terminal> = new Emitter<vscode.Terminal>();
public get onDidCloseTerminal(): Event<vscode.Terminal> { return this._onDidCloseTerminal && this._onDidCloseTerminal.event; }
private readonly _onDidCloseTerminalRenderer: Emitter<vscode.TerminalRenderer> = new Emitter<vscode.TerminalRenderer>();
public get onDidCloseTerminalRenderer(): Event<vscode.TerminalRenderer> { return this._onDidCloseTerminalRenderer && this._onDidCloseTerminalRenderer.event; }
private readonly _onDidOpenTerminal: Emitter<vscode.Terminal> = new Emitter<vscode.Terminal>();
public get onDidOpenTerminal(): Event<vscode.Terminal> { return this._onDidOpenTerminal && this._onDidOpenTerminal.event; }
private readonly _onDidOpenRendererTerminal: Emitter<vscode.TerminalRenderer> = new Emitter<vscode.TerminalRenderer>();
public get onDidOpenRendererTerminal(): Event<vscode.TerminalRenderer> { return this._onDidOpenRendererTerminal && this._onDidOpenRendererTerminal.event; }
private readonly _onDidOpenTerminalRenderer: Emitter<vscode.TerminalRenderer> = new Emitter<vscode.TerminalRenderer>();
public get onDidOpenTerminalRenderer(): Event<vscode.TerminalRenderer> { return this._onDidOpenTerminalRenderer && this._onDidOpenTerminalRenderer.event; }
private readonly _onDidChangeActiveTerminal: Emitter<vscode.Terminal | undefined> = new Emitter<vscode.Terminal | undefined>();
public get onDidChangeActiveTerminal(): Event<vscode.Terminal | undefined> { return this._onDidChangeActiveTerminal && this._onDidChangeActiveTerminal.event; }
@@ -341,11 +343,15 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
public $acceptTerminalClosed(id: number): void {
const index = this._getTerminalObjectIndexById(this.terminals, id);
if (index === null) {
return;
if (index !== null) {
const terminal = this._terminals.splice(index, 1)[0];
this._onDidCloseTerminal.fire(terminal);
}
const renderer = this._getTerminalRendererById(id);
if (renderer) {
this._onDidCloseTerminalRenderer.fire(renderer);
}
const terminal = this._terminals.splice(index, 1)[0];
this._onDidCloseTerminal.fire(terminal);
}
public $acceptTerminalOpened(id: number, name: string, isRendererOnly: boolean): void {
@@ -363,7 +369,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
let renderer = this._getTerminalRendererById(id);
if (renderer) {
// The terminal has already been created (via createTerminal*), only fire the event
this._onDidOpenRendererTerminal.fire(renderer);
this._onDidOpenTerminalRenderer.fire(renderer);
}
if (renderer || index) {
@@ -378,8 +384,8 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
if (isRendererOnly) {
renderer = new ExtHostTerminalRenderer(this._proxy, name, terminal, id);
this.rendererTerminals.push(renderer);
this._onDidOpenRendererTerminal.fire(renderer);
this.terminalRenderers.push(renderer);
this._onDidOpenTerminalRenderer.fire(renderer);
}
}