maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

move cursor to 0,0 on search

Browse source
This commit is contained in:
Jackson Kearl 2020-01-27 17:37:32 -08:00
parent 27c5c0c47b
commit faee920b65
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/contrib/search/browser/searchActions.ts
View file

@ -587,7 +587,7 @@ export class ReRunSearchEditorSearchAction extends Action {
async run() {
const input = this.editorService.activeEditor;
if (input instanceof SearchEditorInput) {
await (this.editorService.activeControl as SearchEditor).runSearch();
await (this.editorService.activeControl as SearchEditor).runSearch(false, true);
}
}
}

21
src/vs/workbench/contrib/search/browser/searchEditor.ts
View file

@ -96,9 +96,9 @@ export class SearchEditor extends BaseEditor {
this.queryEditorWidget = this._register(this.instantiationService.createInstance(SearchWidget, this.queryEditorContainer, { _hideReplaceToggle: true, showContextToggle: true }));
this._register(this.queryEditorWidget.onReplaceToggled(() => this.reLayout()));
this._register(this.queryEditorWidget.onDidHeightChange(() => this.reLayout()));
this.queryEditorWidget.onSearchSubmit(() => this.runSearch(true)); // onSearchSubmit has an internal delayer, so skip over ours.
this.queryEditorWidget.searchInput.onDidOptionChange(() => this.runSearch());
this.queryEditorWidget.onDidToggleContext(() => this.runSearch());
this.queryEditorWidget.onSearchSubmit(() => this.runSearch(true, true)); // onSearchSubmit has an internal delayer, so skip over ours.
this.queryEditorWidget.searchInput.onDidOptionChange(() => this.runSearch(false));
this.queryEditorWidget.onDidToggleContext(() => this.runSearch(false));
// Includes/Excludes Dropdown
this.includesExcludesContainer = DOM.append(this.queryEditorContainer, DOM.$('.includes-excludes'));
@ -217,26 +217,31 @@ export class SearchEditor extends BaseEditor {
toggleWholeWords() {
this.queryEditorWidget.searchInput.setWholeWords(!this.queryEditorWidget.searchInput.getWholeWords());
this.runSearch();
this.runSearch(false);
}
toggleRegex() {
this.queryEditorWidget.searchInput.setRegex(!this.queryEditorWidget.searchInput.getRegex());
this.runSearch();
this.runSearch(false);
}
toggleCaseSensitive() {
this.queryEditorWidget.searchInput.setCaseSensitive(!this.queryEditorWidget.searchInput.getCaseSensitive());
this.runSearch();
this.runSearch(false);
}
toggleContextLines() {
this.queryEditorWidget.toggleContextLines();
}
async runSearch(instant = false) {
async runSearch(resetCursor = true, instant = false) {
if (!this.pauseSearching) {
this.runSearchDelayer.trigger(() => this.doRunSearch(), instant ? 0 : undefined);
this.runSearchDelayer.trigger(async () => {
await this.doRunSearch();
if (resetCursor) {
this.searchResultEditor.setSelection(new Range(1, 1, 1, 1));
}
}, instant ? 0 : undefined);
}
}