YAGNI active_resolve_capabilities

[rust.git] / crates / rust-analyzer / src / config.rs

diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 24e7936fc9ec38deadd8ed25063614d5128305bc..ce9526315698d41bd6719161cf1fde99f09d8c6d 100644 (file)
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -20,7 +20,7 @@
 use serde::{de::DeserializeOwned, Deserialize};
 use vfs::AbsPathBuf;
 
-use crate::{caps::enabled_completions_resolve_capabilities, diagnostics::DiagnosticsMapConfig};
+use crate::{caps::completion_item_edit_resolve, diagnostics::DiagnosticsMapConfig};
 
 config_data! {
     struct ConfigData {
@@ -536,12 +536,11 @@ fn merge_behavior(&self) -> Option<MergeBehavior> {
     pub fn completion(&self) -> CompletionConfig {
         let mut res = CompletionConfig::default();
         res.enable_postfix_completions = self.data.completion_postfix_enable;
-        res.enable_autoimport_completions = self.data.completion_autoimport_enable;
+        res.enable_autoimport_completions =
+            self.data.completion_autoimport_enable && completion_item_edit_resolve(&self.caps);
         res.add_call_parenthesis = self.data.completion_addCallParenthesis;
         res.add_call_argument_snippets = self.data.completion_addCallArgumentSnippets;
         res.merge = self.merge_behavior();
-        res.active_resolve_capabilities =
-            enabled_completions_resolve_capabilities(&self.caps).unwrap_or_default();
 
         res.allow_snippets(try_or!(
             self.caps