Skip to content

Commit

Permalink
don't unset the terminal focus key after setting it
Browse files Browse the repository at this point in the history
  • Loading branch information
meganrogge committed Aug 29, 2022
1 parent 44261c9 commit 030cf22
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/vs/workbench/contrib/terminal/browser/terminalFindWidget.ts
Expand Up @@ -7,7 +7,7 @@ import { SimpleFindWidget } from 'vs/workbench/contrib/codeEditor/browser/find/s
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
import { FindReplaceState } from 'vs/editor/contrib/find/browser/findState';
import { ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
import { ITerminalInstance, ITerminalService, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
Expand All @@ -27,7 +27,8 @@ export class TerminalFindWidget extends SimpleFindWidget {
@IKeybindingService keybindingService: IKeybindingService,
@IContextKeyService private readonly _contextKeyService: IContextKeyService,
@IThemeService private readonly _themeService: IThemeService,
@IConfigurationService private readonly _configurationService: IConfigurationService
@IConfigurationService private readonly _configurationService: IConfigurationService,
@ITerminalService private readonly _terminalService: ITerminalService
) {
super(findState, { showOptionButtons: true, showResultCount: true, type: 'Terminal' }, _contextViewService, _contextKeyService, keybindingService);

Expand Down Expand Up @@ -112,6 +113,9 @@ export class TerminalFindWidget extends SimpleFindWidget {
}

protected _onFocusTrackerBlur() {
if (this._terminalService.activeInstance !== this._instance) {
return;
}
this._instance.xterm?.clearActiveSearchDecoration();
this._findWidgetFocused.reset();
}
Expand All @@ -121,6 +125,9 @@ export class TerminalFindWidget extends SimpleFindWidget {
}

protected _onFindInputFocusTrackerBlur() {
if (this._terminalService.activeInstance !== this._instance) {
return;
}
this._findInputFocused.reset();
}

Expand Down

0 comments on commit 030cf22

Please sign in to comment.