aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/code/src/commands/syntax_tree.ts5
-rw-r--r--editors/code/src/ctx.ts9
-rw-r--r--editors/code/src/highlighting.ts4
-rw-r--r--editors/code/src/inlay_hints.ts14
-rw-r--r--editors/code/src/util.ts8
5 files changed, 25 insertions, 15 deletions
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';
2import * as ra from '../rust-analyzer-api'; 2import * as ra from '../rust-analyzer-api';
3 3
4import { Ctx, Cmd } from '../ctx'; 4import { Ctx, Cmd } from '../ctx';
5import { isRustDocument } from '../util';
5 6
6// Opens the virtual file that will show the syntax tree 7// Opens the virtual file that will show the syntax tree
7// 8//
@@ -19,7 +20,7 @@ export function syntaxTree(ctx: Ctx): Cmd {
19 vscode.workspace.onDidChangeTextDocument( 20 vscode.workspace.onDidChangeTextDocument(
20 (event: vscode.TextDocumentChangeEvent) => { 21 (event: vscode.TextDocumentChangeEvent) => {
21 const doc = event.document; 22 const doc = event.document;
22 if (doc.languageId !== 'rust') return; 23 if (!isRustDocument(doc)) return;
23 afterLs(() => tdcp.eventEmitter.fire(tdcp.uri)); 24 afterLs(() => tdcp.eventEmitter.fire(tdcp.uri));
24 }, 25 },
25 null, 26 null,
@@ -28,7 +29,7 @@ export function syntaxTree(ctx: Ctx): Cmd {
28 29
29 vscode.window.onDidChangeActiveTextEditor( 30 vscode.window.onDidChangeActiveTextEditor(
30 (editor: vscode.TextEditor | undefined) => { 31 (editor: vscode.TextEditor | undefined) => {
31 if (!editor || editor.document.languageId !== 'rust') return; 32 if (!editor || !isRustDocument(editor.document)) return;
32 tdcp.eventEmitter.fire(tdcp.uri); 33 tdcp.eventEmitter.fire(tdcp.uri);
33 }, 34 },
34 null, 35 null,
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index 43540e0d8..b4e983a0c 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -3,6 +3,7 @@ import * as lc from 'vscode-languageclient';
3 3
4import { Config } from './config'; 4import { Config } from './config';
5import { createClient } from './client'; 5import { createClient } from './client';
6import { isRustDocument } from './util';
6 7
7export class Ctx { 8export class Ctx {
8 private constructor( 9 private constructor(
@@ -23,11 +24,17 @@ export class Ctx {
23 24
24 get activeRustEditor(): vscode.TextEditor | undefined { 25 get activeRustEditor(): vscode.TextEditor | undefined {
25 const editor = vscode.window.activeTextEditor; 26 const editor = vscode.window.activeTextEditor;
26 return editor && editor.document.languageId === 'rust' 27 return editor && isRustDocument(editor.document)
27 ? editor 28 ? editor
28 : undefined; 29 : undefined;
29 } 30 }
30 31
32 get visibleRustEditors(): vscode.TextEditor[] {
33 return vscode.window.visibleTextEditors.filter(
34 editor => isRustDocument(editor.document),
35 );
36 }
37
31 registerCommand(name: string, factory: (ctx: Ctx) => Cmd) { 38 registerCommand(name: string, factory: (ctx: Ctx) => Cmd) {
32 const fullName = `rust-analyzer.${name}`; 39 const fullName = `rust-analyzer.${name}`;
33 const cmd = factory(this); 40 const cmd = factory(this);
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index d7d0e910b..ea2dfc0e3 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;
diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index 6871bc111..08d3a64a7 100644
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
2import * as ra from './rust-analyzer-api'; 2import * as ra from './rust-analyzer-api';
3 3
4import { Ctx } from './ctx'; 4import { Ctx } from './ctx';
5import { log, sendRequestWithRetry } from './util'; 5import { log, sendRequestWithRetry, isRustDocument } from './util';
6 6
7export function activateInlayHints(ctx: Ctx) { 7export function activateInlayHints(ctx: Ctx) {
8 const hintsUpdater = new HintsUpdater(ctx); 8 const hintsUpdater = new HintsUpdater(ctx);
@@ -15,7 +15,7 @@ export function activateInlayHints(ctx: Ctx) {
15 vscode.workspace.onDidChangeTextDocument( 15 vscode.workspace.onDidChangeTextDocument(
16 async event => { 16 async event => {
17 if (event.contentChanges.length === 0) return; 17 if (event.contentChanges.length === 0) return;
18 if (event.document.languageId !== 'rust') return; 18 if (!isRustDocument(event.document)) return;
19 await hintsUpdater.refresh(); 19 await hintsUpdater.refresh();
20 }, 20 },
21 null, 21 null,
@@ -77,7 +77,7 @@ class HintsUpdater {
77 } 77 }
78 78
79 clear() { 79 clear() {
80 this.allEditors.forEach(it => { 80 this.ctx.visibleRustEditors.forEach(it => {
81 this.setTypeDecorations(it, []); 81 this.setTypeDecorations(it, []);
82 this.setParameterDecorations(it, []); 82 this.setParameterDecorations(it, []);
83 }); 83 });
@@ -85,13 +85,7 @@ class HintsUpdater {
85 85
86 async refresh() { 86 async refresh() {
87 if (!this.enabled) return; 87 if (!this.enabled) return;
88 await Promise.all(this.allEditors.map(it => this.refreshEditor(it))); 88 await Promise.all(this.ctx.visibleRustEditors.map(it => this.refreshEditor(it)));
89 }
90
91 private get allEditors(): vscode.TextEditor[] {
92 return vscode.window.visibleTextEditors.filter(
93 editor => editor.document.languageId === 'rust',
94 );
95 } 89 }
96 90
97 private async refreshEditor(editor: vscode.TextEditor): Promise<void> { 91 private async refreshEditor(editor: vscode.TextEditor): Promise<void> {
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts
index f56c6bada..7c95769bb 100644
--- a/editors/code/src/util.ts
+++ b/editors/code/src/util.ts
@@ -1,6 +1,7 @@
1import * as lc from "vscode-languageclient"; 1import * as lc from "vscode-languageclient";
2import * as vscode from "vscode"; 2import * as vscode from "vscode";
3import { strict as nativeAssert } from "assert"; 3import { strict as nativeAssert } from "assert";
4import { TextDocument } from "vscode";
4 5
5export function assert(condition: boolean, explanation: string): asserts condition { 6export function assert(condition: boolean, explanation: string): asserts condition {
6 try { 7 try {
@@ -65,3 +66,10 @@ export async function sendRequestWithRetry<TParam, TRet>(
65function sleep(ms: number) { 66function sleep(ms: number) {
66 return new Promise(resolve => setTimeout(resolve, ms)); 67 return new Promise(resolve => setTimeout(resolve, ms));
67} 68}
69
70export function isRustDocument(document: TextDocument) {
71 return document.languageId === 'rust'
72 // SCM diff views have the same URI as the on-disk document but not the same content
73 && document.uri.scheme !== 'git'
74 && document.uri.scheme !== 'svn';
75} \ No newline at end of file