diff options
Diffstat (limited to 'editors/code')
-rw-r--r-- | editors/code/package.json | 2 | ||||
-rw-r--r-- | editors/code/src/config.ts | 2 | ||||
-rw-r--r-- | editors/code/src/installation/server.ts | 2 |
3 files changed, 3 insertions, 3 deletions
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 @@ | |||
179 | "default": {}, | 179 | "default": {}, |
180 | "description": "Fine grained feature flags to disable annoying features" | 180 | "description": "Fine grained feature flags to disable annoying features" |
181 | }, | 181 | }, |
182 | "rust-analyzer.raLspServerPath": { | 182 | "rust-analyzer.serverPath": { |
183 | "type": [ | 183 | "type": [ |
184 | "null", | 184 | "null", |
185 | "string" | 185 | "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 { | |||
111 | } | 111 | } |
112 | 112 | ||
113 | get serverSource(): null | BinarySource { | 113 | get serverSource(): null | BinarySource { |
114 | const serverPath = RA_LSP_DEBUG ?? this.cfg.get<null | string>("raLspServerPath"); | 114 | const serverPath = RA_LSP_DEBUG ?? this.cfg.get<null | string>("serverPath"); |
115 | 115 | ||
116 | if (serverPath) { | 116 | if (serverPath) { |
117 | return { | 117 | 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 | |||
29 | 29 | ||
30 | vscode.window.showErrorMessage( | 30 | vscode.window.showErrorMessage( |
31 | `Unable to run ${source.path} binary. ` + | 31 | `Unable to run ${source.path} binary. ` + |
32 | `To use the pre-built language server, set "rust-analyzer.raLspServerPath" ` + | 32 | `To use the pre-built language server, set "rust-analyzer.serverPath" ` + |
33 | "value to `null` or remove it from the settings to use it by default." | 33 | "value to `null` or remove it from the settings to use it by default." |
34 | ); | 34 | ); |
35 | return null; | 35 | return null; |