Pre-support for backeted property completions in js/ts

Requires a build of TS with microsoft/TypeScript#20547 Fixes #36429

Also relaxes the matching logic for suggestion items with filter texts

Author: mjbvz

extensions/typescript/src/features/completionItemProvider.ts

@@ -53,6 +53,17 @@ class MyCompletionItem extends CompletionItem {
 			this.range = tsTextSpanToVsRange(tsEntry.replacementSpan);
 		}
 
+		if (typeof (tsEntry as any).insertText === 'string') {
+			this.insertText = (tsEntry as any).insertText as string;
+
+			if (tsEntry.replacementSpan) {
+				this.range = tsTextSpanToVsRange(tsEntry.replacementSpan);
+				if (this.insertText[0] === '[') { // o.x -> o['x']
+					this.filterText = '.' + this.label;
+				}
+			}
+		}
+
 		if (tsEntry.kindModifiers.match(/\boptional\b/)) {
 			this.insertText = this.label;
 			this.filterText = this.label;
@@ -275,8 +286,9 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
 		try {
 			const args: Proto.CompletionsRequestArgs = {
 				...vsPositionToTsFileLocation(file, position),
-				includeExternalModuleExports: config.autoImportSuggestions
-			};
+				includeExternalModuleExports: config.autoImportSuggestions,
+				includeInsertTextCompletions: true
+			} as Proto.CompletionsRequestArgs;
 			const msg = await this.client.execute('completions', args, token);
 			// This info has to come from the tsserver. See https://github.com/Microsoft/TypeScript/issues/2831
 			// let isMemberCompletion = false;
@@ -402,7 +414,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
 		if (detail && item.useCodeSnippet) {
 			const shouldCompleteFunction = await this.isValidFunctionCompletionContext(filepath, item.position);
 			if (shouldCompleteFunction) {
-				item.insertText = this.snippetForFunctionCall(detail);
+				item.insertText = this.snippetForFunctionCall(item, detail);
 			}
 			return item;
 		}
@@ -430,12 +442,15 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
 		}
 	}
 
-	private snippetForFunctionCall(detail: Proto.CompletionEntryDetails): SnippetString {
+	private snippetForFunctionCall(
+		item: CompletionItem,
+		detail: Proto.CompletionEntryDetails
+	): SnippetString {
 		let hasOptionalParameters = false;
 		let hasAddedParameters = false;
 
 		const snippet = new SnippetString();
-		snippet.appendText(detail.name);
+		snippet.appendText(item.label || item.insertText as string);
 		snippet.appendText('(');
 
 		let parenCount = 0;

src/vs/base/common/filters.ts

@@ -341,6 +341,22 @@ export function matchesFuzzy(word: string, wordToMatchAgainst: string, enableSep
 	return enableSeparateSubstringMatching ? fuzzySeparateFilter(word, wordToMatchAgainst) : fuzzyContiguousFilter(word, wordToMatchAgainst);
 }
 
+export function skipScore(pattern: string, word: string, patternMaxWhitespaceIgnore?: number): [number, number[]] {
+	pattern = pattern.toLowerCase();
+	word = word.toLowerCase();
+
+	const matches: number[] = [];
+	let idx = 0;
+	for (let pos = 0; pos < pattern.length; ++pos) {
+		const thisIdx = word.indexOf(pattern.charAt(pos), idx);
+		if (thisIdx >= 0) {
+			matches.push(thisIdx);
+			idx = thisIdx + 1;
+		}
+	}
+	return [matches.length, matches];
+}
+
 //#region --- fuzzyScore ---
 
 export function createMatches(position: number[]): IMatch[] {

src/vs/editor/contrib/suggest/completionModel.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { fuzzyScore, fuzzyScoreGracefulAggressive } from 'vs/base/common/filters';
+import { fuzzyScore, fuzzyScoreGracefulAggressive, skipScore } from 'vs/base/common/filters';
 import { ISuggestSupport, ISuggestResult } from 'vs/editor/common/modes';
 import { ISuggestionItem, SnippetConfig } from './suggest';
 import { isDisposable } from 'vs/base/common/lifecycle';
@@ -185,11 +185,8 @@ export class CompletionModel {
 					continue;
 				}
 				item.score = match[0];
-				item.matches = [];
-				match = scoreFn(word, suggestion.label, suggestion.overwriteBefore);
-				if (match) {
-					item.matches = match[1];
-				}
+				item.matches = skipScore(word, suggestion.label)[1];
+
 			} else {
 				// by default match `word` against the `label`
 				let match = scoreFn(word, suggestion.label, suggestion.overwriteBefore);