Skip to content

Commit 48b6dd0

Browse files
committed
Use explicit match for extracting def from classify_name
1 parent 4edf736 commit 48b6dd0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

crates/ra_ide/src/goto_definition.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use hir::Semantics;
22
use ra_ide_db::{
3-
defs::{classify_name, classify_name_ref},
3+
defs::{classify_name, classify_name_ref, NameClass},
44
symbol_index, RootDatabase,
55
};
66
use ra_syntax::{
@@ -39,7 +39,10 @@ pub(crate) fn goto_definition(
3939
reference_definition(&sema, &name_ref).to_vec()
4040
},
4141
ast::Name(name) => {
42-
let def = classify_name(&sema, &name)?.into_definition()?;
42+
let def = match classify_name(&sema, &name)? {
43+
NameClass::Definition(def) | NameClass::ConstReference(def) => def,
44+
NameClass::FieldShorthand { local: _, field } => field,
45+
};
4346
let nav = def.try_to_nav(sema.db)?;
4447
vec![nav]
4548
},

0 commit comments

Comments
 (0)