Better handle suggestion enablement in SuggestEnabledInput

Jackson Kearl · Jackson Kearl · commit 2a8adf5b24ed · 2020-02-03T11:00:00.000-08:00
Fixes microsoft#89541.
diff --git a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
@@ -187,11 +187,15 @@ export class SuggestEnabledInput extends Widget implements IThemable {
 			provideCompletionItems: (model: ITextModel, position: Position, _context: modes.CompletionContext) => {
 				let query = model.getValue();
 
-				let wordStart = query.lastIndexOf(' ', position.column - 1) + 1;
-				let alreadyTypedCount = position.column - wordStart - 1;
+				const zeroIndexedColumn = position.column - 1;
+
+				let zeroIndexedWordStart = query.lastIndexOf(' ', zeroIndexedColumn - 1) + 1;
+				let alreadyTypedCount = zeroIndexedColumn - zeroIndexedWordStart;
 
 				// dont show suggestions if the user has typed something, but hasn't used the trigger character
-				if (alreadyTypedCount > 0 && (validatedSuggestProvider.triggerCharacters).indexOf(query[wordStart]) === -1) { return { suggestions: [] }; }
+				if (alreadyTypedCount > 0 && validatedSuggestProvider.triggerCharacters.indexOf(query[zeroIndexedWordStart]) === -1) {
+					return { suggestions: [] };
+				}
 
 				return {
 					suggestions: suggestionProvider.provideResults(query).map(result => {
diff --git a/src/vs/workbench/contrib/extensions/common/extensionQuery.ts b/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
@@ -12,32 +12,32 @@ export class Query {
 	}
 
 	static suggestions(query: string): string[] {
-		const commands = ['installed', 'outdated', 'enabled', 'disabled', 'builtin', 'recommended', 'sort', 'category', 'tag', 'ext', 'id'];
+		const commands = ['installed', 'outdated', 'enabled', 'disabled', 'builtin', 'recommended', 'sort', 'category', 'tag', 'ext', 'id'] as const;
 		const subcommands = {
 			'sort': ['installs', 'rating', 'name'],
 			'category': ['"programming languages"', 'snippets', 'linters', 'themes', 'debuggers', 'formatters', 'keymaps', '"scm providers"', 'other', '"extension packs"', '"language packs"'],
 			'tag': [''],
 			'ext': [''],
 			'id': ['']
-		};
+		} as const;
 
-		let queryContains = (substr: string) => query.indexOf(substr) > -1;
-		let hasSort = subcommands.sort.some(subcommand => queryContains(`@sort:${subcommand}`));
-		let hasCategory = subcommands.category.some(subcommand => queryContains(`@category:${subcommand}`));
+		const queryContains = (substr: string) => query.indexOf(substr) > -1;
+		const hasSort = subcommands.sort.some(subcommand => queryContains(`@sort:${subcommand}`));
+		const hasCategory = subcommands.category.some(subcommand => queryContains(`@category:${subcommand}`));
 
 		return flatten(
 			commands.map(command => {
 				if (hasSort && command === 'sort' || hasCategory && command === 'category') {
 					return [];
 				}
-				if ((subcommands as any)[command]) {
-					return (subcommands as any)[command].map((subcommand: string) => `@${command}:${subcommand}${subcommand === '' ? '' : ' '}`);
+				if (command in subcommands) {
+					return (subcommands as Record<string, readonly string[]>)[command]
+						.map(subcommand => `@${command}:${subcommand}${subcommand === '' ? '' : ' '}`);
 				}
 				else {
 					return [`@${command} `];
 				}
 			}));
-
 	}
 
 	static parse(value: string): Query {
