Clean up

Author: Tyriar

src/vs/workbench/api/browser/mainThreadTerminalService.ts

@@ -84,11 +84,6 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		this._store.add(_terminalService.onAnyInstanceTitleChange(instance => instance && this._onTitleChanged(instance.instanceId, instance.title)));
 		this._store.add(_terminalService.onAnyInstanceDataInput(instance => this._proxy.$acceptTerminalInteraction(instance.instanceId)));
 		this._store.add(_terminalService.onAnyInstanceSelectionChange(instance => this._proxy.$acceptTerminalSelection(instance.instanceId, instance.selection)));
-		// _terminalService.onDidChangeInstanceCapability(e => this._proxy.$acceptShellIntegration
-		// const onDidAddCommandDetection = _terminalService.createOnInstanceEvent(instance => Event.map(Event.filter(instance.capabilities.onDidAddCapabilityType, e => e === TerminalCapability.CommandDetection, this._store), () => instance));
-		// this._store.add(onDidAddCommandDetection(e => this._proxy.$acceptDidChangeShellIntegration(e.instanceId)));
-		// const commandDetectionStartedEvent = this._store.add(_terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onCommandStarted));
-		// commandDetectionStartedEvent.event(e => this._proxy.$acceptTerminalShellExecutionStarted(e.instance.instanceId)); // TODO: Fill in
 
 		// Set initial ext host state
 		for (const instance of this._terminalService.instances) {

src/vs/workbench/api/common/extHostTerminalService.ts

@@ -93,7 +93,7 @@ export class ExtHostTerminal extends Disposable {
 
 	readonly value: vscode.Terminal;
 
-	protected readonly _onWillDispose = new Emitter<void>();
+	protected readonly _onWillDispose = this._register(new Emitter<void>());
 	readonly onWillDispose = this._onWillDispose.event;
 
 	constructor(

src/vs/workbench/api/common/extHostTerminalShellIntegration.ts

@@ -93,8 +93,6 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 			shellIntegration.store.add(shellIntegration.onDidRequestShellExecution(commandLine => this._proxy.$executeCommand(instanceId, commandLine)));
 			shellIntegration.store.add(shellIntegration.onDidRequestEndExecution(e => this._onDidEndTerminalShellExecution.fire(e.value)));
 			shellIntegration.store.add(shellIntegration.onDidRequestChangeShellIntegration(e => this._onDidChangeTerminalShellIntegration.fire(e)));
-
-			// TODO: Can this be protected by a proposed API check?
 			terminal.shellIntegration = shellIntegration.value;
 		}
 		this._onDidChangeTerminalShellIntegration.fire({