diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-07 08:24:02 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-07 08:24:02 +0000 |
commit | d54e1157b66017e4aae38328cd213286e39ca130 (patch) | |
tree | f7cd48d085b2bad9b8cdc528b677cdd8cfa2d0ef /crates/ide_completion/src/test_utils.rs | |
parent | 708ec9821f9bcfeafbc82f8260c264fb32b8b750 (diff) | |
parent | 96fc01a30b88d95619b26fd96c58627dd54cb339 (diff) |
Merge #7889
7889: Make group imports configurable r=lnicola a=asv1
Co-authored-by: asv <[email protected]>
Diffstat (limited to 'crates/ide_completion/src/test_utils.rs')
-rw-r--r-- | crates/ide_completion/src/test_utils.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ide_completion/src/test_utils.rs b/crates/ide_completion/src/test_utils.rs index baff83305..9da844031 100644 --- a/crates/ide_completion/src/test_utils.rs +++ b/crates/ide_completion/src/test_utils.rs | |||
@@ -25,6 +25,7 @@ pub(crate) const TEST_CONFIG: CompletionConfig = CompletionConfig { | |||
25 | insert_use: InsertUseConfig { | 25 | insert_use: InsertUseConfig { |
26 | merge: Some(MergeBehavior::Full), | 26 | merge: Some(MergeBehavior::Full), |
27 | prefix_kind: PrefixKind::Plain, | 27 | prefix_kind: PrefixKind::Plain, |
28 | group: true, | ||
28 | }, | 29 | }, |
29 | }; | 30 | }; |
30 | 31 | ||
@@ -119,7 +120,7 @@ pub(crate) fn check_edit_with_config( | |||
119 | 120 | ||
120 | let mut combined_edit = completion.text_edit().to_owned(); | 121 | let mut combined_edit = completion.text_edit().to_owned(); |
121 | if let Some(import_text_edit) = | 122 | if let Some(import_text_edit) = |
122 | completion.import_to_add().and_then(|edit| edit.to_text_edit(config.insert_use.merge)) | 123 | completion.import_to_add().and_then(|edit| edit.to_text_edit(config.insert_use)) |
123 | { | 124 | { |
124 | combined_edit.union(import_text_edit).expect( | 125 | combined_edit.union(import_text_edit).expect( |
125 | "Failed to apply completion resolve changes: change ranges overlap, but should not", | 126 | "Failed to apply completion resolve changes: change ranges overlap, but should not", |