can navigate, dispose model

Author: jrieken

package.json

@@ -138,11 +138,13 @@
       },
       {
         "command": "references-view.next",
-        "title": "Go to Next Reference"
+        "title": "Go to Next Reference",
+        "enablement": "references-view.canNavigate"
       },
       {
         "command": "references-view.prev",
-        "title": "Go to Previous Reference"
+        "title": "Go to Previous Reference",
+        "enablement": "references-view.canNavigate"
       }
     ],
     "menus": {

src/api.d.ts

@@ -22,6 +22,7 @@ export interface SymbolTreeModel {
 	provider: Required<vscode.TreeDataProvider<unknown>>;
 	navigation?: SymbolItemNavigation<any>;
 	highlights?: SymbolItemEditorHighlights<any>;
+	dispose?(): void;
 }
 
 export interface SymbolTreeInput {

src/calls/model.ts

@@ -29,13 +29,17 @@ export class CallsTreeInput implements SymbolTreeInput {
 
 		const items = await Promise.resolve(vscode.commands.executeCommand<vscode.CallHierarchyItem[]>('vscode.prepareCallHierarchy', this.uri, this.position));
 		const model = new CallsModel(this.direction, items ?? []);
+		const provider = new CallItemDataProvider(model);
 
 		return <SymbolTreeModel>{
-			provider: new CallItemDataProvider(model),
+			provider,
 			message: undefined,
 			empty: model.roots.length === 0,
 			navigation: model,
-			highlights: model
+			highlights: model,
+			dispose() {
+				provider.dispose();
+			}
 		};
 	}
 

src/highlights.ts

@@ -24,7 +24,7 @@ export class EditorHighlights<T> {
 			vscode.window.onDidChangeActiveTextEditor(() => _view.visible && this._show()),
 			_view.onDidChangeVisibility(e => e.visible ? this._show() : this._hide())
 		);
-
+		this._show();
 	}
 
 	dispose() {

src/locations/model.ts

@@ -26,13 +26,17 @@ export class LocationTreeInput implements SymbolTreeInput {
 
 		const result = Promise.resolve(vscode.commands.executeCommand<vscode.Location[] | vscode.LocationLink[]>(this._command, this.uri, this.position));
 		const model = new LocationsModel(await result ?? []);
+		const provider = new LocationsTreeDataProvider(model);
 
 		return <SymbolTreeModel>{
-			provider: new LocationsTreeDataProvider(model),
+			provider,
 			get message() { return model.message; },
 			empty: model.items.length === 0,
 			navigation: model,
-			highlights: model
+			highlights: model,
+			dispose(): void {
+				provider.dispose();
+			}
 		};
 	}
 

src/navigation.ts

@@ -5,10 +5,12 @@
 
 import * as vscode from 'vscode';
 import { SymbolItemNavigation } from './api';
+import { ContextKey } from './models';
 
 export class Navigation {
 
 	private readonly _disposables: vscode.Disposable[] = [];
+	private readonly _ctxCanNavigate = new ContextKey<boolean>('references-view.canNavigate');
 
 	private _delegate?: SymbolItemNavigation<unknown>;
 
@@ -25,6 +27,7 @@ export class Navigation {
 
 	update(delegate: SymbolItemNavigation<unknown> | undefined) {
 		this._delegate = delegate;
+		this._ctxCanNavigate.set(Boolean(this._delegate));
 	}
 
 	private _anchor(): undefined | unknown {

src/tree.ts

@@ -92,7 +92,6 @@ export class SymbolsTree {
 		let highlights: EditorHighlights<unknown> | undefined;
 		if (model.highlights) {
 			highlights = new EditorHighlights(this._tree, model.highlights);
-			highlights.update();
 			disposables.push(highlights);
 		}
 
@@ -102,9 +101,8 @@ export class SymbolsTree {
 			this._tree.message = model.message;
 			highlights?.update();
 		}));
-
-		if (typeof ((model.provider as unknown) as vscode.Disposable).dispose === 'function') {
-			disposables.push((model.provider as unknown) as vscode.Disposable);
+		if (typeof model.dispose === 'function') {
+			disposables.push(new vscode.Disposable(() => model.dispose!()));
 		}
 		this._sessionDisposable = vscode.Disposable.from(...disposables);
 	}