Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #6680

Browse source 
6680: Fix use merging not using the first path segment r=Veykril a=Veykril

Finally figured out why nested imports don't properly merge in some cases

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2020-11-30 16:22:56 +00:00 committed by GitHub
commit 70eb170271
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/assists/src/handlers/replace_qualified_name_with_use.rs
View file

@ -407,7 +407,7 @@ impl std::fmt::Display<|> for Foo {
} }
", ",
r" r"
use std::fmt::{nested::Debug, Display}; use std::fmt::{Display, nested::Debug};
impl Display for Foo { impl Display for Foo {
} }

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

@ -384,7 +384,7 @@ fn path_cmp_for_sort(a: Option<ast::Path>, b: Option<ast::Path>) -> Ordering {
/// Path comparison func for binary searching for merging. /// Path comparison func for binary searching for merging.
fn path_cmp_bin_search(lhs: Option<ast::Path>, rhs: Option<ast::Path>) -> Ordering { fn path_cmp_bin_search(lhs: Option<ast::Path>, rhs: Option<ast::Path>) -> Ordering {
match (lhs.and_then(|path| path.segment()), rhs.and_then(|path| path.segment())) { match (lhs.as_ref().and_then(first_segment), rhs.as_ref().and_then(first_segment)) {
(None, None) => Ordering::Equal, (None, None) => Ordering::Equal,
(None, Some(_)) => Ordering::Less, (None, Some(_)) => Ordering::Less,
(Some(_), None) => Ordering::Greater, (Some(_), None) => Ordering::Greater,
@ -1081,6 +1081,15 @@ use std::io;",
) )
} }
#[test]
fn merge_nested_considers_first_segments() {
check_full(
"hir_ty::display::write_bounds_like_dyn_trait",
r"use hir_ty::{autoderef, display::{HirDisplayError, HirFormatter}, method_resolution};",
r"use hir_ty::{autoderef, display::{HirDisplayError, HirFormatter, write_bounds_like_dyn_trait}, method_resolution};",
);
}
#[test] #[test]
fn skip_merge_last_too_long() { fn skip_merge_last_too_long() {
check_last( check_last(