language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

internal: Expose snippet capability to diagnostic quickfixes

Browse source
This commit is contained in:
DropDemBits 2024-06-07 21:29:48 -04:00
parent a8ad08b9b2
commit 4e6d908382
No known key found for this signature in database
GPG key ID: 7FE02A6C1EDFA075
5 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ide-diagnostics/src/lib.rs
View file

@ -86,7 +86,7 @@ use ide_db::{
label::Label, label::Label,
source_change::SourceChange, source_change::SourceChange,
syntax_helpers::node_ext::parse_tt_as_comma_sep_paths, syntax_helpers::node_ext::parse_tt_as_comma_sep_paths,
FxHashMap, FxHashSet, RootDatabase, FxHashMap, FxHashSet, RootDatabase, SnippetCap,
}; };
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use stdx::never; use stdx::never;
@ -229,6 +229,7 @@ pub struct DiagnosticsConfig {
pub expr_fill_default: ExprFillDefaultMode, pub expr_fill_default: ExprFillDefaultMode,
pub style_lints: bool, pub style_lints: bool,
// FIXME: We may want to include a whole `AssistConfig` here // FIXME: We may want to include a whole `AssistConfig` here
pub snippet_cap: Option<SnippetCap>,
pub insert_use: InsertUseConfig, pub insert_use: InsertUseConfig,
pub prefer_no_std: bool, pub prefer_no_std: bool,
pub prefer_prelude: bool, pub prefer_prelude: bool,
@ -248,6 +249,7 @@ impl DiagnosticsConfig {
disabled: Default::default(), disabled: Default::default(),
expr_fill_default: Default::default(), expr_fill_default: Default::default(),
style_lints: true, style_lints: true,
snippet_cap: SnippetCap::new(true),
insert_use: InsertUseConfig { insert_use: InsertUseConfig {
granularity: ImportGranularity::Preserve, granularity: ImportGranularity::Preserve,
enforce_granularity: false, enforce_granularity: false,

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

@ -223,7 +223,7 @@ fn code_action_capabilities(client_caps: &ClientCapabilities) -> CodeActionProvi
fn more_trigger_character(config: &Config) -> Vec<String> { fn more_trigger_character(config: &Config) -> Vec<String> {
let mut res = vec![".".to_owned(), ">".to_owned(), "{".to_owned(), "(".to_owned()]; let mut res = vec![".".to_owned(), ">".to_owned(), "{".to_owned(), "(".to_owned()];
if config.snippet_cap() { if config.snippet_cap().is_some() {
res.push("<".to_owned()); res.push("<".to_owned());
} }
res res

3
crates/rust-analyzer/src/cli/analysis_stats.rs
View file

@ -25,7 +25,7 @@ use ide_db::{
salsa::{self, debug::DebugQueryTable, ParallelDatabase}, salsa::{self, debug::DebugQueryTable, ParallelDatabase},
SourceDatabase, SourceDatabaseExt, SourceDatabase, SourceDatabaseExt,
}, },
LineIndexDatabase, LineIndexDatabase, SnippetCap,
}; };
use itertools::Itertools; use itertools::Itertools;
use load_cargo::{load_workspace, LoadCargoConfig, ProcMacroServerChoice}; use load_cargo::{load_workspace, LoadCargoConfig, ProcMacroServerChoice};
@ -982,6 +982,7 @@ impl flags::AnalysisStats {
disable_experimental: false, disable_experimental: false,
disabled: Default::default(), disabled: Default::default(),
expr_fill_default: Default::default(), expr_fill_default: Default::default(),
snippet_cap: SnippetCap::new(true),
insert_use: ide_db::imports::insert_use::InsertUseConfig { insert_use: ide_db::imports::insert_use::InsertUseConfig {
granularity: ide_db::imports::insert_use::ImportGranularity::Crate, granularity: ide_db::imports::insert_use::ImportGranularity::Crate,
enforce_granularity: true, enforce_granularity: true,

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

@ -1261,7 +1261,7 @@ impl Config {
impl Config { impl Config {
pub fn assist(&self, source_root: Option<SourceRootId>) -> AssistConfig { pub fn assist(&self, source_root: Option<SourceRootId>) -> AssistConfig {
AssistConfig { AssistConfig {
snippet_cap: SnippetCap::new(self.experimental("snippetTextEdit")), snippet_cap: self.snippet_cap(),
allowed: None, allowed: None,
insert_use: self.insert_use_config(source_root), insert_use: self.insert_use_config(source_root),
prefer_no_std: self.imports_preferNoStd(source_root).to_owned(), prefer_no_std: self.imports_preferNoStd(source_root).to_owned(),
@ -1321,6 +1321,7 @@ impl Config {
ExprFillDefaultDef::Todo => ExprFillDefaultMode::Todo, ExprFillDefaultDef::Todo => ExprFillDefaultMode::Todo,
ExprFillDefaultDef::Default => ExprFillDefaultMode::Default, ExprFillDefaultDef::Default => ExprFillDefaultMode::Default,
}, },
snippet_cap: self.snippet_cap(),
insert_use: self.insert_use_config(source_root), insert_use: self.insert_use_config(source_root),
prefer_no_std: self.imports_preferNoStd(source_root).to_owned(), prefer_no_std: self.imports_preferNoStd(source_root).to_owned(),
prefer_prelude: self.imports_preferPrelude(source_root).to_owned(), prefer_prelude: self.imports_preferPrelude(source_root).to_owned(),
@ -2007,8 +2008,10 @@ impl Config {
*self.references_excludeTests() *self.references_excludeTests()
} }
pub fn snippet_cap(&self) -> bool { pub fn snippet_cap(&self) -> Option<SnippetCap> {
self.experimental("snippetTextEdit") // FIXME: Also detect the proposed lsp version at caps.workspace.workspaceEdit.snippetEditSupport
// once lsp-types has it.
SnippetCap::new(self.experimental("snippetTextEdit"))
} }
pub fn call_info(&self) -> CallInfoConfig { pub fn call_info(&self) -> CallInfoConfig {

1
crates/rust-analyzer/src/integrated_benchmarks.rs
View file

@ -289,6 +289,7 @@ fn integrated_diagnostics_benchmark() {
disabled: Default::default(), disabled: Default::default(),
expr_fill_default: Default::default(), expr_fill_default: Default::default(),
style_lints: false, style_lints: false,
snippet_cap: SnippetCap::new(true),
insert_use: InsertUseConfig { insert_use: InsertUseConfig {
granularity: ImportGranularity::Crate, granularity: ImportGranularity::Crate,
enforce_granularity: false, enforce_granularity: false,