about summary refs log tree commit diff
path: root/editors/code
diff options
context:
space:
mode:
authorAleksey Kladov <aleksey.kladov@gmail.com>2020-02-18 12:35:44 +0100
committerAleksey Kladov <aleksey.kladov@gmail.com>2020-02-18 12:35:44 +0100
commitc855e36696afa54260773a6bc8a358df67d60dea (patch)
treedfd4d8d71924d3281e3c5dc17840ac3db38e2dcb /editors/code
parentc0fa5e2246457df10e92c2e11c971f2f40921793 (diff)
downloadrust-c855e36696afa54260773a6bc8a358df67d60dea.tar.gz
rust-c855e36696afa54260773a6bc8a358df67d60dea.zip
Rename config value for server Path
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/package.json2
-rw-r--r--editors/code/src/config.ts2
-rw-r--r--editors/code/src/installation/server.ts2
3 files changed, 3 insertions, 3 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 2a03043763c..c498c14b429 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 7142f72af28..347c989c455 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 80cb719e367..6e730fbfcb3 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;