Skip to content

Add support for * in workspace symbol search #159377

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import { IKeyMods, IQuickPickItemWithResource } from 'vs/platform/quickinput/com
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
import { getSelectionSearchString } from 'vs/editor/contrib/find/browser/findController';
import { withNullAsUndefined } from 'vs/base/common/types';
import { prepareQuery, IPreparedQuery, scoreFuzzy2, pieceToQuery } from 'vs/base/common/fuzzyScorer';
import { prepareQuery, IPreparedQuery, scoreFuzzy2, pieceToQuery, IPreparedQueryPiece } from 'vs/base/common/fuzzyScorer';
import { IMatch } from 'vs/base/common/filters';
import { Codicon } from 'vs/base/common/codicons';
import { ThemeIcon } from 'vs/base/common/themables';
@@ -115,6 +115,11 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
if (token.isCancellationRequested) {
return [];
}
// fix the queries before matching start
symbolQuery = this.removeWildcards(symbolQuery);
if (containerQuery) {
containerQuery = this.removeWildcards(containerQuery);
}

const symbolPicks: Array<ISymbolQuickPickItem> = [];

@@ -225,6 +230,30 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
return symbolPicks;
}

private removeWildcards(query: IPreparedQuery): IPreparedQuery {
return {
expectContiguousMatch: query.expectContiguousMatch,
normalized: query.normalized.replaceAll('*', ''),
normalizedLowercase: query.normalizedLowercase.replaceAll('*', ''),
original: query.original.replaceAll('*', ''),
originalLowercase: query.originalLowercase.replaceAll('*', ''),
pathNormalized: query.pathNormalized.replaceAll('*', ''),
containsPathSeparator: query.containsPathSeparator,
values: query.values?.map((v) => this.removeWildcardsInPiece(v))
};
}

private removeWildcardsInPiece(query: IPreparedQueryPiece): IPreparedQueryPiece {
return {
expectContiguousMatch: query.expectContiguousMatch,
normalized: query.normalized.replaceAll('*', ''),
normalizedLowercase: query.normalizedLowercase.replaceAll('*', ''),
original: query.original.replaceAll('*', ''),
originalLowercase: query.originalLowercase.replaceAll('*', ''),
pathNormalized: query.pathNormalized.replaceAll('*', '')
};
}

private async openSymbol(provider: IWorkspaceSymbolProvider, symbol: IWorkspaceSymbol, token: CancellationToken, options: { keyMods: IKeyMods; forceOpenSideBySide?: boolean; preserveFocus?: boolean; forcePinned?: boolean }): Promise<void> {

// Resolve actual symbol to open for providers that can resolve