diff --git a/docs/dev/README.md b/docs/dev/README.md index 9da2eb0144..8d7e180109 100644 --- a/docs/dev/README.md +++ b/docs/dev/README.md @@ -92,7 +92,7 @@ launch configuration from `launch.json`. Notably, this uses the usual in `setting.json` file: ```json { - "rust-analyzer.raLspServerPath": "rust-analyzer" + "rust-analyzer.serverPath": "rust-analyzer" } ``` After I am done with the fix, I use `cargo diff --git a/docs/user/readme.adoc b/docs/user/readme.adoc index aa1994b492..74fda0abef 100644 --- a/docs/user/readme.adoc +++ b/docs/user/readme.adoc @@ -64,7 +64,7 @@ To make VS Code use the freshly build server, add this to the settings: [source,json] ---- -{ "rust-analyzer.raLspServerPath": "rust-analyzer" } +{ "rust-analyzer.serverPath": "rust-analyzer" } ---- Note that installing via `xtask install` does not work for VS Code Remote, instead you'll need to install the `.vsix` manually. @@ -102,7 +102,7 @@ The are several LSP client implementations for vim: 2. Run `:CocInstall coc-rust-analyzer` to install https://github.com/fannheyward/coc-rust-analyzer[coc-rust-analyzer], this extension implements _most_ of the features supported in the VSCode extension: - * same configurations as VSCode extension, `rust-analyzer.raLspServerPath`, `rust-analyzer.enableCargoWatchOnStartup` etc. + * same configurations as VSCode extension, `rust-analyzer.serverPath`, `rust-analyzer.enableCargoWatchOnStartup` etc. * same commands too, `rust-analyzer.analyzerStatus`, `rust-analyzer.startCargoWatch` etc. * highlighting and inlay_hints are not implemented yet diff --git a/editors/code/package.json b/editors/code/package.json index 2a03043763..c498c14b42 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 7142f72af2..347c989c45 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("raLspServerPath"); + const serverPath = RA_LSP_DEBUG ?? this.cfg.get("serverPath"); if (serverPath) { return { diff --git a/editors/code/src/installation/server.ts b/editors/code/src/installation/server.ts index 80cb719e36..6e730fbfcb 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