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

expose command and additionalTextEdits in API, wire it up, #6874

Browse Source
This commit is contained in:
Johannes Rieken
2016-08-19 11:46:24 +02:00
parent 63c8b7a7c7
commit 66c13c81fd
6 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -496,7 +496,7 @@ class SuggestAdapter {
private _documents: ExtHostDocuments;
private _provider: vscode.CompletionItemProvider;
private _cache: { [key: string]: CompletionList } = Object.create(null);
private _cache: { [key: string]: { list: CompletionList; disposables: IDisposable[]; } } = Object.create(null);
constructor(documents: ExtHostDocuments, provider: vscode.CompletionItemProvider) {
this._documents = documents;
@@ -509,7 +509,10 @@ class SuggestAdapter {
const pos = TypeConverters.toPosition(position);
const key = resource.toString();
delete this._cache[key];
if (this._cache[key]) {
dispose(this._cache[key].disposables);
delete this._cache[key];
}
return asWinJsPromise<vscode.CompletionItem[]|vscode.CompletionList>(token => this._provider.provideCompletionItems(doc, pos, token)).then(value => {
@@ -522,6 +525,7 @@ class SuggestAdapter {
const wordRangeBeforePos = (doc.getWordRangeAtPosition(pos) || new Range(pos, pos))
.with({ end: pos });
const disposables: IDisposable[] = [];
let list: CompletionList;
if (Array.isArray(value)) {
list = new CompletionList(value);
@@ -540,7 +544,7 @@ class SuggestAdapter {
for (let i = 0; i < list.items.length; i++) {
const item = list.items[i];
const suggestion = <ISuggestion2> TypeConverters.Suggest.from(item);
const suggestion = <ISuggestion2> TypeConverters.Suggest.from(item, disposables);
if (item.textEdit) {
@@ -572,26 +576,24 @@ class SuggestAdapter {
}
// cache for details call
this._cache[key] = list;
this._cache[key] = { list, disposables };
return result;
});
}
resolveCompletionItem(resource: URI, position: IPosition, suggestion: modes.ISuggestion): TPromise<modes.ISuggestion> {
if (typeof this._provider.resolveCompletionItem !== 'function') {
if (typeof this._provider.resolveCompletionItem !== 'function' || !this._cache[resource.toString()]) {
return TPromise.as(suggestion);
}
let list = this._cache[resource.toString()];
if (!list) {
return TPromise.as(suggestion);
}
let item = list.items[Number((<ISuggestion2> suggestion).id)];
const {list, disposables} = this._cache[resource.toString()];
const item = list.items[Number((<ISuggestion2> suggestion).id)];
if (!item) {
return TPromise.as(suggestion);
}
return asWinJsPromise(token => this._provider.resolveCompletionItem(item, token)).then(resolvedItem => {
return TypeConverters.Suggest.from(resolvedItem || item);
return TypeConverters.Suggest.from(resolvedItem || item, disposables);
});
}
}

6
src/vs/workbench/api/node/extHostTypeConverters.ts
View File

@@ -311,7 +311,7 @@ export const CompletionItemKind = {
export const Suggest = {
from(item: vscode.CompletionItem): modes.ISuggestion {
from(item: vscode.CompletionItem, disposables: IDisposable[]): modes.ISuggestion {
const suggestion: modes.ISuggestion = {
label: item.label,
insertText: item.insertText || item.label,
@@ -319,7 +319,9 @@ export const Suggest = {
detail: item.detail,
documentation: item.documentation,
sortText: item.sortText,
filterText: item.filterText
filterText: item.filterText,
command: Command.from(item.command, disposables),
additionalTextEdits: item.additionalTextEdits && item.additionalTextEdits.map(TextEdit.from)
};
return suggestion;
},

2
src/vs/workbench/api/node/extHostTypes.ts
View File

@@ -775,6 +775,8 @@ export class CompletionItem {
filterText: string;
insertText: string;
textEdit: TextEdit;
additionalTextEdits: TextEdit[];
command: vscode.Command;
constructor(label: string, kind?: CompletionItemKind) {
this.label = label;