Skip to content

Commit 8260485

Browse files
bors[bot]Veykril
bors[bot]
and
Veykril
authored
Merge #9569
9569: Explicitly check for reference locals or fields in Name classification r=Veykril a=Veykril Closes #7524 Co-authored-by: Lukas Wirth <[email protected]>
2 parents 87621de + c65bb7f commit 8260485

File tree

11 files changed

+67
-50
lines changed

11 files changed

+67
-50
lines changed

‎crates/ide/src/doc_links.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ pub(crate) fn external_docs(
112112
let node = token.parent()?;
113113
let definition = match_ast! {
114114
match node {
115-
ast::NameRef(name_ref) => NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced())?,
116-
ast::Name(name) => NameClass::classify(&sema, &name).map(|d| d.referenced_or_defined())?,
115+
ast::NameRef(name_ref) => NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced_field())?,
116+
ast::Name(name) => NameClass::classify(&sema, &name).map(|d| d.defined_or_referenced_field())?,
117117
_ => return None,
118118
}
119119
};

‎crates/ide/src/goto_declaration.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ pub(crate) fn goto_declaration(
2525
match parent {
2626
ast::NameRef(name_ref) => {
2727
let name_kind = NameRefClass::classify(&sema, &name_ref)?;
28-
name_kind.referenced()
28+
name_kind.referenced_local()
2929
},
3030
ast::Name(name) => {
31-
NameClass::classify(&sema, &name)?.referenced_or_defined()
31+
NameClass::classify(&sema, &name)?.defined_or_referenced_local()
3232
},
3333
_ => return None,
3434
}

‎crates/ide/src/goto_definition.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,11 @@ pub(crate) fn goto_definition(
6060
reference_definition(&sema, Either::Right(&name_ref))
6161
},
6262
ast::Name(name) => {
63-
let def = NameClass::classify(&sema, &name)?.referenced_or_defined();
64-
try_find_trait_item_definition(sema.db, &def)
65-
.or_else(|| def.try_to_nav(sema.db))
63+
let def = NameClass::classify(&sema, &name)?.defined_or_referenced_local();
64+
try_find_trait_item_definition(sema.db, &def).or_else(|| def.try_to_nav(sema.db))
6665
},
6766
ast::Lifetime(lt) => if let Some(name_class) = NameClass::classify_lifetime(&sema, &lt) {
68-
let def = name_class.referenced_or_defined();
67+
let def = name_class.defined_or_referenced_local();
6968
def.try_to_nav(sema.db)
7069
} else {
7170
reference_definition(&sema, Either::Left(&lt))
@@ -140,7 +139,7 @@ pub(crate) fn reference_definition(
140139
|lifetime| NameRefClass::classify_lifetime(sema, lifetime),
141140
|name_ref| NameRefClass::classify(sema, name_ref),
142141
)?;
143-
let def = name_kind.referenced();
142+
let def = name_kind.referenced_local();
144143
def.try_to_nav(sema.db)
145144
}
146145

@@ -878,10 +877,11 @@ fn main() {
878877
r#"
879878
enum Foo {
880879
Bar { x: i32 }
881-
} //^
880+
}
882881
fn baz(foo: Foo) {
883882
match foo {
884883
Foo::Bar { x$0 } => x
884+
//^
885885
};
886886
}
887887
"#,

‎crates/ide/src/goto_implementation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ pub(crate) fn goto_implementation(
2929
let node = sema.find_node_at_offset_with_descend(&syntax, position.offset)?;
3030
let def = match &node {
3131
ast::NameLike::Name(name) => {
32-
NameClass::classify(&sema, name).map(|class| class.referenced_or_defined())
32+
NameClass::classify(&sema, name).map(|class| class.defined_or_referenced_local())
3333
}
3434
ast::NameLike::NameRef(name_ref) => {
35-
NameRefClass::classify(&sema, name_ref).map(|class| class.referenced())
35+
NameRefClass::classify(&sema, name_ref).map(|class| class.referenced_local())
3636
}
3737
ast::NameLike::Lifetime(_) => None,
3838
}?;

‎crates/ide/src/hover.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,14 @@ pub(crate) fn hover(
9696
match node {
9797
// we don't use NameClass::referenced_or_defined here as we do not want to resolve
9898
// field pattern shorthands to their definition
99-
ast::Name(name) => NameClass::classify(&sema, &name).and_then(|class| match class {
100-
NameClass::ConstReference(def) => Some(def),
101-
def => def.defined(),
102-
}),
99+
ast::Name(name) => NameClass::classify(&sema, &name).map(|class| class.defined_or_referenced_local()),
103100
ast::NameRef(name_ref) => {
104-
NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced())
101+
NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced_field())
105102
},
106103
ast::Lifetime(lifetime) => NameClass::classify_lifetime(&sema, &lifetime).map_or_else(
107-
|| NameRefClass::classify_lifetime(&sema, &lifetime).map(|d| d.referenced()),
104+
|| NameRefClass::classify_lifetime(&sema, &lifetime).map(|d| d.referenced_local()),
108105
|d| d.defined(),
109106
),
110-
111107
_ => {
112108
if ast::Comment::cast(token.clone()).is_some() {
113109
cov_mark::hit!(no_highlight_on_comment_hover);

‎crates/ide/src/references.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub(crate) fn find_all_refs(
5858

5959
let (def, is_literal_search) =
6060
if let Some(name) = get_name_of_item_declaration(&syntax, position) {
61-
(NameClass::classify(sema, &name)?.referenced_or_defined(), true)
61+
(NameClass::classify(sema, &name)?.defined_or_referenced_field(), true)
6262
} else {
6363
(find_def(sema, &syntax, position.offset)?, false)
6464
};
@@ -116,13 +116,17 @@ pub(crate) fn find_def(
116116
offset: TextSize,
117117
) -> Option<Definition> {
118118
let def = match sema.find_node_at_offset_with_descend(syntax, offset)? {
119-
ast::NameLike::NameRef(name_ref) => NameRefClass::classify(sema, &name_ref)?.referenced(),
120-
ast::NameLike::Name(name) => NameClass::classify(sema, &name)?.referenced_or_defined(),
119+
ast::NameLike::NameRef(name_ref) => {
120+
NameRefClass::classify(sema, &name_ref)?.referenced_local()
121+
}
122+
ast::NameLike::Name(name) => {
123+
NameClass::classify(sema, &name)?.defined_or_referenced_local()
124+
}
121125
ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, &lifetime)
122-
.map(|class| class.referenced())
126+
.map(|class| class.referenced_local())
123127
.or_else(|| {
124128
NameClass::classify_lifetime(sema, &lifetime)
125-
.map(|class| class.referenced_or_defined())
129+
.map(|class| class.defined_or_referenced_local())
126130
})?,
127131
};
128132
Some(def)

‎crates/ide/src/rename.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ fn find_definition(
108108
bail!("Renaming aliases is currently unsupported")
109109
}
110110
ast::NameLike::Name(name) => {
111-
NameClass::classify(sema, &name).map(|class| class.referenced_or_defined())
111+
NameClass::classify(sema, &name).map(|class| class.defined_or_referenced_local())
112112
}
113113
ast::NameLike::NameRef(name_ref) => {
114114
if let Some(def) =
115-
NameRefClass::classify(sema, &name_ref).map(|class| class.referenced())
115+
NameRefClass::classify(sema, &name_ref).map(|class| class.referenced_local())
116116
{
117117
// if the name differs from the definitions name it has to be an alias
118118
if def.name(sema.db).map_or(false, |it| it.to_string() != name_ref.text()) {
@@ -124,9 +124,10 @@ fn find_definition(
124124
}
125125
}
126126
ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, &lifetime)
127-
.map(|class| class.referenced())
127+
.map(|class| class.referenced_local())
128128
.or_else(|| {
129-
NameClass::classify_lifetime(sema, &lifetime).map(|it| it.referenced_or_defined())
129+
NameClass::classify_lifetime(sema, &lifetime)
130+
.map(|it| it.defined_or_referenced_field())
130131
}),
131132
}
132133
.ok_or_else(|| format_err!("No references found at position"))?;

‎crates/ide/src/syntax_highlighting/highlight.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ pub(super) fn element(
5858
Some(NameClass::ConstReference(def)) => highlight_def(db, krate, def),
5959
Some(NameClass::PatFieldShorthand { field_ref, .. }) => {
6060
let mut h = HlTag::Symbol(SymbolKind::Field).into();
61-
if let Definition::Field(field) = field_ref {
62-
if let hir::VariantDef::Union(_) = field.parent_def(db) {
63-
h |= HlMod::Unsafe;
64-
}
61+
if let hir::VariantDef::Union(_) = field_ref.parent_def(db) {
62+
h |= HlMod::Unsafe;
6563
}
6664
h
6765
}

‎crates/ide_assists/src/handlers/extract_function.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ fn vars_used_in_body(ctx: &AssistContext, body: &FunctionBody) -> Vec<Local> {
638638
body.descendants()
639639
.filter_map(ast::NameRef::cast)
640640
.filter_map(|name_ref| NameRefClass::classify(&ctx.sema, &name_ref))
641-
.map(|name_kind| name_kind.referenced())
641+
.map(|name_kind| name_kind.referenced_local())
642642
.filter_map(|definition| match definition {
643643
Definition::Local(local) => Some(local),
644644
_ => None,

‎crates/ide_db/src/defs.rs

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,11 @@ pub enum NameClass {
112112
/// `None` in `if let None = Some(82) {}`.
113113
/// Syntactically, it is a name, but semantically it is a reference.
114114
ConstReference(Definition),
115-
/// `field` in `if let Foo { field } = foo`. Here, `ast::Name` both Here the
116-
/// name both introduces a definition into a local scope, and refers to an
117-
/// existing definition.
115+
/// `field` in `if let Foo { field } = foo`. Here, `ast::Name` both introduces
116+
/// a definition into a local scope, and refers to an existing definition.
118117
PatFieldShorthand {
119118
local_def: Local,
120-
field_ref: Definition,
119+
field_ref: Field,
121120
},
122121
}
123122

@@ -134,11 +133,23 @@ impl NameClass {
134133
Some(res)
135134
}
136135

137-
/// `Definition` referenced or defined by this name.
138-
pub fn referenced_or_defined(self) -> Definition {
136+
/// `Definition` referenced or defined by this name, in case of a shorthand this will yield the field reference.
137+
pub fn defined_or_referenced_field(self) -> Definition {
139138
match self {
140139
NameClass::Definition(it) | NameClass::ConstReference(it) => it,
141-
NameClass::PatFieldShorthand { local_def: _, field_ref } => field_ref,
140+
NameClass::PatFieldShorthand { local_def: _, field_ref } => {
141+
Definition::Field(field_ref)
142+
}
143+
}
144+
}
145+
146+
/// `Definition` referenced or defined by this name, in case of a shorthand this will yield the local definition.
147+
pub fn defined_or_referenced_local(self) -> Definition {
148+
match self {
149+
NameClass::Definition(it) | NameClass::ConstReference(it) => it,
150+
NameClass::PatFieldShorthand { local_def, field_ref: _ } => {
151+
Definition::Local(local_def)
152+
}
142153
}
143154
}
144155

@@ -183,7 +194,7 @@ impl NameClass {
183194
})
184195
.and_then(|name_ref| NameRefClass::classify(sema, &name_ref))?;
185196

186-
Some(NameClass::Definition(name_ref_class.referenced()))
197+
Some(NameClass::Definition(name_ref_class.referenced_field()))
187198
} else {
188199
let extern_crate = it.syntax().parent().and_then(ast::ExternCrate::cast)?;
189200
let krate = sema.resolve_extern_crate(&extern_crate)?;
@@ -197,7 +208,6 @@ impl NameClass {
197208
if let Some(record_pat_field) = it.syntax().parent().and_then(ast::RecordPatField::cast) {
198209
if record_pat_field.name_ref().is_none() {
199210
if let Some(field) = sema.resolve_record_pat_field(&record_pat_field) {
200-
let field = Definition::Field(field);
201211
return Some(NameClass::PatFieldShorthand { local_def: local, field_ref: field });
202212
}
203213
}
@@ -302,17 +312,25 @@ impl NameClass {
302312
#[derive(Debug)]
303313
pub enum NameRefClass {
304314
Definition(Definition),
305-
FieldShorthand { local_ref: Local, field_ref: Definition },
315+
FieldShorthand { local_ref: Local, field_ref: Field },
306316
}
307317

308318
impl NameRefClass {
309-
/// `Definition`, which this name refers to.
310-
pub fn referenced(self) -> Definition {
319+
/// `Definition`, which this name refers to with a preference for the field reference in case of a field shorthand.
320+
pub fn referenced_field(self) -> Definition {
321+
match self {
322+
NameRefClass::Definition(def) => def,
323+
NameRefClass::FieldShorthand { local_ref: _, field_ref } => {
324+
Definition::Field(field_ref)
325+
}
326+
}
327+
}
328+
329+
/// `Definition`, which this name refers to with a preference for the local reference in case of a field shorthand.
330+
pub fn referenced_local(self) -> Definition {
311331
match self {
312332
NameRefClass::Definition(def) => def,
313333
NameRefClass::FieldShorthand { local_ref, field_ref: _ } => {
314-
// FIXME: this is inherently ambiguous -- this name refers to
315-
// two different defs....
316334
Definition::Local(local_ref)
317335
}
318336
}
@@ -342,9 +360,8 @@ impl NameRefClass {
342360

343361
if let Some(record_field) = ast::RecordExprField::for_field_name(name_ref) {
344362
if let Some((field, local, _)) = sema.resolve_record_field(&record_field) {
345-
let field = Definition::Field(field);
346363
let res = match local {
347-
None => NameRefClass::Definition(field),
364+
None => NameRefClass::Definition(Definition::Field(field)),
348365
Some(local) => {
349366
NameRefClass::FieldShorthand { field_ref: field, local_ref: local }
350367
}

‎crates/ide_db/src/search.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ impl<'a> FindUsages<'a> {
550550
}
551551
}
552552
Some(NameRefClass::FieldShorthand { local_ref: local, field_ref: field }) => {
553+
let field = Definition::Field(field);
553554
let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax());
554555
let access = match self.def {
555556
Definition::Field(_) if field == self.def => reference_access(&field, name_ref),
@@ -574,7 +575,7 @@ impl<'a> FindUsages<'a> {
574575
match NameClass::classify(self.sema, name) {
575576
Some(NameClass::PatFieldShorthand { local_def: _, field_ref })
576577
if matches!(
577-
self.def, Definition::Field(_) if field_ref == self.def
578+
self.def, Definition::Field(_) if Definition::Field(field_ref) == self.def
578579
) =>
579580
{
580581
let FileRange { file_id, range } = self.sema.original_range(name.syntax());

0 commit comments

Comments
 (0)