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

Correctly classify Rename Names

Browse source
This commit is contained in:
Lukas Wirth 2021-07-23 02:14:59 +02:00
parent b744e3369d
commit ef6fed052c
2 changed files with 78 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
crates/ide_db/src/defs.rs
View file

@ -10,8 +10,8 @@ use hir::{
PathResolution, Semantics, Visibility,
};
use syntax::{
ast::{self, AstNode, PathSegmentKind},
match_ast, SyntaxKind, SyntaxNode,
ast::{self, AstNode},
match_ast, SyntaxKind,
};
use crate::RootDatabase;
@ -134,29 +134,23 @@ impl NameClass {
if let Some(use_tree) = it.syntax().parent().and_then(ast::UseTree::cast) {
let path = use_tree.path()?;
let path_segment = path.segment()?;
let name_ref_class = path_segment
.kind()
.and_then(|kind| {
match kind {
// The rename might be from a `self` token, so fallback to the name higher
// in the use tree.
PathSegmentKind::SelfKw => {
let use_tree = use_tree
.syntax()
.parent()
.as_ref()
// Skip over UseTreeList
.and_then(SyntaxNode::parent)
.and_then(ast::UseTree::cast)?;
let path = use_tree.path()?;
let path_segment = path.segment()?;
path_segment.name_ref()
},
PathSegmentKind::Name(name_ref) => Some(name_ref),
_ => None,
}
})
.and_then(|name_ref| NameRefClass::classify(sema, &name_ref))?;
let name_ref = path_segment.name_ref()?;
let name_ref = if name_ref.self_token().is_some() {
use_tree
.syntax()
.parent()
.as_ref()
// Skip over UseTreeList
.and_then(|it| {
let use_tree = it.parent().and_then(ast::UseTree::cast)?;
let path = use_tree.path()?;
let path_segment = path.segment()?;
path_segment.name_ref()
}).unwrap_or(name_ref)
} else {
name_ref
};
let name_ref_class = NameRefClass::classify(sema, &name_ref)?;
Some(NameClass::Definition(match name_ref_class {
NameRefClass::Definition(def) => def,