language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 23:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix handling of nested self in paths

Browse source
This commit is contained in:
DJMcNab 2018-12-21 22:29:59 +00:00
parent 67ac0a423f
commit d8d60215da
3 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/ra_hir/src/path.rs
View file

@ -76,14 +76,32 @@ fn expand_use_tree(
) {
if let Some(use_tree_list) = tree.use_tree_list() {
let prefix = match tree.path() {
// E.g. use something::{{{inner}}};
None => prefix,
// E.g. `use something::{inner}` (prefix is `None`, path is `something`)
// or `use something::{path::{inner::{innerer}}}` (prefix is `something::path`, path is `inner`)
Some(path) => match convert_path(prefix, path) {
Some(it) => Some(it),
None => return, // TODO: report errors somewhere
},
};
for tree in use_tree_list.use_trees() {
expand_use_tree(prefix.clone(), tree, cb);
for child_tree in use_tree_list.use_trees() {
// Handle self in a path.
// E.g. `use something::{self, <...>}`
if let Some(path) = child_tree.path() {
if path.qualifier().is_none() {
if let Some(segment) = path.segment() {
if segment.kind() == Some(ast::PathSegmentKind::SelfKw) {
/* TODO: Work out what on earth range means in this callback */
if let Some(prefix) = prefix.clone() {
cb(prefix, Some(segment.syntax().range()));
continue;
}
}
}
}
}
expand_use_tree(prefix.clone(), child_tree, cb);
}
} else {
if let Some(ast_path) = tree.path() {