squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #6927

Browse source 
6927: Do not merge imports with different attributes r=lnicola a=Jesse-Bakker

Fixes #6925 

Co-authored-by: Jesse Bakker <github@jessebakker.com>
This commit is contained in:
bors[bot] 2020-12-18 14:32:53 +00:00 committed by GitHub
commit 03c177af89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/ide_db/src/helpers/insert_use.rs
View file

@ -9,7 +9,7 @@ use syntax::{
ast::{
self,
edit::{AstNodeEdit, IndentLevel},
make, AstNode, PathSegmentKind, VisibilityOwner,
make, AstNode, AttrsOwner, PathSegmentKind, VisibilityOwner,
},
AstToken, InsertPosition, NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken,
};
@ -180,6 +180,15 @@ fn eq_visibility(vis0: Option<ast::Visibility>, vis1: Option<ast::Visibility>) -
}
}
fn eq_attrs(
attrs0: impl Iterator<Item = ast::Attr>,
attrs1: impl Iterator<Item = ast::Attr>,
) -> bool {
let attrs0 = attrs0.map(|attr| attr.to_string());
let attrs1 = attrs1.map(|attr| attr.to_string());
attrs0.eq(attrs1)
}
pub fn try_merge_imports(
lhs: &ast::Use,
rhs: &ast::Use,
@ -189,6 +198,10 @@ pub fn try_merge_imports(
if !eq_visibility(lhs.visibility(), rhs.visibility()) {
return None;
}
if !eq_attrs(lhs.attrs(), rhs.attrs()) {
return None;
}
let lhs_tree = lhs.use_tree()?;
let rhs_tree = rhs.use_tree()?;
let merged = try_merge_trees(&lhs_tree, &rhs_tree, merge_behavior)?;

14
crates/ide_db/src/helpers/insert_use/tests.rs
View file

@ -447,6 +447,20 @@ use std::io;",
)
}
#[test]
fn merge_groups_skip_attributed() {
check_full(
"std::io",
r#"
#[cfg(feature = "gated")] use std::fmt::{Result, Display};
"#,
r#"
#[cfg(feature = "gated")] use std::fmt::{Result, Display};
use std::io;
"#,
)
}
#[test]
#[ignore] // FIXME: Support this
fn split_out_merge() {