diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts index 54470f833f2..b6081f214ad 100644 --- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts @@ -286,7 +286,13 @@ registerTerminalAction({ id: MenuId.MenubarTerminalSuggestStatusMenu, group: 'left', order: 1, - when: ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'never') + when: ContextKeyExpr.and( + ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'never'), + ContextKeyExpr.or( + ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.QuickSuggestions}`, true), + ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SuggestOnTriggerCharacters}`, true), + ) + ) }, run: (c, accessor) => { accessor.get(IConfigurationService).updateValue(TerminalSuggestSettingId.SelectionMode, 'partial'); @@ -308,7 +314,13 @@ registerTerminalAction({ id: MenuId.MenubarTerminalSuggestStatusMenu, group: 'left', order: 1, - when: ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'partial') + when: ContextKeyExpr.and( + ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'partial'), + ContextKeyExpr.or( + ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.QuickSuggestions}`, true), + ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SuggestOnTriggerCharacters}`, true), + ) + ) }, run: (c, accessor) => { accessor.get(IConfigurationService).updateValue(TerminalSuggestSettingId.SelectionMode, 'always'); @@ -324,7 +336,13 @@ registerTerminalAction({ id: MenuId.MenubarTerminalSuggestStatusMenu, group: 'left', order: 1, - when: ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'always') + when: ContextKeyExpr.and( + ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'always'), + ContextKeyExpr.or( + ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.QuickSuggestions}`, true), + ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SuggestOnTriggerCharacters}`, true), + ) + ) }, run: (c, accessor) => { accessor.get(IConfigurationService).updateValue(TerminalSuggestSettingId.SelectionMode, 'never');