Merge pull request #19937 from Veykril/push-rvnylnlnxxyr
fix: Record macro calls for fields in `ChildBySource` impls
diff --git a/crates/ide-diagnostics/src/handlers/unlinked_file.rs b/crates/ide-diagnostics/src/handlers/unlinked_file.rs
index af9126c..d96c658 100644
--- a/crates/ide-diagnostics/src/handlers/unlinked_file.rs
+++ b/crates/ide-diagnostics/src/handlers/unlinked_file.rs
@@ -69,6 +69,7 @@
FileRange { file_id, range },
)
.with_unused(unused)
+ .stable()
.with_fixes(fixes),
);
}
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 96be672..5cbea9c 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -1597,6 +1597,16 @@
term_search_borrowck: self.assist_termSearch_borrowcheck(source_root).to_owned(),
}
}
+
+ pub fn diagnostic_fixes(&self, source_root: Option<SourceRootId>) -> DiagnosticsConfig {
+ // We always want to show quickfixes for diagnostics, even when diagnostics/experimental diagnostics are disabled.
+ DiagnosticsConfig {
+ enabled: true,
+ disable_experimental: false,
+ ..self.diagnostics(source_root)
+ }
+ }
+
pub fn expand_proc_attr_macros(&self) -> bool {
self.procMacro_enable().to_owned() && self.procMacro_attributes_enable().to_owned()
}
diff --git a/crates/rust-analyzer/src/handlers/request.rs b/crates/rust-analyzer/src/handlers/request.rs
index 69983a6..6d46ce6 100644
--- a/crates/rust-analyzer/src/handlers/request.rs
+++ b/crates/rust-analyzer/src/handlers/request.rs
@@ -1439,7 +1439,7 @@
};
let assists = snap.analysis.assists_with_fixes(
&assists_config,
- &snap.config.diagnostics(Some(source_root)),
+ &snap.config.diagnostic_fixes(Some(source_root)),
resolve,
frange,
)?;
@@ -1530,7 +1530,7 @@
let assists = snap.analysis.assists_with_fixes(
&assists_config,
- &snap.config.diagnostics(Some(source_root)),
+ &snap.config.diagnostic_fixes(Some(source_root)),
AssistResolveStrategy::Single(assist_resolve),
frange,
)?;
