Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #12171 - lnicola:proc-macros-dont-invalidate-state, r=Veykril
fix: Try not to invalidate state when the proc macro preference didn't change This appears to fix #12027, but I'm not sure.
bors 2022-05-06
parent 616796a · parent 97cdf3e · commit db1434b
-rw-r--r--crates/rust-analyzer/src/reload.rs11
1 files changed, 7 insertions, 4 deletions
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index c2a6a3fe30..c2a521bbf5 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -55,10 +55,13 @@ impl GlobalState {
self.reload_flycheck();
}
- // Apply experimental feature flags.
- self.analysis_host
- .raw_database_mut()
- .set_enable_proc_attr_macros(self.config.expand_proc_attr_macros());
+ if self.analysis_host.raw_database().enable_proc_attr_macros()
+ != self.config.expand_proc_attr_macros()
+ {
+ self.analysis_host
+ .raw_database_mut()
+ .set_enable_proc_attr_macros(self.config.expand_proc_attr_macros());
+ }
}
pub(crate) fn current_status(&self) -> lsp_ext::ServerStatusParams {