Only light up .shellIntegration API if it has rich command detection

Part of microsoft#242897

Author: Tyriar

src/vs/platform/extensions/common/extensionsApiProposals.ts

@@ -361,9 +361,6 @@ const _allApiProposals = {
 	terminalShellEnv: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts',
 	},
-	terminalShellIntegrationRich: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.d.ts',
-	},
 	terminalShellType: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellType.d.ts',
 	},

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

@@ -36,32 +36,20 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 		// onDidChangeTerminalShellIntegration initial state
 		for (const terminal of this._terminalService.instances) {
 			const cmdDetection = terminal.capabilities.get(TerminalCapability.CommandDetection);
-			if (cmdDetection) {
+			if (cmdDetection?.hasRichCommandDetection) {
 				this._proxy.$shellIntegrationChange(terminal.instanceId);
-				this._proxy.$setHasRichCommandDetection(terminal.instanceId, !!cmdDetection?.hasRichCommandDetection);
 			}
 			const cwdDetection = terminal.capabilities.get(TerminalCapability.CwdDetection);
 			if (cwdDetection) {
 				this._proxy.$cwdChange(terminal.instanceId, this._convertCwdToUri(cwdDetection.getCwd()));
 			}
 		}
 
-		// onDidChangeTerminalShellIntegration via command detection
-		const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
-			return Event.map(
-				Event.filter(instance.capabilities.onDidAddCapabilityType, e => {
-					return (e === TerminalCapability.CwdDetection || e === TerminalCapability.CommandDetection);
-				}),
-				() => instance
-			);
-		})).event;
-		this._store.add(onDidAddCommandDetection(e => this._proxy.$shellIntegrationChange(e.instanceId)));
-
 		// onDidChangeTerminalShellIntegration via rich command detection
 		const onDidSetRichCommandDetection = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onSetRichCommandDetection));
-		onDidSetRichCommandDetection.event(e => {
-			this._proxy.$setHasRichCommandDetection(e.instance.instanceId, e.data);
-		});
+		this._store.add(onDidSetRichCommandDetection.event(e => {
+			this._proxy.$shellIntegrationChange(e.instance.instanceId);
+		}));
 
 		// onDidChangeTerminalShellIntegration via cwd
 		const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CwdDetection, e => e.onDidChangeCwd));

src/vs/workbench/api/common/extHost.protocol.ts

@@ -2525,7 +2525,6 @@ export interface ExtHostTerminalShellIntegrationShape {
 	$shellExecutionData(instanceId: number, data: string): void;
 	$shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[], isTrusted: boolean): void;
 	$cwdChange(instanceId: number, cwd: UriComponents | undefined): void;
-	$setHasRichCommandDetection(instanceId: number, value: boolean): void;
 	$closeTerminal(instanceId: number): void;
 }
 

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

@@ -143,10 +143,6 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 		this._activeShellIntegrations.get(instanceId)?.dispose();
 		this._activeShellIntegrations.delete(instanceId);
 	}
-
-	public $setHasRichCommandDetection(instanceId: number, value: boolean): void {
-		this._activeShellIntegrations.get(instanceId)?.setHasRichCommandDetection(value);
-	}
 }
 
 interface IExecutionProperties {
@@ -165,7 +161,6 @@ export class InternalTerminalShellIntegration extends Disposable {
 
 	private _env: vscode.TerminalShellIntegrationEnvironment | undefined;
 	private _cwd: URI | undefined;
-	private _hasRichCommandDetection: boolean = false;
 
 	readonly store: DisposableStore = this._register(new DisposableStore());
 
@@ -200,9 +195,6 @@ export class InternalTerminalShellIntegration extends Disposable {
 					value: Object.freeze({ ...that._env.value })
 				});
 			},
-			get hasRichCommandDetection(): boolean {
-				return that._hasRichCommandDetection;
-			},
 			// executeCommand(commandLine: string): vscode.TerminalShellExecution;
 			// executeCommand(executable: string, args: string[]): vscode.TerminalShellExecution;
 			executeCommand(commandLineOrExecutable: string, args?: string[]): vscode.TerminalShellExecution {
@@ -264,9 +256,6 @@ export class InternalTerminalShellIntegration extends Disposable {
 					return;
 				}
 			}
-			if (this._hasRichCommandDetection) {
-				console.warn('Rich command detection is enabled but an execution started before the last ended');
-			}
 			this._currentExecution.endExecution(undefined);
 			this._currentExecution.flush();
 			this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
@@ -345,13 +334,6 @@ export class InternalTerminalShellIntegration extends Disposable {
 		}
 	}
 
-	setHasRichCommandDetection(value: boolean): void {
-		if (this._hasRichCommandDetection !== value) {
-			this._hasRichCommandDetection = value;
-			this._fireChangeEvent();
-		}
-	}
-
 	setEnv(keys: string[], values: string[], isTrusted: boolean): void {
 		const env: { [key: string]: string | undefined } = {};
 		for (let i = 0; i < keys.length; i++) {