aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src/highlighting.ts
diff options
context:
space:
mode:
authorJulien Roncaglia <[email protected]>2020-03-02 21:54:29 +0000
committerJulien Roncaglia <[email protected]>2020-03-02 21:54:29 +0000
commit2f54c1d653d46831eeb7d691c5f25b78ca63378a (patch)
tree0bd7b296defaab5bfd70b1c501ad7b3467b16230 /editors/code/src/highlighting.ts
parentb95756d21b7988f067d1d5d6448dbe46118f972f (diff)
Centralize the check for languageId on document
Also move visibleRustEditors to Ctx
Diffstat (limited to 'editors/code/src/highlighting.ts')
-rw-r--r--editors/code/src/highlighting.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index 3e0cbdc56..036183834 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -4,7 +4,7 @@ import * as ra from './rust-analyzer-api';
4import { ColorTheme, TextMateRuleSettings } from './color_theme'; 4import { ColorTheme, TextMateRuleSettings } from './color_theme';
5 5
6import { Ctx } from './ctx'; 6import { Ctx } from './ctx';
7import { sendRequestWithRetry } from './util'; 7import { sendRequestWithRetry, isRustDocument } from './util';
8 8
9export function activateHighlighting(ctx: Ctx) { 9export function activateHighlighting(ctx: Ctx) {
10 const highlighter = new Highlighter(ctx); 10 const highlighter = new Highlighter(ctx);
@@ -36,7 +36,7 @@ export function activateHighlighting(ctx: Ctx) {
36 36
37 vscode.window.onDidChangeActiveTextEditor( 37 vscode.window.onDidChangeActiveTextEditor(
38 async (editor: vscode.TextEditor | undefined) => { 38 async (editor: vscode.TextEditor | undefined) => {
39 if (!editor || editor.document.languageId !== 'rust') return; 39 if (!editor || !isRustDocument(editor.document)) return;
40 if (!ctx.config.highlightingOn) return; 40 if (!ctx.config.highlightingOn) return;
41 const client = ctx.client; 41 const client = ctx.client;
42 if (!client) return; 42 if (!client) return;