about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-12-23 07:47:40 +0000
committerGitHub <noreply@github.com>2020-12-23 07:47:40 +0000
commit58b6763f206b80a3000eb3c7642181fa5fb98229 (patch)
tree65c66a9bec9b74049ca588ffb3d4a47337486280
parentf7f85cdd8d0660e3556c15864efd6158f114e343 (diff)
parent7c07bb63814671f88677c08ddd75862338e40330 (diff)
Merge #7012
7012: Document, how to view config in effect r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
-rw-r--r--crates/rust-analyzer/src/config.rs4
-rw-r--r--docs/user/manual.adoc3
2 files changed, 5 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 11cdae57f77..1db5b4e7dd9 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -349,12 +349,12 @@ impl Config {
         res
     }
     pub fn update(&mut self, json: serde_json::Value) {
-        log::info!("Config::update({:#})", json);
+        log::info!("updating config from JSON: {:#}", json);
         if json.is_null() || json.as_object().map_or(false, |it| it.is_empty()) {
             return;
         }
         self.do_update(json);
-        log::info!("Config::update() = {:#?}", self);
+        log::info!("updated config: {:#?}", self);
     }
     fn do_update(&mut self, json: serde_json::Value) {
         let data = ConfigData::from_json(json);
diff --git a/docs/user/manual.adoc b/docs/user/manual.adoc
index 40f10972f42..e3082d5842d 100644
--- a/docs/user/manual.adoc
+++ b/docs/user/manual.adoc
@@ -302,6 +302,9 @@ If the LSP binary is not available, GNOME Builder can install it when opening a
 rust-analyzer is configured via LSP messages, which means that it's up to the editor to decide on the exact format and location of configuration files.
 Please consult your editor's documentation to learn how to configure LSP servers.
 
+To verify which configuration is actually used by rust-analyzer, set `RA_LOG` environment variable to `rust_analyzer=info` and look for config-related messages.
+Logs should show both the JSON that rust-analyzer sees as well as the updated config.
+
 This is the list of config options rust-analyzer supports:
 
 include::./generated_config.adoc[]