From c855e36696afa54260773a6bc8a358df67d60dea Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 18 Feb 2020 12:35:44 +0100
Subject: Rename config value for server Path

---
 editors/code/package.json               | 2 +-
 editors/code/src/config.ts              | 2 +-
 editors/code/src/installation/server.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'editors')

diff --git a/editors/code/package.json b/editors/code/package.json
index 2a0304376..c498c14b4 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -179,7 +179,7 @@
                     "default": {},
                     "description": "Fine grained feature flags to disable annoying features"
                 },
-                "rust-analyzer.raLspServerPath": {
+                "rust-analyzer.serverPath": {
                     "type": [
                         "null",
                         "string"
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 7142f72af..347c989c4 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -111,7 +111,7 @@ export class Config {
     }
 
     get serverSource(): null | BinarySource {
-        const serverPath = RA_LSP_DEBUG ?? this.cfg.get<null | string>("raLspServerPath");
+        const serverPath = RA_LSP_DEBUG ?? this.cfg.get<null | string>("serverPath");
 
         if (serverPath) {
             return {
diff --git a/editors/code/src/installation/server.ts b/editors/code/src/installation/server.ts
index 80cb719e3..6e730fbfc 100644
--- a/editors/code/src/installation/server.ts
+++ b/editors/code/src/installation/server.ts
@@ -29,7 +29,7 @@ export async function ensureServerBinary(source: null | BinarySource): Promise<n
 
             vscode.window.showErrorMessage(
                 `Unable to run ${source.path} binary. ` +
-                `To use the pre-built language server, set "rust-analyzer.raLspServerPath" ` +
+                `To use the pre-built language server, set "rust-analyzer.serverPath" ` +
                 "value to `null` or remove it from the settings to use it by default."
             );
             return null;
-- 
cgit v1.2.3