rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge #11877

Browse Source 
11877: fix: splitting path of a glob import wrongly adds `self` r=Veykril a=iDawer

Close  #11703 

`ast::UseTree::split_prefix` handles globs now.
Removed an extra branch for globs in `ide_db::imports::merge_imports::recursive_merge` (superseeded by split_prefix).

Co-authored-by: iDawer <ilnur.iskhakov.oss@outlook.com>
This commit is contained in:
bors[bot]
2022-04-02 22:12:59 +00:00
committed by GitHub
parent d312b4519a c8c21aabff
commit ba9aed19c7
4 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
crates/syntax/src/ast/edit_in_place.rs
View File

@@ -302,16 +302,33 @@ impl ast::UseTree {
/// Splits off the given prefix, making it the path component of the use tree,
/// appending the rest of the path to all UseTreeList items.
///
/// # Examples
///
/// `prefix$0::suffix` -> `prefix::{suffix}`
///
/// `prefix$0` -> `prefix::{self}`
///
/// `prefix$0::*` -> `prefix::{*}`
pub fn split_prefix(&self, prefix: &ast::Path) {
debug_assert_eq!(self.path(), Some(prefix.top_path()));
let path = self.path().unwrap();
if &path == prefix && self.use_tree_list().is_none() {
let self_suffix = make::path_unqualified(make::path_segment_self()).clone_for_update();
ted::replace(path.syntax(), self_suffix.syntax());
if self.star_token().is_some() {
// path$0::* -> *
self.coloncolon_token().map(ted::remove);
ted::remove(prefix.syntax());
} else {
// path$0 -> self
let self_suffix =
make::path_unqualified(make::path_segment_self()).clone_for_update();
ted::replace(path.syntax(), self_suffix.syntax());
}
} else if split_path_prefix(prefix).is_none() {
return;
}
// At this point, prefix path is detached; _self_ use tree has suffix path.
// Next, transform 'suffix' use tree into 'prefix::{suffix}'
let subtree = self.clone_subtree().clone_for_update();
ted::remove_all_iter(self.syntax().children_with_tokens());
ted::insert(Position::first_child_of(self.syntax()), prefix.syntax());