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

dispose commands

Browse Source
This commit is contained in:
Johannes Rieken
2016-09-07 10:28:26 +02:00
parent 21820b36c1
commit 94acaef890
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -503,6 +503,7 @@ class SuggestAdapter {
private _documents: ExtHostDocuments;
private _heapMonitor: ExtHostHeapMonitor;
private _provider: vscode.CompletionItemProvider;
private _disposables: { [id: number]: IDisposable[] } = [];
constructor(documents: ExtHostDocuments, heapMonitor: ExtHostHeapMonitor, provider: vscode.CompletionItemProvider) {
this._documents = documents;
@@ -544,9 +545,8 @@ class SuggestAdapter {
const item = list.items[i];
const disposables: IDisposable[] = [];
const suggestion = TypeConverters.Suggest.from(item, disposables);
// assign identifier to suggestion
const id = this._heapMonitor.keep(item, () => dispose(disposables));
const id = this._heapMonitor.keep(item, () => dispose(this._disposables[id]));
this._disposables[id] = disposables;
ObjectIdentifier.mixin(suggestion, id);
if (item.textEdit) {
@@ -585,12 +585,13 @@ class SuggestAdapter {
return TPromise.as(suggestion);
}
const item = this._heapMonitor.get<CompletionItem>(ObjectIdentifier.get(suggestion));
const id = ObjectIdentifier.get(suggestion);
const item = this._heapMonitor.get<CompletionItem>(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, this._disposables[id]);
});
}
}