Merge pull request microsoft#187787 from jeanp413/fix-terminal-find-action-shorcut

Fix missing terminal find widget shorcuts in tooltip

Author: Tyriar

src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts

@@ -18,7 +18,6 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { ContextScopedFindInput } from 'vs/platform/history/browser/contextScopedHistoryWidget';
 import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
 import * as strings from 'vs/base/common/strings';
-import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { showHistoryKeybindingHint } from 'vs/platform/history/browser/historyWidgetKeybindingHint';
 import { status } from 'vs/base/browser/ui/aria/aria';
@@ -34,9 +33,12 @@ interface IFindOptions {
 	showCommonFindToggles?: boolean;
 	checkImeCompletionState?: boolean;
 	showResultCount?: boolean;
-	appendCaseSensitiveLabel?: string;
-	appendRegexLabel?: string;
-	appendWholeWordsLabel?: string;
+	appendCaseSensitiveActionId?: string;
+	appendRegexActionId?: string;
+	appendWholeWordsActionId?: string;
+	previousMatchActionId?: string;
+	nextMatchActionId?: string;
+	closeWidgetActionId?: string;
 	matchesLimit?: number;
 	type?: 'Terminal' | 'Webview';
 }
@@ -89,9 +91,9 @@ export abstract class SimpleFindWidget extends Widget {
 				}
 			},
 			showCommonFindToggles: options.showCommonFindToggles,
-			appendCaseSensitiveLabel: options.appendCaseSensitiveLabel && options.type === 'Terminal' ? this._getKeybinding(TerminalCommandId.ToggleFindCaseSensitive) : undefined,
-			appendRegexLabel: options.appendRegexLabel && options.type === 'Terminal' ? this._getKeybinding(TerminalCommandId.ToggleFindRegex) : undefined,
-			appendWholeWordsLabel: options.appendWholeWordsLabel && options.type === 'Terminal' ? this._getKeybinding(TerminalCommandId.ToggleFindWholeWord) : undefined,
+			appendCaseSensitiveLabel: options.appendCaseSensitiveActionId ? this._getKeybinding(options.appendCaseSensitiveActionId) : undefined,
+			appendRegexLabel: options.appendRegexActionId ? this._getKeybinding(options.appendRegexActionId) : undefined,
+			appendWholeWordsLabel: options.appendWholeWordsActionId ? this._getKeybinding(options.appendWholeWordsActionId) : undefined,
 			showHistoryHint: () => showHistoryKeybindingHint(_keybindingService),
 			inputBoxStyles: defaultInputBoxStyles,
 			toggleStyles: defaultToggleStyles
@@ -131,23 +133,23 @@ export abstract class SimpleFindWidget extends Widget {
 		}));
 
 		this.prevBtn = this._register(new SimpleButton({
-			label: NLS_PREVIOUS_MATCH_BTN_LABEL,
+			label: NLS_PREVIOUS_MATCH_BTN_LABEL + (options.previousMatchActionId ? this._getKeybinding(options.previousMatchActionId) : ''),
 			icon: findPreviousMatchIcon,
 			onTrigger: () => {
 				this.find(true);
 			}
 		}));
 
 		this.nextBtn = this._register(new SimpleButton({
-			label: NLS_NEXT_MATCH_BTN_LABEL,
+			label: NLS_NEXT_MATCH_BTN_LABEL + (options.nextMatchActionId ? this._getKeybinding(options.nextMatchActionId) : ''),
 			icon: findNextMatchIcon,
 			onTrigger: () => {
 				this.find(false);
 			}
 		}));
 
 		const closeBtn = this._register(new SimpleButton({
-			label: NLS_CLOSE_BTN_LABEL,
+			label: NLS_CLOSE_BTN_LABEL + (options.closeWidgetActionId ? this._getKeybinding(options.closeWidgetActionId) : ''),
 			icon: widgetClose,
 			onTrigger: () => {
 				this.hide();

src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts

@@ -13,6 +13,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { Event } from 'vs/base/common/event';
 import type { ISearchOptions } from 'xterm-addon-search';
+import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
 
 export class TerminalFindWidget extends SimpleFindWidget {
 	private _findInputFocused: IContextKey<boolean>;
@@ -27,7 +28,19 @@ export class TerminalFindWidget extends SimpleFindWidget {
 		@IThemeService private readonly _themeService: IThemeService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
-		super({ showCommonFindToggles: true, checkImeCompletionState: true, showResultCount: true, type: 'Terminal', matchesLimit: XtermTerminalConstants.SearchHighlightLimit }, _contextViewService, _contextKeyService, keybindingService);
+		super({
+			showCommonFindToggles: true,
+			checkImeCompletionState: true,
+			showResultCount: true,
+			appendCaseSensitiveActionId: TerminalCommandId.ToggleFindCaseSensitive,
+			appendRegexActionId: TerminalCommandId.ToggleFindRegex,
+			appendWholeWordsActionId: TerminalCommandId.ToggleFindWholeWord,
+			previousMatchActionId: TerminalCommandId.FindPrevious,
+			nextMatchActionId: TerminalCommandId.FindNext,
+			closeWidgetActionId: TerminalCommandId.FindHide,
+			type: 'Terminal',
+			matchesLimit: XtermTerminalConstants.SearchHighlightLimit
+		}, _contextViewService, _contextKeyService, keybindingService);
 
 		this._register(this.state.onFindReplaceStateChange(() => {
 			this.show();