Merge branch 'master' of https://github.com/Microsoft/vscode

alexr00 · alexr00 · commit 83baef51fdfa · 2018-10-23T15:22:14.000+02:00
diff --git a/src/vs/editor/contrib/suggest/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts
@@ -152,12 +152,16 @@ export function ensureLowerCaseVariants(suggestion: CompletionItem) {
 }
 
 function createSuggestionResolver(provider: CompletionItemProvider, suggestion: CompletionItem, model: ITextModel, position: Position): (token: CancellationToken) => Promise<void> {
+	let cached: Promise<void>;
 	return (token) => {
-		if (typeof provider.resolveCompletionItem === 'function') {
-			return Promise.resolve(provider.resolveCompletionItem(model, position, suggestion, token)).then(value => { assign(suggestion, value); });
-		} else {
-			return Promise.resolve(void 0);
+		if (!cached) {
+			if (typeof provider.resolveCompletionItem === 'function') {
+				cached = Promise.resolve(provider.resolveCompletionItem(model, position, suggestion, token)).then(value => { assign(suggestion, value); });
+			} else {
+				cached = Promise.resolve(void 0);
+			}
 		}
+		return cached;
 	};
 }
 

Original file line number	Diff line number	Diff line change
`@@ -152,12 +152,16 @@ export function ensureLowerCaseVariants(suggestion: CompletionItem) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`function createSuggestionResolver(provider: CompletionItemProvider, suggestion: CompletionItem, model: ITextModel, position: Position): (token: CancellationToken) => Promise<void> {`
	`155`	`+ let cached: Promise<void>;`
`155`	`156`	`return (token) => {`
`156`		`- if (typeof provider.resolveCompletionItem === 'function') {`
`157`		`- return Promise.resolve(provider.resolveCompletionItem(model, position, suggestion, token)).then(value => { assign(suggestion, value); });`
`158`		`- } else {`
`159`		`- return Promise.resolve(void 0);`
	`157`	`+ if (!cached) {`
	`158`	`+ if (typeof provider.resolveCompletionItem === 'function') {`
	`159`	`+ cached = Promise.resolve(provider.resolveCompletionItem(model, position, suggestion, token)).then(value => { assign(suggestion, value); });`
	`160`	`+ } else {`
	`161`	`+ cached = Promise.resolve(void 0);`
	`162`	`+ }`
`160`	`163`	`}`
	`164`	`+ return cached;`
`161`	`165`	`};`
`162`	`166`	`}`
`163`	`167`