diff options
author | Aleksey Kladov <[email protected]> | 2020-02-18 11:35:44 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-02-18 11:35:44 +0000 |
commit | c855e36696afa54260773a6bc8a358df67d60dea (patch) | |
tree | dfd4d8d71924d3281e3c5dc17840ac3db38e2dcb | |
parent | c0fa5e2246457df10e92c2e11c971f2f40921793 (diff) |
Rename config value for server Path
-rw-r--r-- | docs/dev/README.md | 2 | ||||
-rw-r--r-- | docs/user/readme.adoc | 4 | ||||
-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 | ||||
-rw-r--r-- | xtask/src/install.rs | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/docs/dev/README.md b/docs/dev/README.md index 9da2eb014..8d7e18010 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 | |||
92 | in `setting.json` file: | 92 | in `setting.json` file: |
93 | ```json | 93 | ```json |
94 | { | 94 | { |
95 | "rust-analyzer.raLspServerPath": "rust-analyzer" | 95 | "rust-analyzer.serverPath": "rust-analyzer" |
96 | } | 96 | } |
97 | ``` | 97 | ``` |
98 | After I am done with the fix, I use `cargo | 98 | After I am done with the fix, I use `cargo |
diff --git a/docs/user/readme.adoc b/docs/user/readme.adoc index aa1994b49..74fda0abe 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: | |||
64 | 64 | ||
65 | [source,json] | 65 | [source,json] |
66 | ---- | 66 | ---- |
67 | { "rust-analyzer.raLspServerPath": "rust-analyzer" } | 67 | { "rust-analyzer.serverPath": "rust-analyzer" } |
68 | ---- | 68 | ---- |
69 | 69 | ||
70 | Note that installing via `xtask install` does not work for VS Code Remote, instead you'll need to install the `.vsix` manually. | 70 | 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: | |||
102 | 2. Run `:CocInstall coc-rust-analyzer` to install | 102 | 2. Run `:CocInstall coc-rust-analyzer` to install |
103 | https://github.com/fannheyward/coc-rust-analyzer[coc-rust-analyzer], | 103 | https://github.com/fannheyward/coc-rust-analyzer[coc-rust-analyzer], |
104 | this extension implements _most_ of the features supported in the VSCode extension: | 104 | this extension implements _most_ of the features supported in the VSCode extension: |
105 | * same configurations as VSCode extension, `rust-analyzer.raLspServerPath`, `rust-analyzer.enableCargoWatchOnStartup` etc. | 105 | * same configurations as VSCode extension, `rust-analyzer.serverPath`, `rust-analyzer.enableCargoWatchOnStartup` etc. |
106 | * same commands too, `rust-analyzer.analyzerStatus`, `rust-analyzer.startCargoWatch` etc. | 106 | * same commands too, `rust-analyzer.analyzerStatus`, `rust-analyzer.startCargoWatch` etc. |
107 | * highlighting and inlay_hints are not implemented yet | 107 | * highlighting and inlay_hints are not implemented yet |
108 | 108 | ||
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; |
diff --git a/xtask/src/install.rs b/xtask/src/install.rs index 247a2bca4..cc6fecc85 100644 --- a/xtask/src/install.rs +++ b/xtask/src/install.rs | |||
@@ -39,7 +39,7 @@ impl InstallCmd { | |||
39 | " | 39 | " |
40 | Installation complete. | 40 | Installation complete. |
41 | 41 | ||
42 | Add `\"rust-analyzer.raLspServerPath\": \"rust-analyzer\",` to VS Code settings, | 42 | Add `\"rust-analyzer.serverPath\": \"rust-analyzer\",` to VS Code settings, |
43 | otherwise it will use the latest release from GitHub. | 43 | otherwise it will use the latest release from GitHub. |
44 | " | 44 | " |
45 | ) | 45 | ) |