diff --git a/src/vs/editor/contrib/find/simpleFindWidget.ts b/src/vs/editor/contrib/find/simpleFindWidget.ts index 02b522158d61a46d440c4a877ea5cba7ca8fb4a3..e37233661570a90a233a27a4ae216c95cf72c725 100644 --- a/src/vs/editor/contrib/find/simpleFindWidget.ts +++ b/src/vs/editor/contrib/find/simpleFindWidget.ts @@ -36,18 +36,16 @@ export abstract class SimpleFindWidget extends Widget { private prevBtn: SimpleButton; private nextBtn: SimpleButton; private foundMatch: boolean; - private readonly _invertDefaultDirection: boolean | undefined; constructor( @IContextViewService private readonly _contextViewService: IContextViewService, @IContextKeyService contextKeyService: IContextKeyService, private readonly _state: FindReplaceState = new FindReplaceState(), showOptionButtons?: boolean, - invertDefaultDirection?: boolean + private readonly _invertDefaultDirection: boolean = false ) { super(); - this._invertDefaultDirection = invertDefaultDirection; this._findInput = this._register(new ContextScopedFindInput(null, this._contextViewService, { label: NLS_FIND_INPUT_LABEL, placeholder: NLS_FIND_INPUT_PLACEHOLDER, @@ -96,14 +94,13 @@ export abstract class SimpleFindWidget extends Widget { this._register(this._findInput.onKeyDown((e) => { if (e.equals(KeyCode.Enter)) { - // Flip the direction search goes in the terminal case so it matches other terminals - this.find(this._invertDefaultDirection ? true : false); + this.find(this._invertDefaultDirection); e.preventDefault(); return; } if (e.equals(KeyMod.Shift | KeyCode.Enter)) { - this.find(this._invertDefaultDirection ? false : true); + this.find(!this._invertDefaultDirection); e.preventDefault(); return; } diff --git a/src/vs/workbench/contrib/terminal/browser/terminalFindWidget.ts b/src/vs/workbench/contrib/terminal/browser/terminalFindWidget.ts index f8035e70b4fcee1ad94def4a2f2b802d5266516e..1ab97705568a9d1fd84467c03d3dfd4036622263 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalFindWidget.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalFindWidget.ts @@ -8,6 +8,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_FOCUSED } from 'vs/workbench/contrib/terminal/common/terminal'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { FindReplaceState } from 'vs/editor/contrib/find/findState'; + export class TerminalFindWidget extends SimpleFindWidget { protected _findInputFocused: IContextKey; protected _findWidgetFocused: IContextKey;