From ee2bc73d2a8bb5479019609b495c65d1d6132d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Sun, 8 Dec 2019 21:08:46 +0200
Subject: Code: don't check for ra_lsp_server on Windows
---
editors/code/src/server.ts | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
(limited to 'editors/code/src')
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index e717ab294..b346c0828 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -1,5 +1,5 @@
import { lookpath } from 'lookpath';
-import { homedir } from 'os';
+import { homedir, platform } from 'os';
import * as lc from 'vscode-languageclient';
import { window, workspace } from 'vscode';
@@ -29,10 +29,14 @@ export class Server {
}
const command = expandPathResolving(this.config.raLspServerPath);
- if (!(await lookpath(command))) {
- throw new Error(
- `Cannot find rust-analyzer server \`${command}\` in PATH.`
- );
+ // FIXME: remove check when the following issue is fixed:
+ // https://github.com/otiai10/lookpath/issues/4
+ if (platform() !== 'win32') {
+ if (!(await lookpath(command))) {
+ throw new Error(
+ `Cannot find rust-analyzer server \`${command}\` in PATH.`
+ );
+ }
}
const run: lc.Executable = {
command,
--
cgit v1.2.3