language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-29 10:58:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Always include quickfixes for diagnostics, even when diagnostics are disabled

Browse source
This commit is contained in:
Chayim Refael Friedman 2025-06-06 03:52:32 +03:00
parent d5665e5ca7
commit 869714aae0
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1597,6 +1597,16 @@ impl Config {
term_search_borrowck: self.assist_termSearch_borrowcheck(source_root).to_owned(), 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 { pub fn expand_proc_attr_macros(&self) -> bool {
self.procMacro_enable().to_owned() && self.procMacro_attributes_enable().to_owned() self.procMacro_enable().to_owned() && self.procMacro_attributes_enable().to_owned()
} }

4
crates/rust-analyzer/src/handlers/request.rs
View file

@ -1439,7 +1439,7 @@ pub(crate) fn handle_code_action(
}; };
let assists = snap.analysis.assists_with_fixes( let assists = snap.analysis.assists_with_fixes(
&assists_config, &assists_config,
&snap.config.diagnostics(Some(source_root)), &snap.config.diagnostic_fixes(Some(source_root)),
resolve, resolve,
frange, frange,
)?; )?;
@ -1530,7 +1530,7 @@ pub(crate) fn handle_code_action_resolve(
let assists = snap.analysis.assists_with_fixes( let assists = snap.analysis.assists_with_fixes(
&assists_config, &assists_config,
&snap.config.diagnostics(Some(source_root)), &snap.config.diagnostic_fixes(Some(source_root)),
AssistResolveStrategy::Single(assist_resolve), AssistResolveStrategy::Single(assist_resolve),
frange, frange,
)?; )?;