MergeBehavior -> ImportGranularity

2021-05-18 19:49:15 +02:00
parent e3d0d89d7e
commit 64f7072c25
8 changed files with 75 additions and 38 deletions
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -1145,7 +1145,7 @@ mod tests {

    use ide::Analysis;
    use ide_db::helpers::{
-        insert_use::{InsertUseConfig, PrefixKind},
+        insert_use::{ImportGranularity, InsertUseConfig, PrefixKind},
        SnippetCap,
    };

@@ -1177,7 +1177,7 @@ mod tests {
                    add_call_argument_snippets: true,
                    snippet_cap: SnippetCap::new(true),
                    insert_use: InsertUseConfig {
-                        merge: None,
+                        granularity: ImportGranularity::Item,
                        prefix_kind: PrefixKind::Plain,
                        group: true,
                    },