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

Use selected text for query when runnning Open Search Editor with an existing editor

Browse source 
Always select the full query text when running Open Search Editor with no selection
Closes #105032. Closes #105031.
This commit is contained in:
Jackson Kearl 2020-08-19 15:43:17 -07:00
parent 7f4c958024
commit 2611bffc41
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
View file

@ -280,6 +280,14 @@ export class SearchEditor extends BaseTextEditor {
}
}
setQuery(query: string) {
this.queryEditorWidget.searchInput.setValue(query);
}
selectQuery() {
this.queryEditorWidget.searchInput.select();
}
toggleWholeWords() {
this.queryEditorWidget.searchInput.setWholeWords(!this.queryEditorWidget.searchInput.getWholeWords());
this.triggerSearch({ resetCursor: false });

5
src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
View file

@ -148,7 +148,8 @@ export const openNewSearchEditor =
if (existing && args.location === 'reuse') {
const input = existing.editor as SearchEditorInput;
editor = assertIsDefined(await assertIsDefined(editorGroupsService.getGroup(existing.groupId)).openEditor(input)) as SearchEditor;
editor.focusSearchInput();
if (selected) { editor.setQuery(selected); }
else { editor.selectQuery(); }
} else {
const input = instantiationService.invokeFunction(getOrMakeSearchEditorInput, { config: args, text: '' });
editor = await editorService.openEditor(input, { pinned: true }, toSide ? SIDE_GROUP : ACTIVE_GROUP) as SearchEditor;
@ -161,6 +162,8 @@ export const openNewSearchEditor =
) {
editor.triggerSearch({ focusResults: args.focusResults !== false });
}
if (args.focusResults === false) { editor.focusSearchInput(); }
};
export const createEditorFromSearchResult =