Prepare for omittiong parts of completion data that need to be resolved

Author: SomeoneToIgnore

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};
 
-usecrate::snippet::Snippet;
+usecrate::{snippet::Snippet,CompletionFieldsToResolve};
 
 #[derive(Clone,Debug,PartialEq,Eq)]
 pubstructCompletionConfig{
@@ -27,6 +27,7 @@ pub struct CompletionConfig {
 pubprefer_absolute:bool,
 pubsnippets:Vec<Snippet>,
 publimit:Option<usize>,
+pubfields_to_resolve:CompletionFieldsToResolve,
 }
 
 #[derive(Clone,Debug,PartialEq,Eq)]

src/tools/rust-analyzer/crates/ide-completion/src/lib.rs

@@ -37,6 +37,35 @@ pub use crate::{
  snippet::{Snippet,SnippetScope},
 };
 
+#[derive(Copy,Clone,Debug,PartialEq,Eq)]
+pubstructCompletionFieldsToResolve{
+pubresolve_label_details:bool,
+pubresolve_tags:bool,
+pubresolve_detail:bool,
+pubresolve_documentation:bool,
+pubresolve_sort_text:bool,
+pubresolve_filter_text:bool,
+pubresolve_text_edit:bool,
+// FIXME: those are always resolved
+// pub resolve_additional_text_edits: bool,
+pubresolve_command:bool,
+}
+
+implCompletionFieldsToResolve{
+pubconstfnempty() -> Self{
+Self{
+resolve_label_details:false,
+resolve_tags:false,
+resolve_detail:false,
+resolve_documentation:false,
+resolve_sort_text:false,
+resolve_filter_text:false,
+resolve_text_edit:false,
+resolve_command:false,
+}
+}
+}
+
 //FIXME: split the following feature into fine-grained features.
 
 // Feature: Magic Completions

src/tools/rust-analyzer/crates/ide-completion/src/tests.rs

@@ -37,8 +37,8 @@ use test_fixture::ChangeFixture;
 use test_utils::assert_eq_text;
 
 usecrate::{
- resolve_completion_edits,CallableSnippets,CompletionConfig,CompletionItem,
-CompletionItemKind,
+ resolve_completion_edits,CallableSnippets,CompletionConfig,CompletionFieldsToResolve,
+CompletionItem,CompletionItemKind,
 };
 
 /// Lots of basic item definitions
@@ -84,6 +84,7 @@ pub(crate) const TEST_CONFIG: CompletionConfig = CompletionConfig {
 prefer_absolute:false,
 snippets:Vec::new(),
 limit:None,
+fields_to_resolve:CompletionFieldsToResolve::empty(),
 };
 
 pub(crate)fncompletion_list(ra_fixture:&str) -> String{

src/tools/rust-analyzer/crates/ide/src/lib.rs

@@ -119,8 +119,8 @@ pub use ide_assists::{
 Assist,AssistConfig,AssistId,AssistKind,AssistResolveStrategy,SingleResolve,
 };
 pubuse ide_completion::{
-CallableSnippets,CompletionConfig,CompletionItem,CompletionItemKind,CompletionRelevance,
-Snippet,SnippetScope,
+CallableSnippets,CompletionConfig,CompletionFieldsToResolve,CompletionItem,
+CompletionItemKind,CompletionRelevance,Snippet,SnippetScope,
 };
 pubuse ide_db::{
  base_db::{Cancelled,CrateGraph,CrateId,FileChange,SourceRoot,SourceRootId},

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,DiagnosticsConfig,ExprFillDefaultMode,
-GenericParameterHints,HighlightConfig,HighlightRelatedConfig,HoverConfig,HoverDocFormat,
-InlayFieldsToResolve,InlayHintsConfig,JoinLinesConfig,MemoryLayoutHoverConfig,
-MemoryLayoutHoverRenderKind,Snippet,SnippetScope,SourceRootId,
+AssistConfig,CallableSnippets,CompletionConfig,CompletionFieldsToResolve,DiagnosticsConfig,
+ExprFillDefaultMode,GenericParameterHints,HighlightConfig,HighlightRelatedConfig,
+HoverConfig,HoverDocFormat,InlayFieldsToResolve,InlayHintsConfig,JoinLinesConfig,
+MemoryLayoutHoverConfig,MemoryLayoutHoverRenderKind,Snippet,SnippetScope,SourceRootId,
 };
 use ide_db::{
  imports::insert_use::{ImportGranularity,InsertUseConfig,PrefixKind},
@@ -1391,6 +1391,7 @@ impl Config {
 }
 
 pubfncompletion(&self,source_root:Option<SourceRootId>) -> 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()
@@ -1415,6 +1416,16 @@ 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()asu64,
+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_sort_text: client_capability_fields.contains("sortText"),
+resolve_filter_text: client_capability_fields.contains("filterText"),
+resolve_text_edit: client_capability_fields.contains("textEdit"),
+resolve_command: client_capability_fields.contains("command"),
+},
 }
 }
 

src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs

@@ -1019,9 +1019,11 @@ 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,
 );
 

src/tools/rust-analyzer/crates/rust-analyzer/src/integrated_benchmarks.rs

@@ -12,7 +12,8 @@
 
 use hir::ChangeWithProcMacros;
 use ide::{
-AnalysisHost,CallableSnippets,CompletionConfig,DiagnosticsConfig,FilePosition,TextSize,
+AnalysisHost,CallableSnippets,CompletionConfig,CompletionFieldsToResolve,DiagnosticsConfig,
+FilePosition,TextSize,
 };
 use ide_db::{
  imports::insert_use::{ImportGranularity,InsertUseConfig},
@@ -168,6 +169,7 @@ 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()};
@@ -215,6 +217,7 @@ 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()};
@@ -260,6 +263,7 @@ 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()};

src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/capabilities.rs

@@ -458,7 +458,21 @@ impl ClientCapabilities {
 .into_iter()
 .flatten()
 .cloned()
-.collect::<FxHashSet<_>>()
+.collect()
+}
+
+pubfncompletion_resolve_support_properties(&self) -> FxHashSet<String>{
+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()
+.cloned()
+.collect()
 }
 
 pubfnhover_markdown_support(&self) -> bool{

src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/ext.rs

@@ -825,6 +825,7 @@ pub struct CompletionResolveData {
 pubposition: lsp_types::TextDocumentPositionParams,
 pubimports:Vec<CompletionImport>,
 pubversion:Option<i32>,
+pubcompletion_trigger_character:Option<char>,
 }
 
 #[derive(Debug,Serialize,Deserialize)]

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,CompletionItem,
-CompletionItemKind,CompletionRelevance,Documentation,FileId,FileRange,FileSystemEdit,
-Fold,FoldKind,Highlight,HlMod,HlOperator,HlPunct,HlRange,HlTag,Indel,
+Annotation,AnnotationKind,Assist,AssistKind,Cancellable,CompletionFieldsToResolve,
+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,9 +227,11 @@ pub(crate) fn snippet_text_edit_vec(
 
 pub(crate)fncompletion_items(
 config:&Config,
+fields_to_resolve:&CompletionFieldsToResolve,
 line_index:&LineIndex,
 version:Option<i32>,
 tdpp: lsp_types::TextDocumentPositionParams,
+completion_trigger_character:Option<char>,
 mutitems:Vec<CompletionItem>,
 ) -> Vec<lsp_types::CompletionItem>{
 if config.completion_hide_deprecated(){
@@ -239,7 +241,17 @@ pub(crate) fn completion_items(
 let max_relevance = items.iter().map(|it| it.relevance.score()).max().unwrap_or_default();
 letmut res = Vec::with_capacity(items.len());
 for item in items {
-completion_item(&mut res, config, line_index, version,&tdpp, max_relevance, item);
+completion_item(
+&mut res,
+ config,
+ fields_to_resolve,
+ line_index,
+ version,
+&tdpp,
+ max_relevance,
+ completion_trigger_character,
+ item,
+);
 }
 
 ifletSome(limit) = config.completion(None).limit{
@@ -253,17 +265,20 @@ pub(crate) fn completion_items(
 fncompletion_item(
 acc:&mutVec<lsp_types::CompletionItem>,
 config:&Config,
+fields_to_resolve:&CompletionFieldsToResolve,
 line_index:&LineIndex,
 version:Option<i32>,
 tdpp:&lsp_types::TextDocumentPositionParams,
 max_relevance:u32,
+completion_trigger_character:Option<char>,
 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();
 
 letmut additional_text_edits = Vec::new();
+letmut something_to_resolve = false;
 
 // LSP does not allow arbitrary edits in completion, so we have to do a
 // non-trivial mapping here.
@@ -337,7 +352,12 @@ fn completion_item(
 })
 .collect::<Vec<_>>();
 if !imports.is_empty(){
-let data = lsp_ext::CompletionResolveData{position: tdpp.clone(), imports, version };
+let data = lsp_ext::CompletionResolveData{
+position: tdpp.clone(),
+ imports,
+ version,
+ completion_trigger_character,
+};
  lsp_item.data = Some(to_value(data).unwrap());
 }
 }