Merge #3339

3339: Fix flickering with new syntax highlighting r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 9 insertions, 1 deletions

diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 44bd04c21..1f90af898 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -3,7 +3,7 @@ import * as vscode from 'vscode';
 
 import { Config } from './config';
 import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed';
-import { SemanticTokensFeature } from 'vscode-languageclient/lib/semanticTokens.proposed';
+import { SemanticTokensFeature, DocumentSemanticsTokensSignature } from 'vscode-languageclient/lib/semanticTokens.proposed';
 
 export async function createClient(config: Config, serverPath: string): Promise<lc.LanguageClient> {
     // '.' Is the fallback if no folder is open
@@ -42,6 +42,14 @@ export async function createClient(config: Config, serverPath: string): Promise<
             rustfmtArgs: config.rustfmtArgs,
         },
         traceOutputChannel,
+        middleware: {
+            // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576
+            async provideDocumentSemanticTokens(document: vscode.TextDocument, token: vscode.CancellationToken, next: DocumentSemanticsTokensSignature) {
+                let res = await next(document, token);
+                if (res === undefined) throw new Error('busy');
+                return res;
+            }
+        } as any
     };
 
     const res = new lc.LanguageClient(