From 4f2c1959549661757c0c5577d7914d53bc58c176 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Mon, 17 Mar 2025 07:15:39 -0700 Subject: [PATCH] Remove boolean support for terminal quickSuggestions Fixes #240891 --- .../suggest/browser/terminalSuggestAddon.ts | 7 +++---- .../suggest/common/terminalSuggestConfiguration.ts | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts index 1fe3d048e72..61fafbb8000 100644 --- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts +++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts @@ -261,7 +261,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest this._requestedCompletionsIndex = this._currentPromptInputState.cursorIndex; const quickSuggestionsConfig = this._configurationService.getValue(terminalSuggestConfigSection).quickSuggestions; - const allowFallbackCompletions = explicitlyInvoked || quickSuggestionsConfig === true || typeof quickSuggestionsConfig === 'object' && quickSuggestionsConfig.unknown === 'on'; + const allowFallbackCompletions = explicitlyInvoked || quickSuggestionsConfig.unknown === 'on'; const providedCompletions = await this._terminalCompletionService.provideCompletions(this._currentPromptInputState.prefix, this._currentPromptInputState.cursorIndex, allowFallbackCompletions, this.shellType, this._capabilities, token, doNotRequestExtensionCompletions); if (token.isCancellationRequested) { @@ -413,9 +413,8 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest if (!this._terminalSuggestWidgetVisibleContextKey.get()) { const commandLineHasSpace = promptInputState.prefix.trim().match(/\s/); if ( - (typeof config.quickSuggestions === 'boolean' && config.quickSuggestions) || - (typeof config.quickSuggestions === 'object' && !commandLineHasSpace && config.quickSuggestions.commands !== 'off') || - (typeof config.quickSuggestions === 'object' && commandLineHasSpace && config.quickSuggestions.arguments !== 'off') + (!commandLineHasSpace && config.quickSuggestions.commands !== 'off') || + (commandLineHasSpace && config.quickSuggestions.arguments !== 'off') ) { if (promptInputState.prefix.match(/[^\s]$/)) { sent = this._requestTriggerCharQuickSuggestCompletions(); diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts index e4e4e73ca3f..f5cf2b9aac6 100644 --- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts +++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts @@ -44,7 +44,7 @@ export const terminalSuggestConfigSection = 'terminal.integrated.suggest'; export interface ITerminalSuggestConfiguration { enabled: boolean; - quickSuggestions: /*Legacy - was this when experimental*/boolean | { + quickSuggestions: { commands: 'off' | 'on'; arguments: 'off' | 'on'; unknown: 'off' | 'on';