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

Add option to select match when clicking search editor results

Browse source
This commit is contained in:
Stephen Sigwart 2021-10-27 23:57:01 -04:00
parent f961b92f0f
commit df039f2b7b
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vs/workbench/contrib/search/browser/search.contribution.ts
View file

@ -997,6 +997,11 @@ configurationRegistry.registerConfiguration({
],
markdownDescription: nls.localize('search.searchEditor.doubleClickBehaviour', "Configure effect of double clicking a result in a search editor.")
},
'search.searchEditor.openLocationToMatch': {
type: 'boolean',
default: false,
markdownDescription: nls.localize('search.searchEditor.openLocationToMatch', "When opening a location from the search editor, set selection to first match in line.")
},
'search.searchEditor.reusePriorSearchConfiguration': {
type: 'boolean',
default: false,

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

@ -235,15 +235,29 @@ export class SearchEditor extends BaseTextEditor<SearchEditorViewState> {
private registerEditorListeners() {
this.searchResultEditor = super.getControl() as CodeEditorWidget;
this.searchResultEditor.onMouseUp(e => {
this.searchResultEditor.onMouseUp(async e => {
if (e.event.detail === 2) {
const behaviour = this.searchConfig.searchEditor.doubleClickBehaviour;
const position = e.target.position;
if (position && behaviour !== 'selectWord') {
const line = this.searchResultEditor.getModel()?.getLineContent(position.lineNumber) ?? '';
if (line.match(RESULT_LINE_REGEX)) {
const lineMatch = line.match(RESULT_LINE_REGEX);
if (lineMatch) {
this.searchResultEditor.setSelection(Range.fromPositions(position));
this.commandService.executeCommand(behaviour === 'goToLocation' ? 'editor.action.goToDeclaration' : 'editor.action.openDeclarationToTheSide');
const cmd = this.commandService.executeCommand(behaviour === 'goToLocation' ? 'editor.action.goToDeclaration' : 'editor.action.openDeclarationToTheSide');
// Check if we should select the first match.
if (this.searchConfig.searchEditor.openLocationToMatch) {
const searchMatchDecoration = this.searchResultEditor.getModel()?.getLineDecorations(position.lineNumber).find(ld => ld.options.description === 'search-editor-find-match');
if (searchMatchDecoration) {
const matchRange = searchMatchDecoration.range;
const offset = lineMatch[1].length + lineMatch[2].length + lineMatch[3].length;
const matchLine = parseInt(lineMatch[2], 10);
const selectionRange = new Range(matchLine, matchRange.startColumn - offset, matchLine, matchRange.endColumn - offset);
// Wait for the editor to open, then set selection.
await cmd;
this.editorService.activeTextEditorControl?.setSelection(selectionRange);
}
}
} else if (line.match(FILE_LINE_REGEX)) {
this.searchResultEditor.setSelection(Range.fromPositions(position));
this.commandService.executeCommand('editor.action.peekDefinition');

1
src/vs/workbench/services/search/common/search.ts
View file

@ -383,6 +383,7 @@ export interface ISearchConfigurationProperties {
searchEditor: {
doubleClickBehaviour: 'selectWord' | 'goToLocation' | 'openLocationToSide',
reusePriorSearchConfiguration: boolean,
openLocationToMatch: boolean,
defaultNumberOfContextLines: number | null,
experimental: {}
};