From 2f54c1d653d46831eeb7d691c5f25b78ca63378a Mon Sep 17 00:00:00 2001
From: Julien Roncaglia <julien@roncaglia.fr>
Date: Mon, 2 Mar 2020 22:54:29 +0100
Subject: Centralize the check for languageId on document

Also move visibleRustEditors to Ctx
---
 editors/code/src/commands/syntax_tree.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'editors/code/src/commands/syntax_tree.ts')

diff --git a/editors/code/src/commands/syntax_tree.ts b/editors/code/src/commands/syntax_tree.ts
index 7218bfb90..2e08e8f11 100644
--- a/editors/code/src/commands/syntax_tree.ts
+++ b/editors/code/src/commands/syntax_tree.ts
@@ -2,6 +2,7 @@ import * as vscode from 'vscode';
 import * as ra from '../rust-analyzer-api';
 
 import { Ctx, Cmd } from '../ctx';
+import { isRustDocument } from '../util';
 
 // Opens the virtual file that will show the syntax tree
 //
@@ -19,7 +20,7 @@ export function syntaxTree(ctx: Ctx): Cmd {
     vscode.workspace.onDidChangeTextDocument(
         (event: vscode.TextDocumentChangeEvent) => {
             const doc = event.document;
-            if (doc.languageId !== 'rust') return;
+            if (!isRustDocument(doc)) return;
             afterLs(() => tdcp.eventEmitter.fire(tdcp.uri));
         },
         null,
@@ -28,7 +29,7 @@ export function syntaxTree(ctx: Ctx): Cmd {
 
     vscode.window.onDidChangeActiveTextEditor(
         (editor: vscode.TextEditor | undefined) => {
-            if (!editor || editor.document.languageId !== 'rust') return;
+            if (!editor || !isRustDocument(editor.document)) return;
             tdcp.eventEmitter.fire(tdcp.uri);
         },
         null,
-- 
cgit v1.2.3