Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-27 20:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow client to respond to workspace/configuration with null values

Browse source 
This is allowed per the spec if the client doesn't know about the configuration
we've requested.
This commit is contained in:
kjeremy 2020-07-20 17:25:48 -04:00
parent 76c1fac9c3
commit adc4bb5406
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/rust-analyzer/src/config.rs
View file

@ -177,6 +177,11 @@ impl Config {
pub fn update(&mut self, json: serde_json::Value) { pub fn update(&mut self, json: serde_json::Value) {
log::info!("Config::update({:#})", json); log::info!("Config::update({:#})", json);
if json.is_null() {
return;
}
let data = ConfigData::from_json(json); let data = ConfigData::from_json(json);
self.with_sysroot = data.withSysroot; self.with_sysroot = data.withSysroot;

2
crates/rust-analyzer/src/main_loop.rs
View file

@ -468,6 +468,8 @@ impl GlobalState {
} }
(None, Some(mut configs)) => { (None, Some(mut configs)) => {
if let Some(json) = configs.get_mut(0) { if let Some(json) = configs.get_mut(0) {
// Note that json can be null according to the spec if the client can't
// provide a configuration. This is handled in Config::update below.
let mut config = this.config.clone(); let mut config = this.config.clone();
config.update(json.take()); config.update(json.take());
this.update_configuration(config); this.update_configuration(config);