Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect @ symbol search when there is no line/colon pattern after #186009

Merged
merged 1 commit into from
Jun 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/vs/workbench/contrib/search/common/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,11 @@ export interface IFilterAndRange {
}

export function extractRangeFromFilter(filter: string, unless?: string[]): IFilterAndRange | undefined {
if (!filter || unless?.some(value => filter.indexOf(value) === 0)) {
// Ignore when the unless character not the first character or is before the line colon pattern
if (!filter || unless?.some(value => {
const unlessCharPos = filter.indexOf(value);
return unlessCharPos === 0 || unlessCharPos > 0 && !LINE_COLON_PATTERN.test(filter.substring(unlessCharPos + 1));
})) {
return undefined;
}

Expand Down
56 changes: 51 additions & 5 deletions src/vs/workbench/contrib/search/test/common/extractRange.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ suite('extractRangeFromFilter', () => {
assert.ok(!extractRangeFromFilter(''));
assert.ok(!extractRangeFromFilter('/some/path'));
assert.ok(!extractRangeFromFilter('/some/path/file.txt'));
assert.ok(!extractRangeFromFilter('/some/@path'), 'paths like as /node_modules/@types/ should be supported');

for (const lineSep of [':', '#', '(', ':line ']) {
for (const colSep of [':', '#', ',']) {
Expand Down Expand Up @@ -44,9 +43,56 @@ suite('extractRangeFromFilter', () => {
assert.strictEqual(res?.range.startColumn, 20);
});

test('unless', async function () {
const res = extractRangeFromFilter('@/some/path/file.txt (19,20)', ['@']);

assert.ok(!res);
suite('unless', async function () {
const testSpecs = [
// alpha-only symbol after unless
{ filter: '/some/path/file.txt@alphasymbol', unless: ['@'], result: undefined },
// unless as first char
{ filter: '@/some/path/file.txt (19,20)', unless: ['@'], result: undefined },
// unless as last char
{ filter: '/some/path/file.txt (19,20)@', unless: ['@'], result: undefined },
// unless before ,
{
filter: '/some/@path/file.txt (19,20)', unless: ['@'], result: {
filter: '/some/@path/file.txt',
range: {
endColumn: 20,
endLineNumber: 19,
startColumn: 20,
startLineNumber: 19
}
}
},
// unless before :
{
filter: '/some/@path/file.txt:19:20', unless: ['@'], result: {
filter: '/some/@path/file.txt',
range: {
endColumn: 20,
endLineNumber: 19,
startColumn: 20,
startLineNumber: 19
}
}
},
// unless before #
{
filter: '/some/@path/file.txt#19', unless: ['@'], result: {
filter: '/some/@path/file.txt',
range: {
endColumn: 1,
endLineNumber: 19,
startColumn: 1,
startLineNumber: 19
}
}
},
];
for (const { filter, unless, result } of testSpecs) {
test(`${filter} - ${JSON.stringify(unless)}`, () => {
assert.deepStrictEqual(extractRangeFromFilter(filter, unless), result);
});
}
});
});