Merge #2709

2709: Work around synchrnonisation issue r=matklad a=matklad



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

1 files changed, 90 insertions, 0 deletions

diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
new file mode 100644
index 000000000..94948b10f
--- /dev/null
+++ b/editors/code/src/client.ts
@@ -0,0 +1,90 @@
+import { homedir } from 'os';
+import * as lc from 'vscode-languageclient';
+
+import { window, workspace } from 'vscode';
+import { Config } from './config';
+
+export function createClient(config: Config): lc.LanguageClient {
+    // '.' Is the fallback if no folder is open
+    // TODO?: Workspace folders support Uri's (eg: file://test.txt). It might be a good idea to test if the uri points to a file.
+    let folder: string = '.';
+    if (workspace.workspaceFolders !== undefined) {
+        folder = workspace.workspaceFolders[0].uri.fsPath.toString();
+    }
+
+    const command = expandPathResolving(config.raLspServerPath);
+    const run: lc.Executable = {
+        command,
+        options: { cwd: folder },
+    };
+    const serverOptions: lc.ServerOptions = {
+        run,
+        debug: run,
+    };
+    const traceOutputChannel = window.createOutputChannel(
+        'Rust Analyzer Language Server Trace',
+    );
+    const clientOptions: lc.LanguageClientOptions = {
+        documentSelector: [{ scheme: 'file', language: 'rust' }],
+        initializationOptions: {
+            publishDecorations: true,
+            lruCapacity: config.lruCapacity,
+            maxInlayHintLength: config.maxInlayHintLength,
+            cargoWatchEnable: config.cargoWatchOptions.enable,
+            cargoWatchArgs: config.cargoWatchOptions.arguments,
+            cargoWatchCommand: config.cargoWatchOptions.command,
+            cargoWatchAllTargets:
+                config.cargoWatchOptions.allTargets,
+            excludeGlobs: config.excludeGlobs,
+            useClientWatching: config.useClientWatching,
+            featureFlags: config.featureFlags,
+            withSysroot: config.withSysroot,
+            cargoFeatures: config.cargoFeatures,
+        },
+        traceOutputChannel,
+    };
+
+    const res = new lc.LanguageClient(
+        'rust-analyzer',
+        'Rust Analyzer Language Server',
+        serverOptions,
+        clientOptions,
+    );
+
+    // HACK: This is an awful way of filtering out the decorations notifications
+    // However, pending proper support, this is the most effecitve approach
+    // Proper support for this would entail a change to vscode-languageclient to allow not notifying on certain messages
+    // Or the ability to disable the serverside component of highlighting (but this means that to do tracing we need to disable hihlighting)
+    // This also requires considering our settings strategy, which is work which needs doing
+    // @ts-ignore The tracer is private to vscode-languageclient, but we need access to it to not log publishDecorations requests
+    res._tracer = {
+        log: (messageOrDataObject: string | any, data?: string) => {
+            if (typeof messageOrDataObject === 'string') {
+                if (
+                    messageOrDataObject.includes(
+                        'rust-analyzer/publishDecorations',
+                    ) ||
+                    messageOrDataObject.includes(
+                        'rust-analyzer/decorationsRequest',
+                    )
+                ) {
+                    // Don't log publish decorations requests
+                } else {
+                    // @ts-ignore This is just a utility function
+                    res.logTrace(messageOrDataObject, data);
+                }
+            } else {
+                // @ts-ignore
+                res.logObjectTrace(messageOrDataObject);
+            }
+        },
+    };
+    res.registerProposedFeatures()
+    return res;
+}
+function expandPathResolving(path: string) {
+    if (path.startsWith('~/')) {
+        return path.replace('~', homedir());
+    }
+    return path;
+}