Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-12 13:18:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename config value for server Path

Browse source
This commit is contained in:
Aleksey Kladov 2020-02-18 12:35:44 +01:00
parent c0fa5e2246
commit c855e36696
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/dev/README.md
View file

@ -92,7 +92,7 @@ launch configuration from `launch.json`. Notably, this uses the usual
in `setting.json` file: in `setting.json` file:
```json ```json
{ {
"rust-analyzer.raLspServerPath": "rust-analyzer" "rust-analyzer.serverPath": "rust-analyzer"
} }
``` ```
After I am done with the fix, I use `cargo After I am done with the fix, I use `cargo

4
docs/user/readme.adoc
View file

@ -64,7 +64,7 @@ To make VS Code use the freshly build server, add this to the settings:
[source,json] [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. 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 2. Run `:CocInstall coc-rust-analyzer` to install
https://github.com/fannheyward/coc-rust-analyzer[coc-rust-analyzer], https://github.com/fannheyward/coc-rust-analyzer[coc-rust-analyzer],
this extension implements _most_ of the features supported in the VSCode extension: 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. * same commands too, `rust-analyzer.analyzerStatus`, `rust-analyzer.startCargoWatch` etc.
* highlighting and inlay_hints are not implemented yet * highlighting and inlay_hints are not implemented yet

2
editors/code/package.json
View file

@ -179,7 +179,7 @@
"default": {}, "default": {},
"description": "Fine grained feature flags to disable annoying features" "description": "Fine grained feature flags to disable annoying features"
}, },
"rust-analyzer.raLspServerPath": { "rust-analyzer.serverPath": {
"type": [ "type": [
"null", "null",
"string" "string"

2
editors/code/src/config.ts
View file

@ -111,7 +111,7 @@ export class Config {
} }
get serverSource(): null | BinarySource { 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) { if (serverPath) {
return { return {

2
editors/code/src/installation/server.ts
View file

@ -29,7 +29,7 @@ export async function ensureServerBinary(source: null | BinarySource): Promise<n
vscode.window.showErrorMessage( vscode.window.showErrorMessage(
`Unable to run ${source.path} binary. ` + `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." "value to `null` or remove it from the settings to use it by default."
); );
return null; return null;

2
xtask/src/install.rs
View file

@ -39,7 +39,7 @@ impl InstallCmd {
" "
Installation complete. Installation complete.
Add `\"rust-analyzer.raLspServerPath\": \"rust-analyzer\",` to VS Code settings, Add `\"rust-analyzer.serverPath\": \"rust-analyzer\",` to VS Code settings,
otherwise it will use the latest release from GitHub. otherwise it will use the latest release from GitHub.
" "
) )