3 files changed, 40 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..3440aa0c3
--- /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 { Decoration } from '../highlighting';
+import { Server } from '../server';
+
+export async function handle(editor: TextEditor | undefined) {
+    if (!Server.config.highlightingOn || !editor || editor.document.languageId !== 'rust') { return; }
+    const params: TextDocumentIdentifier = {
+        uri: editor.document.uri.toString(),
+    };
+    const decorations = await Server.client.sendRequest<Decoration[]>('m/decorationsRequest', params);
+    Server.highlighter.setHighlights(editor, decorations);
+}
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..b3000e026
--- /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) => {
+        const 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);
+}
diff --git a/editors/code/src/events/index.ts b/editors/code/src/events/index.ts
new file mode 100644
index 000000000..b570a7a92
--- /dev/null
+++ b/editors/code/src/events/index.ts
@@ -0,0 +1,7 @@
+import * as changeActiveTextEditor from './change_active_text_editor';
+import * as changeTextDocument from './change_text_document';
+
+export {
+    changeActiveTextEditor,
+    changeTextDocument,
+};