Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

add CompletionList to tackle #2224

Browse Source
This commit is contained in:
Johannes Rieken
2016-01-25 13:57:06 +01:00
parent 0608256464
commit 08fab0100d
7 changed files with 110 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/api/node/extHostApiCommands.ts
View File

@@ -103,7 +103,7 @@ class ExtHostApiCommands {
{ name: 'uri', description: 'Uri of a text document', constraint: URI },
{ name: 'position', description: 'Position in a text document', constraint: types.Position }
],
returns: 'A promise that resolves to an array of CompletionItem-instances.'
returns: 'A promise that resolves to a CompletionList-instance.'
});
this._register('vscode.executeCodeActionProvider', this._executeCodeActionProvider, {
description: 'Execute code action provider.',
@@ -265,7 +265,7 @@ class ExtHostApiCommands {
});
}
private _executeCompletionItemProvider(resource: URI, position: types.Position, triggerCharacter: string): Thenable<types.CompletionItem[]> {
private _executeCompletionItemProvider(resource: URI, position: types.Position, triggerCharacter: string): Thenable<types.CompletionItem[]|types.CompletionList> {
const args = {
resource,
position: position && typeConverters.fromPosition(position),
@@ -274,15 +274,17 @@ class ExtHostApiCommands {
return this._commands.executeCommand<modes.ISuggestResult[][]>('_executeCompletionItemProvider', args).then(value => {
if (value) {
let items: types.CompletionItem[] = [];
let incomplete: boolean;
for (let group of value) {
for (let suggestions of group) {
incomplete = suggestions.incomplete || incomplete;
for (let suggestion of suggestions.suggestions) {
const item = typeConverters.Suggest.to(suggestions, position, suggestion);
items.push(item);
}
}
}
return items;
return new types.CompletionList(<any>items, incomplete);
}
});
}