Improve symbols quick pick to support wild cards

The change introduce a new property into IPreparedQuery called raw to
hold the raw query entered by the user. This is used for LS request while
the existing original field is used for fuzzy scoring which is modified
to remove the wild card characters such as *,?.

Author: gayanper

src/vs/base/common/fuzzyScorer.ts

@@ -790,10 +790,14 @@ function fallbackCompare<T>(itemA: T, itemB: T, query: IPreparedQuery, accessor:
 export interface IPreparedQueryPiece {
 
 	/**
-	 * The original query as provided as input.
+	 * The original query as provided as input after removing wildcard characters.
 	 */
 	original: string;
 	originalLowercase: string;
+	/**
+	 * The original query which is unmodified.
+	 */
+	raw: string;
 
 	/**
 	 * Original normalized to platform separators:
@@ -848,16 +852,20 @@ export function prepareQuery(original: string): IPreparedQuery {
 		original = '';
 	}
 
+	const raw = original;
+	original = original.replace('*', '').replace('?', '');
 	const originalLowercase = original.toLowerCase();
 	const { pathNormalized, normalized, normalizedLowercase } = normalizeQuery(original);
 	const containsPathSeparator = pathNormalized.indexOf(sep) >= 0;
 	const expectExactMatch = queryExpectsExactMatch(original);
 
 	let values: IPreparedQueryPiece[] | undefined = undefined;
 
-	const originalSplit = original.split(MULTIPLE_QUERY_VALUES_SEPARATOR);
+	const originalSplit = raw.split(MULTIPLE_QUERY_VALUES_SEPARATOR);
 	if (originalSplit.length > 1) {
-		for (const originalPiece of originalSplit) {
+		for (const piece of originalSplit) {
+			const rawPiece = piece;
+			const originalPiece = rawPiece.replace('*', '').replace('?', '');
 			const expectExactMatchPiece = queryExpectsExactMatch(originalPiece);
 			const {
 				pathNormalized: pathNormalizedPiece,
@@ -876,13 +884,13 @@ export function prepareQuery(original: string): IPreparedQuery {
 					pathNormalized: pathNormalizedPiece,
 					normalized: normalizedPiece,
 					normalizedLowercase: normalizedLowercasePiece,
-					expectContiguousMatch: expectExactMatchPiece
+					expectContiguousMatch: expectExactMatchPiece,
+					raw: rawPiece
 				});
 			}
 		}
 	}
-
-	return { original, originalLowercase, pathNormalized, normalized, normalizedLowercase, values, containsPathSeparator, expectContiguousMatch: expectExactMatch };
+	return { original, originalLowercase, raw, pathNormalized, normalized, normalizedLowercase, values, containsPathSeparator, expectContiguousMatch: expectExactMatch };
 }
 
 function normalizeQuery(original: string): { pathNormalized: string; normalized: string; normalizedLowercase: string } {

src/vs/base/test/common/fuzzyScorer.test.ts

@@ -1109,13 +1109,16 @@ suite('Fuzzy Scorer', () => {
 
 		// with spaces
 		let query = prepareQuery('He*llo World');
-		assert.strictEqual(query.original, 'He*llo World');
+		assert.strictEqual(query.raw, 'He*llo World');
+		assert.strictEqual(query.original, 'Hello World');
 		assert.strictEqual(query.normalized, 'HelloWorld');
 		assert.strictEqual(query.normalizedLowercase, 'HelloWorld'.toLowerCase());
 		assert.strictEqual(query.values?.length, 2);
-		assert.strictEqual(query.values?.[0].original, 'He*llo');
+		assert.strictEqual(query.values?.[0].raw, 'He*llo');
+		assert.strictEqual(query.values?.[0].original, 'Hello');
 		assert.strictEqual(query.values?.[0].normalized, 'Hello');
 		assert.strictEqual(query.values?.[0].normalizedLowercase, 'Hello'.toLowerCase());
+		assert.strictEqual(query.values?.[1].raw, 'World');
 		assert.strictEqual(query.values?.[1].original, 'World');
 		assert.strictEqual(query.values?.[1].normalized, 'World');
 		assert.strictEqual(query.values?.[1].normalizedLowercase, 'World'.toLowerCase());
@@ -1127,15 +1130,18 @@ suite('Fuzzy Scorer', () => {
 
 		// with spaces that are empty
 		query = prepareQuery(' Hello   World  	');
+		assert.strictEqual(query.raw, ' Hello   World  	');
 		assert.strictEqual(query.original, ' Hello   World  	');
 		assert.strictEqual(query.originalLowercase, ' Hello   World  	'.toLowerCase());
 		assert.strictEqual(query.normalized, 'HelloWorld');
 		assert.strictEqual(query.normalizedLowercase, 'HelloWorld'.toLowerCase());
 		assert.strictEqual(query.values?.length, 2);
+		assert.strictEqual(query.values?.[0].raw, 'Hello');
 		assert.strictEqual(query.values?.[0].original, 'Hello');
 		assert.strictEqual(query.values?.[0].originalLowercase, 'Hello'.toLowerCase());
 		assert.strictEqual(query.values?.[0].normalized, 'Hello');
 		assert.strictEqual(query.values?.[0].normalizedLowercase, 'Hello'.toLowerCase());
+		assert.strictEqual(query.values?.[1].raw, 'World');
 		assert.strictEqual(query.values?.[1].original, 'World');
 		assert.strictEqual(query.values?.[1].originalLowercase, 'World'.toLowerCase());
 		assert.strictEqual(query.values?.[1].normalized, 'World');

src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts

@@ -110,7 +110,7 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
 		}
 
 		// Run the workspace symbol query
-		const workspaceSymbols = await getWorkspaceSymbols(symbolQuery.original, token);
+		const workspaceSymbols = await getWorkspaceSymbols(symbolQuery.raw, token);
 		if (token.isCancellationRequested) {
 			return [];
 		}