fix terminal disposable leaks, get dropdown menu to show for terminal editors

src/vs/workbench/contrib/terminal/browser/terminalService.ts

@@ -846,7 +846,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 			instance.onDidFocus(this._onDidChangeActiveInstance.fire, this._onDidChangeActiveInstance),
 			instance.onRequestAddInstanceToGroup(async e => await this._addInstanceToGroup(instance, e))
 		];
-		instance.onDisposed(() => dispose(instanceDisposables));
+		this._register(instance.onDisposed(() => dispose(instanceDisposables)));
 	}
 
 	private async _addInstanceToGroup(instance: ITerminalInstance, e: IRequestAddInstanceToGroupEvent): Promise<void> {
@@ -1002,7 +1002,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 			const instance = this._terminalInstanceService.createInstance(shellLaunchConfig, TerminalLocation.Panel);
 			this._backgroundedTerminalInstances.push(instance);
 			this._backgroundedTerminalDisposables.set(instance.instanceId, [
-				instance.onDisposed(this._onDidDisposeInstance.fire, this._onDidDisposeInstance)
+				this._register(instance.onDisposed(this._onDidDisposeInstance.fire, this._onDidDisposeInstance))
 			]);
 			this._terminalHasBeenCreated.set(true);
 			return instance;

src/vs/workbench/contrib/terminal/browser/terminalView.ts

@@ -127,11 +127,11 @@ export class TerminalViewPane extends ViewPane {
 			}
 		}));
 		this._register(this._terminalService.onDidCreateInstance((i) => {
-			i.capabilities.onDidAddCapabilityType(c => {
+			this._register(i.capabilities.onDidAddCapabilityType(c => {
 				if (c === TerminalCapability.CommandDetection && this._gutterDecorationsEnabled()) {
 					this._parentDomElement?.classList.add('shell-integration');
 				}
-			});
+			}));
 		}));
 	}
 

src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts

@@ -308,11 +308,11 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			updateProgress();
 			const commandDetection = this._capabilities.get(TerminalCapability.CommandDetection);
 			if (commandDetection) {
-				commandDetection.onCommandFinished(() => progressAddon.progress = { state: 0, value: 0 });
+				this._register(commandDetection.onCommandFinished(() => progressAddon.progress = { state: 0, value: 0 }));
 			} else {
 				const disposable = this._capabilities.onDidAddCapability(e => {
 					if (e.id === TerminalCapability.CommandDetection) {
-						(e.capability as CommandDetectionCapability).onCommandFinished(() => progressAddon.progress = { state: 0, value: 0 });
+						this._register((e.capability as CommandDetectionCapability).onCommandFinished(() => progressAddon.progress = { state: 0, value: 0 }));
 						this._store.delete(disposable);
 					}
 				});

src/vs/workbench/contrib/terminalContrib/history/browser/terminal.history.contribution.ts

@@ -45,17 +45,25 @@ class TerminalHistoryContribution extends Disposable implements ITerminalContrib
 		this._register(_ctx.instance.capabilities.onDidAddCapabilityType(e => {
 			switch (e) {
 				case TerminalCapability.CwdDetection: {
-					_ctx.instance.capabilities.get(TerminalCapability.CwdDetection)?.onDidChangeCwd(e => {
+					const cwdDetection = _ctx.instance.capabilities.get(TerminalCapability.CwdDetection);
+					if (!cwdDetection) {
+						return;
+					}
+					this._register(cwdDetection.onDidChangeCwd(e => {
 						this._instantiationService.invokeFunction(getDirectoryHistory)?.add(e, { remoteAuthority: _ctx.instance.remoteAuthority });
-					});
+					}));
 					break;
 				}
 				case TerminalCapability.CommandDetection: {
-					_ctx.instance.capabilities.get(TerminalCapability.CommandDetection)?.onCommandFinished(e => {
+					const commandDetection = _ctx.instance.capabilities.get(TerminalCapability.CommandDetection);
+					if (!commandDetection) {
+						return;
+					}
+					this._register(commandDetection.onCommandFinished(e => {
 						if (e.command.trim().length > 0) {
 							this._instantiationService.invokeFunction(getCommandHistory)?.add(e.command, { shellType: _ctx.instance.shellType });
 						}
-					});
+					}));
 					break;
 				}
 			}