add a setting to determine which terminal suggest providers are activ…

…ated (#237826)

src/vs/workbench/contrib/terminalContrib/suggest/browser/pwshCompletionProviderAddon.ts

@@ -56,7 +56,7 @@ export class PwshCompletionProviderAddon extends Disposable implements ITerminal
 	id: string = PwshCompletionProviderAddon.ID;
 	triggerCharacters?: string[] | undefined;
 	isBuiltin?: boolean = true;
-	static readonly ID = 'terminal.pwshCompletionProvider';
+	static readonly ID = 'pwsh-shell-integration';
 	static cachedPwshCommands: Set<ITerminalCompletion>;
 	readonly shellTypes = [GeneralShellType.PowerShell];
 	private _codeCompletionsRequested: boolean = false;
@@ -348,7 +348,7 @@ function rawCompletionToITerminalCompletion(rawCompletion: PwshCompletion, repla
 
 	return {
 		label,
-		provider: 'pwsh-script',
+		provider: PwshCompletionProviderAddon.ID,
 		icon,
 		detail,
 		isFile: rawCompletion.ResultType === 3,

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

@@ -112,7 +112,7 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 			this._ctx.instance.focus();
 			this._ctx.instance.sendText(text, false);
 		}));
-		this.add(this._terminalCompletionService.registerTerminalCompletionProvider('builtinPwsh', 'pwsh', pwshCompletionProviderAddon));
+		this.add(this._terminalCompletionService.registerTerminalCompletionProvider('builtinPwsh', pwshCompletionProviderAddon.id, pwshCompletionProviderAddon));
 		// If completions are requested, pause and queue input events until completions are
 		// received. This fixing some problems in PowerShell, particularly enter not executing
 		// when typing quickly and some characters being printed twice. On Windows this isn't
@@ -178,6 +178,11 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 			return;
 		}
 		addon.shellType = this._ctx.instance.shellType;
+		if (!this._ctx.instance.xterm?.raw) {
+			return;
+		}
+		// Relies on shell type being set
+		this._loadPwshCompletionAddon(this._ctx.instance.xterm.raw);
 	}
 }
 

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts

@@ -12,7 +12,7 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 import { TerminalShellType } from '../../../../../platform/terminal/common/terminal.js';
 import { ISimpleCompletion } from '../../../../services/suggest/browser/simpleCompletionItem.js';
-import { ITerminalSuggestConfiguration, terminalSuggestConfigSection } from '../common/terminalSuggestConfiguration.js';
+import { ITerminalSuggestConfiguration, terminalSuggestConfigSection, TerminalSuggestSettingId } from '../common/terminalSuggestConfiguration.js';
 
 export const ITerminalCompletionService = createDecorator<ITerminalCompletionService>('terminalCompletionService');
 
@@ -149,6 +149,17 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 
 		if (!extensionCompletionsEnabled || skipExtensionCompletions) {
 			providers = providers.filter(p => p.isBuiltin);
+			return this._collectCompletions(providers, shellType, promptValue, cursorPosition, token);
+		}
+
+		const providerConfig: { [key: string]: boolean } = this._configurationService.getValue(TerminalSuggestSettingId.Providers);
+		providers = providers.filter(p => {
+			const providerId = p.id;
+			return providerId && providerId in providerConfig && providerConfig[providerId];
+		});
+
+		if (!providers.length) {
+			return;
 		}
 
 		return this._collectCompletions(providers, shellType, promptValue, cursorPosition, token);
@@ -164,7 +175,12 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 				return undefined;
 			}
 			const completionItems = Array.isArray(completions) ? completions : completions.items ?? [];
-
+			if (provider.isBuiltin) {
+				//TODO: why is this needed?
+				for (const item of completionItems) {
+					item.provider = provider.id;
+				}
+			}
 			if (Array.isArray(completions)) {
 				return completionItems;
 			}

src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts

@@ -15,6 +15,7 @@ export const enum TerminalSuggestSettingId {
 	RunOnEnter = 'terminal.integrated.suggest.runOnEnter',
 	BuiltinCompletions = 'terminal.integrated.suggest.builtinCompletions',
 	EnableExtensionCompletions = 'terminal.integrated.suggest.enableExtensionCompletions',
+	Providers = 'terminal.integrated.suggest.providers',
 }
 
 export const terminalSuggestConfigSection = 'terminal.integrated.suggest';
@@ -28,6 +29,10 @@ export interface ITerminalSuggestConfiguration {
 		'pwshCode': boolean;
 		'pwshGit': boolean;
 	};
+	providers: {
+		'terminal-suggest': boolean;
+		'pwsh-shell-integration': boolean;
+	};
 	enableExtensionCompletions: boolean;
 }
 
@@ -39,6 +44,17 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
 		default: false,
 		tags: ['experimental'],
 	},
+	[TerminalSuggestSettingId.Providers]: {
+		restricted: true,
+		markdownDescription: localize('suggest.providers', "Controls which providers are enabled for terminal suggestions.  Also be aware of the {0}-setting which controls if extensions are able to provide suggestions.", `\`#${TerminalSuggestSettingId.EnableExtensionCompletions}#\``),
+		type: 'object',
+		properties: {},
+		default: {
+			'terminal-suggest': true,
+			'pwsh-shell-integration': false,
+		},
+		tags: ['experimental'],
+	},
 	[TerminalSuggestSettingId.QuickSuggestions]: {
 		restricted: true,
 		markdownDescription: localize('suggest.quickSuggestions', "Controls whether suggestions should automatically show up while typing. Also be aware of the {0}-setting which controls if suggestions are triggered by special characters.", `\`#${TerminalSuggestSettingId.SuggestOnTriggerCharacters}#\``),
@@ -85,7 +101,7 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
 	},
 	[TerminalSuggestSettingId.EnableExtensionCompletions]: {
 		restricted: true,
-		markdownDescription: localize('suggest.enableExtensionCompletions', "Controls whether extension completions are enabled."),
+		markdownDescription: localize('suggest.enableExtensionCompletions', "Controls whether extension completions are enabled. Also be aware of the {0}-setting which controls which providers are enabled.", `\`#${TerminalSuggestSettingId.Providers}#\``),
 		type: 'boolean',
 		default: false,
 		tags: ['experimental'],

src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts

@@ -110,6 +110,10 @@ suite('Terminal Contrib Suggest Recordings', () => {
 						pwshCode: true,
 						pwshGit: true
 					},
+					providers: {
+						'terminal-suggest': true,
+						'pwsh-shell-integration': true,
+					},
 					enableExtensionCompletions: false
 				} satisfies ITerminalSuggestConfiguration
 			}