suggest - 💄

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

@@ -118,7 +118,7 @@ export class CompletionModel {
 	adopt(except: Set<CompletionItemProvider>): ISuggestionItem[] {
 		let res = new Array<ISuggestionItem>();
 		for (let i = 0; i < this._items.length;) {
-			if (!except.has(this._items[i].support)) {
+			if (!except.has(this._items[i].provider)) {
 				res.push(this._items[i]);
 
 				// unordered removed
@@ -173,7 +173,7 @@ export class CompletionModel {
 			// collect those supports that signaled having
 			// an incomplete result
 			if (container.incomplete) {
-				this._isIncomplete.add(item.support);
+				this._isIncomplete.add(item.provider);
 			}
 
 			// 'word' is that remainder of the current line that we

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

@@ -25,10 +25,10 @@ export const Context = {
 };
 
 export interface ISuggestionItem {
-	position: IPosition;
-	suggestion: CompletionItem;
-	container: CompletionList;
-	support: CompletionItemProvider;
+	readonly position: IPosition;
+	readonly suggestion: CompletionItem;
+	readonly container: CompletionList;
+	readonly provider: CompletionItemProvider;
 	resolve(token: CancellationToken): Thenable<void>;
 }
 
@@ -104,7 +104,7 @@ export function provideSuggestionItems(
 								position,
 								container,
 								suggestion,
-								support,
+								provider: support,
 								resolve: createSuggestionResolver(support, suggestion, model, position)
 							});
 						}
@@ -163,7 +163,7 @@ function createSuggestionResolver(provider: CompletionItemProvider, suggestion:
 	return (token) => {
 		if (!cached) {
 			let isDone = false;
-			cached = Promise.resolve(provider.resolveCompletionItem!(model, position, suggestion, token)).then(value => {
+			cached = Promise.resolve(resolveCompletionItem.call(provider, model, position, suggestion, token)).then(value => {
 				assign(suggestion, value);
 				isDone = true;
 			}, err => {

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

@@ -27,7 +27,7 @@ export function createSuggestItem(label: string, overwriteBefore: number, kind =
 			suggestions: [this.suggestion]
 		};
 
-		support: CompletionItemProvider = {
+		provider: CompletionItemProvider = {
 			provideCompletionItems(): any {
 				return;
 			}
@@ -100,7 +100,7 @@ suite('CompletionModel', function () {
 		const complete = model.adopt(incomplete);
 
 		assert.equal(incomplete.size, 1);
-		assert.ok(incomplete.has(incompleteItem.support));
+		assert.ok(incomplete.has(incompleteItem.provider));
 		assert.equal(complete.length, 1);
 		assert.ok(complete[0] === completeItem);
 	});
@@ -130,7 +130,7 @@ suite('CompletionModel', function () {
 		const complete = model.adopt(incomplete);
 
 		assert.equal(incomplete.size, 1);
-		assert.ok(incomplete.has(incompleteItem1.support));
+		assert.ok(incomplete.has(incompleteItem1.provider));
 		assert.equal(complete.length, 5);
 	});
 

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

@@ -98,7 +98,7 @@ suite('Suggest', function () {
 			registration.dispose();
 
 			assert.equal(items.length, 1);
-			assert.ok(items[0].support === foo);
+			assert.ok(items[0].provider === foo);
 		});
 	});
 });

src/vs/editor/contrib/suggest/test/suggestModel.test.ts

@@ -287,7 +287,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 				assert.equal(event.completionModel.items.length, 1);
 				const [first] = event.completionModel.items;
 
-				assert.equal(first.support, alwaysSomethingSupport);
+				assert.equal(first.provider, alwaysSomethingSupport);
 			});
 		});
 	});
@@ -623,7 +623,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 				assert.equal(event.completionModel.items.length, 1);
 				const [first] = event.completionModel.items;
 
-				assert.equal(first.support, alwaysSomethingSupport);
+				assert.equal(first.provider, alwaysSomethingSupport);
 			});
 
 			await assertEvent(model.onDidSuggest, () => {
@@ -634,7 +634,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 				assert.equal(event.completionModel.items.length, 1);
 				const [first] = event.completionModel.items;
 
-				assert.equal(first.support, alwaysSomethingSupport);
+				assert.equal(first.provider, alwaysSomethingSupport);
 			});
 		});
 	});
@@ -703,7 +703,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 				assert.equal(event.completionModel.items.length, 1);
 				const [first] = event.completionModel.items;
 
-				assert.equal(first.support, alwaysSomethingSupport);
+				assert.equal(first.provider, alwaysSomethingSupport);
 			});
 		});
 	});