suggest: cleanup on hide #1923

microsoft · Jan 25, 2016 · 8057d11 · 8057d11
1 parent 7c35e01
commit 8057d11
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -167,7 +167,9 @@ function isRoot(element: any): boolean {
 class DataSource implements Tree.IDataSource {
 
 	public getId(tree: Tree.ITree, element: any): string {
-		if (element instanceof CompletionModel) {
+		if (!element) {
+			return 'empty';
+		} else if (isRoot(element)) {
 			return 'root';
 		} else if (element instanceof CompletionItem) {
 			return (<CompletionItem>element).id.toString();
@@ -185,7 +187,7 @@ class DataSource implements Tree.IDataSource {
 	}
 
 	public getChildren(tree: Tree.ITree, element: any): TPromise<any[]> {
-		if (element instanceof CompletionModel) {
+		if (isRoot(element)) {
 			return TPromise.as((<CompletionModel>element).items);
 		}
 
@@ -928,6 +930,7 @@ export class SuggestWidget implements EditorBrowser.IContentWidget, IDisposable
 		this._onDidVisibilityChange.fire(false);
 		removeClass(this.element, 'visible');
 		this.editor.layoutContentWidget(this);
+		this.tree.setInput(null);
 	}
 
 	public cancel(): void {