daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #140280

pull/142211/head^2
Jackson Kearl 2022-02-04 11:56:13 -08:00
parent ee9b661cb1
commit 99f3c2c7e7
No known key found for this signature in database
GPG Key ID: DA09A59C409FC400
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extensions/search-result/src/extension.ts
View File

@ -227,14 +227,6 @@ function parseSearchResults(document: vscode.TextDocument, token?: vscode.Cancel
let locations: Required<vscode.LocationLink>[] = [];
// Allow line number, indentation, etc to take you to definition as well.
locations.push({
targetRange,
targetSelectionRange: new vscode.Range(lineNumber, 0, lineNumber, 1),
targetUri: currentTarget,
originSelectionRange: new vscode.Range(i, 0, i, metadataOffset - 1),
});
let lastEnd = metadataOffset;
let offset = 0;
ELISION_REGEX.lastIndex = metadataOffset;
@ -258,8 +250,19 @@ function parseSearchResults(document: vscode.TextDocument, token?: vscode.Cancel
originSelectionRange: new vscode.Range(i, lastEnd, i, line.length),
});
}
// only show result lines in file-level peek
if (separator.includes(':')) {
currentTargetLocations?.push(...locations);
}
currentTargetLocations?.push(...locations);
// Allow line number, indentation, etc to take you to definition as well.
let convenienceLocation: Required<vscode.LocationLink> = {
targetRange,
targetSelectionRange: new vscode.Range(lineNumber, 0, lineNumber, 1),
targetUri: currentTarget,
originSelectionRange: new vscode.Range(i, 0, i, metadataOffset - 1),
};
locations.push(convenienceLocation);
links[i] = { type: 'result', locations, isContext: separator === ' ', prefixRange: new vscode.Range(i, 0, i, metadataOffset) };
}
}