Refactor the code

Author: SomeoneToIgnore

crates/completion/src/config.rs

@@ -15,9 +15,15 @@ pub struct CompletionConfig {
     pub add_call_argument_snippets: bool,
     pub snippet_cap: Option<SnippetCap>,
     pub merge: Option<MergeBehaviour>,
+    /// A set of capabilities, enabled on the cliend and supported on the server.
     pub resolve_capabilities: FxHashSet<CompletionResolveCapability>,
 }
 
+/// A resolve capability, supported on a server.
+/// If the client registers any of those in its completion resolve capabilities,
+/// the server is able to render completion items' corresponding fields later,
+/// not during an initial completion item request.
+/// See https://github.com/rust-analyzer/rust-analyzer/issues/6366 for more details.
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq)]
 pub enum CompletionResolveCapability {
     Documentation,
@@ -30,7 +36,8 @@ impl CompletionConfig {
         self.snippet_cap = if yes { Some(SnippetCap { _private: () }) } else { None }
     }
 
-    pub fn should_resolve_immediately(&self) -> bool {
+    /// Whether the completions' additional edits are calculated later, during a resolve request or not.
+    pub fn should_resolve_additional_edits_immediately(&self) -> bool {
         !self.resolve_capabilities.contains(&CompletionResolveCapability::AdditionalTextEdits)
     }
 }

crates/completion/src/item.rs

@@ -67,8 +67,7 @@ pub struct CompletionItem {
     /// possible match.
     ref_match: Option<(Mutability, CompletionScore)>,
 
-    /// The data later to be used in the `completionItem/resolve` response
-    /// to add the insert import edit.
+    /// The import data to add to completion's edits.
     import_to_add: Option<ImportToAdd>,
 }
 

crates/completion/src/render.rs

@@ -194,7 +194,10 @@ impl<'a> Render<'a> {
                     local_name,
                 )
                 .kind(CompletionItemKind::UnresolvedReference)
-                .add_import(import_to_add, self.ctx.completion.config.should_resolve_immediately())
+                .add_import(
+                    import_to_add,
+                    self.ctx.completion.config.should_resolve_additional_edits_immediately(),
+                )
                 .build();
                 return Some(item);
             }
@@ -249,7 +252,10 @@ impl<'a> Render<'a> {
 
         let item = item
             .kind(kind)
-            .add_import(import_to_add, self.ctx.completion.config.should_resolve_immediately())
+            .add_import(
+                import_to_add,
+                self.ctx.completion.config.should_resolve_additional_edits_immediately(),
+            )
             .set_documentation(docs)
             .set_ref_match(ref_match)
             .build();

crates/completion/src/render/enum_variant.rs

@@ -71,7 +71,10 @@ impl<'a> EnumVariantRender<'a> {
         .kind(CompletionItemKind::EnumVariant)
         .set_documentation(self.variant.docs(self.ctx.db()))
         .set_deprecated(self.ctx.is_deprecated(self.variant))
-        .add_import(import_to_add, self.ctx.completion.config.should_resolve_immediately())
+        .add_import(
+            import_to_add,
+            self.ctx.completion.config.should_resolve_additional_edits_immediately(),
+        )
         .detail(self.detail());
 
         if self.variant_kind == StructKind::Tuple {

crates/completion/src/render/function.rs

@@ -47,7 +47,10 @@ impl<'a> FunctionRender<'a> {
             .set_deprecated(self.ctx.is_deprecated(self.func))
             .detail(self.detail())
             .add_call_parens(self.ctx.completion, self.name, params)
-            .add_import(import_to_add, self.ctx.completion.config.should_resolve_immediately())
+            .add_import(
+                import_to_add,
+                self.ctx.completion.config.should_resolve_additional_edits_immediately(),
+            )
             .build()
     }
 

crates/completion/src/render/macro_.rs

@@ -50,7 +50,10 @@ impl<'a> MacroRender<'a> {
                 .kind(CompletionItemKind::Macro)
                 .set_documentation(self.docs.clone())
                 .set_deprecated(self.ctx.is_deprecated(self.macro_))
-                .add_import(import_to_add, self.ctx.completion.config.should_resolve_immediately())
+                .add_import(
+                    import_to_add,
+                    self.ctx.completion.config.should_resolve_additional_edits_immediately(),
+                )
                 .detail(self.detail());
 
         let needs_bang = self.needs_bang();

crates/completion/src/test_utils.rs

@@ -97,7 +97,6 @@ pub(crate) fn check_edit_with_config(
         .unwrap_or_else(|| panic!("can't find {:?} completion in {:#?}", what, completions));
     let mut actual = db.file_text(position.file_id).to_string();
     completion.text_edit().apply(&mut actual);
-    // git  how to apply imports now?
     assert_eq_text!(&ra_fixture_after, &actual)
 }
 

crates/rust-analyzer/src/caps.rs

@@ -32,7 +32,7 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti
         })),
         hover_provider: Some(HoverProviderCapability::Simple(true)),
         completion_provider: Some(CompletionOptions {
-            resolve_provider: Some(true),
+            resolve_provider: completions_resolve_provider(client_caps),
             trigger_characters: Some(vec![":".to_string(), ".".to_string()]),
             work_done_progress_options: WorkDoneProgressOptions { work_done_progress: None },
         }),
@@ -50,9 +50,7 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti
         document_symbol_provider: Some(OneOf::Left(true)),
         workspace_symbol_provider: Some(OneOf::Left(true)),
         code_action_provider: Some(code_action_capabilities(client_caps)),
-        code_lens_provider: Some(CodeLensOptions {
-            resolve_provider: resolve_provider(client_caps),
-        }),
+        code_lens_provider: Some(CodeLensOptions { resolve_provider: Some(true) }),
         document_formatting_provider: Some(OneOf::Left(true)),
         document_range_formatting_provider: None,
         document_on_type_formatting_provider: Some(DocumentOnTypeFormattingOptions {
@@ -97,16 +95,16 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti
     }
 }
 
-fn resolve_provider(client_caps: &ClientCapabilities) -> Option<bool> {
-    if enabled_resolve_capabilities(client_caps)?.is_empty() {
+fn completions_resolve_provider(client_caps: &ClientCapabilities) -> Option<bool> {
+    if enabled_completions_resolve_capabilities(client_caps)?.is_empty() {
         None
     } else {
         Some(true)
     }
 }
 
-/// Parses client capabilities and returns all that rust-analyzer supports.
-pub fn enabled_resolve_capabilities(
+/// Parses client capabilities and returns all completion resolve capabilities rust-analyzer supports.
+pub fn enabled_completions_resolve_capabilities(
     caps: &ClientCapabilities,
 ) -> Option<FxHashSet<CompletionResolveCapability>> {
     Some(

crates/rust-analyzer/src/config.rs

@@ -19,7 +19,7 @@ use rustc_hash::FxHashSet;
 use serde::Deserialize;
 use vfs::AbsPathBuf;
 
-use crate::{caps::enabled_resolve_capabilities, diagnostics::DiagnosticsMapConfig};
+use crate::{caps::enabled_completions_resolve_capabilities, diagnostics::DiagnosticsMapConfig};
 
 #[derive(Debug, Clone)]
 pub struct Config {
@@ -389,7 +389,7 @@ impl Config {
 
             self.completion.allow_snippets(false);
             self.completion.resolve_capabilities =
-                enabled_resolve_capabilities(caps).unwrap_or_default();
+                enabled_completions_resolve_capabilities(caps).unwrap_or_default();
             if let Some(completion) = &doc_caps.completion {
                 if let Some(completion_item) = &completion.completion_item {
                     if let Some(value) = completion_item.snippet_support {

crates/rust-analyzer/src/handlers.rs

@@ -581,7 +581,7 @@ pub(crate) fn handle_completion(
                 &line_index,
                 line_endings,
                 item.clone(),
-                &snap.config.completion.resolve_capabilities,
+                snap.config.completion.should_resolve_additional_edits_immediately(),
             );
 
             let item_id = serde_json::to_value(&item_index)