From 7252babc136b351d5011a78878607c7aaeea5ed8 Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Sun, 9 Aug 2020 17:57:27 -0400
Subject: Remove workaround for semantic token flickering
See: https://github.com/microsoft/vscode-languageserver-node/issues/576#issuecomment-593384479
This has been fixed since vscode 1.44
---
editors/code/src/client.ts | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
(limited to 'editors/code/src')
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 18948cb3c..bd7a150f0 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -4,7 +4,7 @@ import * as ra from '../src/lsp_ext';
import * as Is from 'vscode-languageclient/lib/utils/is';
import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed';
-import { SemanticTokensFeature, DocumentSemanticsTokensSignature } from 'vscode-languageclient/lib/semanticTokens.proposed';
+import { SemanticTokensFeature } from 'vscode-languageclient/lib/semanticTokens.proposed';
import { assert } from './util';
function renderCommand(cmd: ra.CommandLink) {
@@ -44,12 +44,6 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
diagnosticCollectionName: "rustc",
traceOutputChannel,
middleware: {
- // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576
- async provideDocumentSemanticTokens(document: vscode.TextDocument, token: vscode.CancellationToken, next: DocumentSemanticsTokensSignature) {
- const res = await next(document, token);
- if (res === undefined) throw new Error('busy');
- return res;
- },
async provideHover(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, _next: lc.ProvideHoverSignature) {
return client.sendRequest(lc.HoverRequest.type, client.code2ProtocolConverter.asTextDocumentPositionParams(document, position), token).then(
(result) => {
--
cgit v1.2.3
From 58c97bdcbf6d7df218028f75373cfc4916043693 Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Sun, 9 Aug 2020 18:09:27 -0400
Subject: Remove 'as any'
---
editors/code/src/client.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'editors/code/src')
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index bd7a150f0..f5db55b8c 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -129,7 +129,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
);
}
- } as any
+ }
};
const client = new lc.LanguageClient(
--
cgit v1.2.3