2 files changed, 33 insertions, 0 deletions

diff --git a/editors/code/src/events/change_active_text_editor.ts b/editors/code/src/events/change_active_text_editor.ts
new file mode 100644
index 000000000..bbdd53098
--- /dev/null
+++ b/editors/code/src/events/change_active_text_editor.ts
@@ -0,0 +1,14 @@
+import { TextEditor } from "vscode";
+import { TextDocumentIdentifier } from "vscode-languageclient";
+
+import { Server } from "../server";
+import { Decoration } from "../highlighting";
+
+export async function handle(editor: TextEditor | undefined) {
+    if (!Server.config.highlightingOn || !editor || editor.document.languageId != 'rust') return
+    let params: TextDocumentIdentifier = {
+        uri: editor.document.uri.toString()
+    }
+    let decorations = await Server.client.sendRequest<Decoration[]>("m/decorationsRequest", params)
+    Server.highlighter.setHighlights(editor, decorations)
+}
\ No newline at end of file
diff --git a/editors/code/src/events/change_text_document.ts b/editors/code/src/events/change_text_document.ts
new file mode 100644
index 000000000..83ee6c9ee
--- /dev/null
+++ b/editors/code/src/events/change_text_document.ts
@@ -0,0 +1,19 @@
+import * as vscode from 'vscode';
+
+import { syntaxTreeUri, TextDocumentContentProvider } from '../commands/syntaxTree';
+
+export function createHandler(textDocumentContentProvider: TextDocumentContentProvider) {
+    return (event: vscode.TextDocumentChangeEvent) => {
+        let doc = event.document
+        if (doc.languageId != "rust") return
+        afterLs(() => {
+            textDocumentContentProvider.eventEmitter.fire(syntaxTreeUri);
+        })
+    }
+}
+
+// We need to order this after LS updates, but there's no API for that.
+// Hence, good old setTimeout.
+function afterLs(f: () => any) {
+    setTimeout(f, 10)
+}