bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'editors/code/src/ctx.ts')
-rw-r--r--editors/code/src/ctx.ts34
1 files changed, 29 insertions, 5 deletions
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index dd2373d584..4e592823b0 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -285,14 +285,38 @@ export class Ctx {
});
this.pushExtCleanup(this._treeView);
- vscode.window.onDidChangeActiveTextEditor((e) => {
+ vscode.window.onDidChangeActiveTextEditor(async (e) => {
// we should skip documents that belong to the current workspace
- if (e && isRustEditor(e) && !isDocumentInWorkspace(e.document)) {
- execRevealDependency(e).catch((reason) => {
- void vscode.window.showErrorMessage(`Dependency error: ${reason}`);
- });
+ if (this.shouldRevealDependency(e)) {
+ try {
+ await execRevealDependency(e);
+ } catch (reason) {
+ await vscode.window.showErrorMessage(`Dependency error: ${reason}`);
+ }
}
});
+
+ this.treeView?.onDidChangeVisibility(async (e) => {
+ if (e.visible) {
+ const activeEditor = vscode.window.activeTextEditor;
+ if (this.shouldRevealDependency(activeEditor)) {
+ try {
+ await execRevealDependency(activeEditor);
+ } catch (reason) {
+ await vscode.window.showErrorMessage(`Dependency error: ${reason}`);
+ }
+ }
+ }
+ });
+ }
+
+ private shouldRevealDependency(e: vscode.TextEditor | undefined): e is RustEditor {
+ return (
+ e !== undefined &&
+ isRustEditor(e) &&
+ !isDocumentInWorkspace(e.document) &&
+ (this.treeView?.visible || false)
+ );
}
async restart() {