diff --git a/src/tools/rust-analyzer/crates/ide-completion/src/config.rs b/src/tools/rust-analyzer/crates/ide-completion/src/config.rs index 1d05419c96dea..0d403f49b7a87 100644 --- a/src/tools/rust-analyzer/crates/ide-completion/src/config.rs +++ b/src/tools/rust-analyzer/crates/ide-completion/src/config.rs @@ -7,7 +7,7 @@ use hir::ImportPathConfig; use ide_db::{imports::insert_use::InsertUseConfig, SnippetCap}; -use crate::{snippet::Snippet, CompletionFieldsToResolve}; +use crate::snippet::Snippet; #[derive(Clone, Debug, PartialEq, Eq)] pub struct CompletionConfig { @@ -27,7 +27,6 @@ pub struct CompletionConfig { pub prefer_absolute: bool, pub snippets: Vec, pub limit: Option, - pub fields_to_resolve: CompletionFieldsToResolve, } #[derive(Clone, Debug, PartialEq, Eq)] diff --git a/src/tools/rust-analyzer/crates/ide-completion/src/lib.rs b/src/tools/rust-analyzer/crates/ide-completion/src/lib.rs index a78976d3fd8b8..58d1fad09504f 100644 --- a/src/tools/rust-analyzer/crates/ide-completion/src/lib.rs +++ b/src/tools/rust-analyzer/crates/ide-completion/src/lib.rs @@ -37,31 +37,6 @@ pub use crate::{ snippet::{Snippet, SnippetScope}, }; -#[derive(Copy, Clone, Debug, PartialEq, Eq)] -pub struct CompletionFieldsToResolve { - pub resolve_label_details: bool, - pub resolve_tags: bool, - pub resolve_detail: bool, - pub resolve_documentation: bool, - pub resolve_filter_text: bool, - pub resolve_text_edit: bool, - pub resolve_command: bool, -} - -impl CompletionFieldsToResolve { - pub const fn empty() -> Self { - Self { - resolve_label_details: false, - resolve_tags: false, - resolve_detail: false, - resolve_documentation: false, - resolve_filter_text: false, - resolve_text_edit: false, - resolve_command: false, - } - } -} - //FIXME: split the following feature into fine-grained features. // Feature: Magic Completions diff --git a/src/tools/rust-analyzer/crates/ide-completion/src/tests.rs b/src/tools/rust-analyzer/crates/ide-completion/src/tests.rs index f371012de3f58..9d77d9700718c 100644 --- a/src/tools/rust-analyzer/crates/ide-completion/src/tests.rs +++ b/src/tools/rust-analyzer/crates/ide-completion/src/tests.rs @@ -37,8 +37,8 @@ use test_fixture::ChangeFixture; use test_utils::assert_eq_text; use crate::{ - resolve_completion_edits, CallableSnippets, CompletionConfig, CompletionFieldsToResolve, - CompletionItem, CompletionItemKind, + resolve_completion_edits, CallableSnippets, CompletionConfig, CompletionItem, + CompletionItemKind, }; /// Lots of basic item definitions @@ -84,7 +84,6 @@ pub(crate) const TEST_CONFIG: CompletionConfig = CompletionConfig { prefer_absolute: false, snippets: Vec::new(), limit: None, - fields_to_resolve: CompletionFieldsToResolve::empty(), }; pub(crate) fn completion_list(ra_fixture: &str) -> String { diff --git a/src/tools/rust-analyzer/crates/ide/src/lib.rs b/src/tools/rust-analyzer/crates/ide/src/lib.rs index c46c4c8ce94bb..547286c3f4d64 100644 --- a/src/tools/rust-analyzer/crates/ide/src/lib.rs +++ b/src/tools/rust-analyzer/crates/ide/src/lib.rs @@ -119,8 +119,8 @@ pub use ide_assists::{ Assist, AssistConfig, AssistId, AssistKind, AssistResolveStrategy, SingleResolve, }; pub use ide_completion::{ - CallableSnippets, CompletionConfig, CompletionFieldsToResolve, CompletionItem, - CompletionItemKind, CompletionRelevance, Snippet, SnippetScope, + CallableSnippets, CompletionConfig, CompletionItem, CompletionItemKind, CompletionRelevance, + Snippet, SnippetScope, }; pub use ide_db::{ base_db::{Cancelled, CrateGraph, CrateId, FileChange, SourceRoot, SourceRootId}, diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs index ef2e542cf2221..2be71ef92a32c 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs @@ -12,10 +12,10 @@ use std::{ use cfg::{CfgAtom, CfgDiff}; use hir::Symbol; use ide::{ - AssistConfig, CallableSnippets, CompletionConfig, CompletionFieldsToResolve, DiagnosticsConfig, - ExprFillDefaultMode, GenericParameterHints, HighlightConfig, HighlightRelatedConfig, - HoverConfig, HoverDocFormat, InlayFieldsToResolve, InlayHintsConfig, JoinLinesConfig, - MemoryLayoutHoverConfig, MemoryLayoutHoverRenderKind, Snippet, SnippetScope, SourceRootId, + AssistConfig, CallableSnippets, CompletionConfig, DiagnosticsConfig, ExprFillDefaultMode, + GenericParameterHints, HighlightConfig, HighlightRelatedConfig, HoverConfig, HoverDocFormat, + InlayFieldsToResolve, InlayHintsConfig, JoinLinesConfig, MemoryLayoutHoverConfig, + MemoryLayoutHoverRenderKind, Snippet, SnippetScope, SourceRootId, }; use ide_db::{ imports::insert_use::{ImportGranularity, InsertUseConfig, PrefixKind}, @@ -1393,7 +1393,6 @@ impl Config { } pub fn completion(&self, source_root: Option) -> CompletionConfig { - let client_capability_fields = self.completion_resolve_support_properties(); CompletionConfig { enable_postfix_completions: self.completion_postfix_enable(source_root).to_owned(), enable_imports_on_the_fly: self.completion_autoimport_enable(source_root).to_owned() @@ -1418,15 +1417,6 @@ impl Config { limit: self.completion_limit(source_root).to_owned(), enable_term_search: self.completion_termSearch_enable(source_root).to_owned(), term_search_fuel: self.completion_termSearch_fuel(source_root).to_owned() as u64, - fields_to_resolve: CompletionFieldsToResolve { - resolve_label_details: client_capability_fields.contains("labelDetails"), - resolve_tags: client_capability_fields.contains("tags"), - resolve_detail: client_capability_fields.contains("detail"), - resolve_documentation: client_capability_fields.contains("documentation"), - resolve_filter_text: client_capability_fields.contains("filterText"), - resolve_text_edit: client_capability_fields.contains("textEdit"), - resolve_command: client_capability_fields.contains("command"), - }, } } diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs index 691ea6f567797..bcbd970a0d214 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs @@ -10,9 +10,9 @@ use std::{ use anyhow::Context; use ide::{ - AnnotationConfig, AssistKind, AssistResolveStrategy, Cancellable, CompletionFieldsToResolve, - FilePosition, FileRange, HoverAction, HoverGotoTypeData, InlayFieldsToResolve, Query, - RangeInfo, ReferenceCategory, Runnable, RunnableKind, SingleResolve, SourceChange, TextEdit, + AnnotationConfig, AssistKind, AssistResolveStrategy, Cancellable, FilePosition, FileRange, + HoverAction, HoverGotoTypeData, InlayFieldsToResolve, Query, RangeInfo, ReferenceCategory, + Runnable, RunnableKind, SingleResolve, SourceChange, TextEdit, }; use ide_db::SymbolKind; use itertools::Itertools; @@ -1019,11 +1019,9 @@ pub(crate) fn handle_completion( let items = to_proto::completion_items( &snap.config, - &completion_config.fields_to_resolve, &line_index, snap.file_version(position.file_id), text_document_position, - completion_trigger_character, items, ); @@ -1056,68 +1054,36 @@ pub(crate) fn handle_completion_resolve( }; let source_root = snap.analysis.source_root_id(file_id)?; - let mut forced_resolve_completions_config = snap.config.completion(Some(source_root)); - forced_resolve_completions_config.fields_to_resolve = CompletionFieldsToResolve::empty(); - - let position = FilePosition { file_id, offset }; - let Some(resolved_completions) = snap.analysis.completions( - &forced_resolve_completions_config, - position, - resolve_data.trigger_character, - )? - else { - return Ok(original_completion); - }; - let mut resolved_completions = to_proto::completion_items( - &snap.config, - &forced_resolve_completions_config.fields_to_resolve, - &line_index, - snap.file_version(position.file_id), - resolve_data.position, - resolve_data.trigger_character, - resolved_completions, - ); - - let mut resolved_completion = - if resolved_completions.get(resolve_data.completion_item_index).is_some() { - resolved_completions.swap_remove(resolve_data.completion_item_index) - } else { - return Ok(original_completion); - }; + let additional_edits = snap + .analysis + .resolve_completion_edits( + &snap.config.completion(Some(source_root)), + FilePosition { file_id, offset }, + resolve_data + .imports + .into_iter() + .map(|import| (import.full_import_path, import.imported_name)), + )? + .into_iter() + .flat_map(|edit| edit.into_iter().map(|indel| to_proto::text_edit(&line_index, indel))) + .collect::>(); - if !resolve_data.imports.is_empty() { - let additional_edits = snap - .analysis - .resolve_completion_edits( - &forced_resolve_completions_config, - position, - resolve_data - .imports - .into_iter() - .map(|import| (import.full_import_path, import.imported_name)), - )? - .into_iter() - .flat_map(|edit| edit.into_iter().map(|indel| to_proto::text_edit(&line_index, indel))) - .collect::>(); - - if !all_edits_are_disjoint(&resolved_completion, &additional_edits) { - return Err(LspError::new( - ErrorCode::InternalError as i32, - "Import edit overlaps with the original completion edits, this is not LSP-compliant" - .into(), - ) - .into()); - } + if !all_edits_are_disjoint(&original_completion, &additional_edits) { + return Err(LspError::new( + ErrorCode::InternalError as i32, + "Import edit overlaps with the original completion edits, this is not LSP-compliant" + .into(), + ) + .into()); + } - if let Some(original_additional_edits) = resolved_completion.additional_text_edits.as_mut() - { - original_additional_edits.extend(additional_edits) - } else { - resolved_completion.additional_text_edits = Some(additional_edits); - } + if let Some(original_additional_edits) = original_completion.additional_text_edits.as_mut() { + original_additional_edits.extend(additional_edits) + } else { + original_completion.additional_text_edits = Some(additional_edits); } - Ok(resolved_completion) + Ok(original_completion) } pub(crate) fn handle_folding_range( diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/integrated_benchmarks.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/integrated_benchmarks.rs index 8946c7acb9381..8a4f9d49fef93 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/integrated_benchmarks.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/integrated_benchmarks.rs @@ -12,8 +12,7 @@ use hir::ChangeWithProcMacros; use ide::{ - AnalysisHost, CallableSnippets, CompletionConfig, CompletionFieldsToResolve, DiagnosticsConfig, - FilePosition, TextSize, + AnalysisHost, CallableSnippets, CompletionConfig, DiagnosticsConfig, FilePosition, TextSize, }; use ide_db::{ imports::insert_use::{ImportGranularity, InsertUseConfig}, @@ -173,7 +172,6 @@ fn integrated_completion_benchmark() { snippets: Vec::new(), limit: None, add_semicolon_to_unit: true, - fields_to_resolve: CompletionFieldsToResolve::empty(), }; let position = FilePosition { file_id, offset: TextSize::try_from(completion_offset).unwrap() }; @@ -221,7 +219,6 @@ fn integrated_completion_benchmark() { snippets: Vec::new(), limit: None, add_semicolon_to_unit: true, - fields_to_resolve: CompletionFieldsToResolve::empty(), }; let position = FilePosition { file_id, offset: TextSize::try_from(completion_offset).unwrap() }; @@ -267,7 +264,6 @@ fn integrated_completion_benchmark() { snippets: Vec::new(), limit: None, add_semicolon_to_unit: true, - fields_to_resolve: CompletionFieldsToResolve::empty(), }; let position = FilePosition { file_id, offset: TextSize::try_from(completion_offset).unwrap() }; diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/capabilities.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/capabilities.rs index 3b19284f24119..9610808c27e18 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/capabilities.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/capabilities.rs @@ -448,7 +448,7 @@ impl ClientCapabilities { .unwrap_or_default() } - pub fn inlay_hint_resolve_support_properties(&self) -> FxHashSet<&str> { + pub fn inlay_hint_resolve_support_properties(&self) -> FxHashSet { self.0 .text_document .as_ref() @@ -457,22 +457,8 @@ impl ClientCapabilities { .map(|inlay_resolve| inlay_resolve.properties.iter()) .into_iter() .flatten() - .map(|s| s.as_str()) - .collect() - } - - pub fn completion_resolve_support_properties(&self) -> FxHashSet<&str> { - self.0 - .text_document - .as_ref() - .and_then(|text| text.completion.as_ref()) - .and_then(|completion_caps| completion_caps.completion_item.as_ref()) - .and_then(|completion_item_caps| completion_item_caps.resolve_support.as_ref()) - .map(|resolve_support| resolve_support.properties.iter()) - .into_iter() - .flatten() - .map(|s| s.as_str()) - .collect() + .cloned() + .collect::>() } pub fn hover_markdown_support(&self) -> bool { diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/ext.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/ext.rs index 6ddfe118d5e6e..618481bbc66b6 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/ext.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/ext.rs @@ -825,8 +825,6 @@ pub struct CompletionResolveData { pub position: lsp_types::TextDocumentPositionParams, pub imports: Vec, pub version: Option, - pub trigger_character: Option, - pub completion_item_index: usize, } #[derive(Debug, Serialize, Deserialize)] diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/to_proto.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/to_proto.rs index cdc6fb17fd47f..4902c9f88c143 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/to_proto.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/to_proto.rs @@ -6,9 +6,9 @@ use std::{ }; use ide::{ - Annotation, AnnotationKind, Assist, AssistKind, Cancellable, CompletionFieldsToResolve, - CompletionItem, CompletionItemKind, CompletionRelevance, Documentation, FileId, FileRange, - FileSystemEdit, Fold, FoldKind, Highlight, HlMod, HlOperator, HlPunct, HlRange, HlTag, Indel, + Annotation, AnnotationKind, Assist, AssistKind, Cancellable, CompletionItem, + CompletionItemKind, CompletionRelevance, Documentation, FileId, FileRange, FileSystemEdit, + Fold, FoldKind, Highlight, HlMod, HlOperator, HlPunct, HlRange, HlTag, Indel, InlayFieldsToResolve, InlayHint, InlayHintLabel, InlayHintLabelPart, InlayKind, Markup, NavigationTarget, ReferenceCategory, RenameError, Runnable, Severity, SignatureHelp, SnippetEdit, SourceChange, StructureNodeKind, SymbolKind, TextEdit, TextRange, TextSize, @@ -227,11 +227,9 @@ pub(crate) fn snippet_text_edit_vec( pub(crate) fn completion_items( config: &Config, - fields_to_resolve: &CompletionFieldsToResolve, line_index: &LineIndex, version: Option, tdpp: lsp_types::TextDocumentPositionParams, - completion_trigger_character: Option, mut items: Vec, ) -> Vec { if config.completion_hide_deprecated() { @@ -241,17 +239,7 @@ pub(crate) fn completion_items( let max_relevance = items.iter().map(|it| it.relevance.score()).max().unwrap_or_default(); let mut res = Vec::with_capacity(items.len()); for item in items { - completion_item( - &mut res, - config, - fields_to_resolve, - line_index, - version, - &tdpp, - max_relevance, - completion_trigger_character, - item, - ); + completion_item(&mut res, config, line_index, version, &tdpp, max_relevance, item); } if let Some(limit) = config.completion(None).limit { @@ -265,33 +253,21 @@ pub(crate) fn completion_items( fn completion_item( acc: &mut Vec, config: &Config, - fields_to_resolve: &CompletionFieldsToResolve, line_index: &LineIndex, version: Option, tdpp: &lsp_types::TextDocumentPositionParams, max_relevance: u32, - completion_trigger_character: Option, item: CompletionItem, ) { let insert_replace_support = config.insert_replace_support().then_some(tdpp.position); let ref_match = item.ref_match(); + let lookup = item.lookup().to_owned(); let mut additional_text_edits = Vec::new(); - let mut something_to_resolve = false; - let filter_text = if fields_to_resolve.resolve_filter_text { - something_to_resolve = !item.lookup().is_empty(); - None - } else { - Some(item.lookup().to_owned()) - }; - - let text_edit = if fields_to_resolve.resolve_text_edit { - something_to_resolve = true; - None - } else { - // LSP does not allow arbitrary edits in completion, so we have to do a - // non-trivial mapping here. + // LSP does not allow arbitrary edits in completion, so we have to do a + // non-trivial mapping here. + let text_edit = { let mut text_edit = None; let source_range = item.source_range; for indel in item.text_edit { @@ -314,49 +290,25 @@ fn completion_item( additional_text_edits.push(text_edit); } } - Some(text_edit.unwrap()) + text_edit.unwrap() }; let insert_text_format = item.is_snippet.then_some(lsp_types::InsertTextFormat::SNIPPET); - let tags = if fields_to_resolve.resolve_tags { - something_to_resolve = item.deprecated; - None - } else { - item.deprecated.then(|| vec![lsp_types::CompletionItemTag::DEPRECATED]) - }; + let tags = item.deprecated.then(|| vec![lsp_types::CompletionItemTag::DEPRECATED]); let command = if item.trigger_call_info && config.client_commands().trigger_parameter_hints { - if fields_to_resolve.resolve_command { - something_to_resolve = true; - None - } else { - Some(command::trigger_parameter_hints()) - } + Some(command::trigger_parameter_hints()) } else { None }; - let detail = if fields_to_resolve.resolve_detail { - something_to_resolve = item.detail.is_some(); - None - } else { - item.detail - }; - - let documentation = if fields_to_resolve.resolve_documentation { - something_to_resolve = item.documentation.is_some(); - None - } else { - item.documentation.map(documentation) - }; - let mut lsp_item = lsp_types::CompletionItem { label: item.label.to_string(), - detail, - filter_text, + detail: item.detail, + filter_text: Some(lookup), kind: Some(completion_item_kind(item.kind)), - text_edit, + text_edit: Some(text_edit), additional_text_edits: Some(additional_text_edits), - documentation, + documentation: item.documentation.map(documentation), deprecated: Some(item.deprecated), tags, command, @@ -365,62 +317,33 @@ fn completion_item( }; if config.completion_label_details_support() { - if fields_to_resolve.resolve_label_details { - something_to_resolve = true; - } else { - lsp_item.label_details = Some(lsp_types::CompletionItemLabelDetails { - detail: item.label_detail.as_ref().map(ToString::to_string), - description: lsp_item.detail.clone(), - }); - } + lsp_item.label_details = Some(lsp_types::CompletionItemLabelDetails { + detail: item.label_detail.as_ref().map(ToString::to_string), + description: lsp_item.detail.clone(), + }); } else if let Some(label_detail) = item.label_detail { lsp_item.label.push_str(label_detail.as_str()); } set_score(&mut lsp_item, max_relevance, item.relevance); - let imports = - if config.completion(None).enable_imports_on_the_fly && !item.import_to_add.is_empty() { - item.import_to_add - .into_iter() - .map(|(import_path, import_name)| lsp_ext::CompletionImport { - full_import_path: import_path, - imported_name: import_name, - }) - .collect() - } else { - Vec::new() - }; - let (ref_resolve_data, resolve_data) = if something_to_resolve || !imports.is_empty() { - let mut item_index = acc.len(); - let ref_resolve_data = if ref_match.is_some() { - let ref_resolve_data = lsp_ext::CompletionResolveData { - position: tdpp.clone(), - imports: Vec::new(), - version, - trigger_character: completion_trigger_character, - completion_item_index: item_index, - }; - item_index += 1; - Some(to_value(ref_resolve_data).unwrap()) - } else { - None - }; - let resolve_data = lsp_ext::CompletionResolveData { - position: tdpp.clone(), - imports, - version, - trigger_character: completion_trigger_character, - completion_item_index: item_index, - }; - (ref_resolve_data, Some(to_value(resolve_data).unwrap())) - } else { - (None, None) - }; + if config.completion(None).enable_imports_on_the_fly && !item.import_to_add.is_empty() { + let imports = item + .import_to_add + .into_iter() + .map(|(import_path, import_name)| lsp_ext::CompletionImport { + full_import_path: import_path, + imported_name: import_name, + }) + .collect::>(); + if !imports.is_empty() { + let data = lsp_ext::CompletionResolveData { position: tdpp.clone(), imports, version }; + lsp_item.data = Some(to_value(data).unwrap()); + } + } if let Some((label, indel, relevance)) = ref_match { - let mut lsp_item_with_ref = - lsp_types::CompletionItem { label, data: ref_resolve_data, ..lsp_item.clone() }; + let mut lsp_item_with_ref = lsp_types::CompletionItem { label, ..lsp_item.clone() }; lsp_item_with_ref .additional_text_edits .get_or_insert_with(Default::default) @@ -429,7 +352,6 @@ fn completion_item( acc.push(lsp_item_with_ref); }; - lsp_item.data = resolve_data; acc.push(lsp_item); fn set_score( diff --git a/src/tools/rust-analyzer/docs/dev/lsp-extensions.md b/src/tools/rust-analyzer/docs/dev/lsp-extensions.md index b7c536e027964..b7bac4d29fad9 100644 --- a/src/tools/rust-analyzer/docs/dev/lsp-extensions.md +++ b/src/tools/rust-analyzer/docs/dev/lsp-extensions.md @@ -1,5 +1,5 @@