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

add <path>:line <line> goto pattern #95856 (#96535)

Browse source
This commit is contained in:
Ilia Pozdnyakov 2020-05-07 15:48:21 +07:00 committed by GitHub
parent 487e81efa1
commit 860e808982
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/vs/workbench/contrib/search/common/search.ts
View file

@ -103,7 +103,7 @@ export function getOutOfWorkspaceEditorResources(accessor: ServicesAccessor): UR
}
// Supports patterns of <path><#|:|(><line><#|:|,><col?>
const LINE_COLON_PATTERN = /\s?[#:\(](\d*)([#:,](\d*))?\)?\s*$/;
const LINE_COLON_PATTERN = /\s?[#:\(](line )?(?<line>\d*)([#:,](?<col>\d*))?\)?\s*$/;
export interface IFilterAndRange {
filter: string;
@ -119,8 +119,10 @@ export function extractRangeFromFilter(filter: string, unless?: string[]): IFilt
// Find Line/Column number from search value using RegExp
const patternMatch = LINE_COLON_PATTERN.exec(filter);
if (patternMatch && patternMatch.length > 1) {
const startLineNumber = parseInt(patternMatch[1], 10);
if (patternMatch) {
const startLineNumber = parseInt(patternMatch.groups?.line ?? '', 10);
const startColumn = parseInt(patternMatch.groups?.col ?? '', 10);
// Line Number
if (isNumber(startLineNumber)) {
@ -132,21 +134,18 @@ export function extractRangeFromFilter(filter: string, unless?: string[]): IFilt
};
// Column Number
if (patternMatch.length > 3) {
const startColumn = parseInt(patternMatch[3], 10);
if (isNumber(startColumn)) {
range = {
startLineNumber: range.startLineNumber,
startColumn: startColumn,
endLineNumber: range.endLineNumber,
endColumn: startColumn
};
}
if (isNumber(startColumn)) {
range = {
startLineNumber: range.startLineNumber,
startColumn: startColumn,
endLineNumber: range.endLineNumber,
endColumn: startColumn
};
}
}
// User has typed "something:" or "something#" without a line number, in this case treat as start of file
else if (patternMatch[1] === '') {
else if (patternMatch.groups?.line === '') {
range = {
startLineNumber: 1,
startColumn: 1,

2
src/vs/workbench/contrib/search/test/common/extractRange.test.ts
View file

@ -13,7 +13,7 @@ suite('extractRangeFromFilter', () => {
assert.ok(!extractRangeFromFilter('/some/path'));
assert.ok(!extractRangeFromFilter('/some/path/file.txt'));
for (const lineSep of [':', '#', '(']) {
for (const lineSep of [':', '#', '(', ':line ']) {
for (const colSep of [':', '#', ',']) {
const base = '/some/path/file.txt';