diff options
Diffstat (limited to 'crates/ra_ide_api/src/hover.rs')
-rw-r--r-- | crates/ra_ide_api/src/hover.rs | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs index f7b7cb8f8..28a6bef12 100644 --- a/crates/ra_ide_api/src/hover.rs +++ b/crates/ra_ide_api/src/hover.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | use hir::{AdtDef, HasSource, HirDisplay}; | 1 | use hir::{Adt, HasSource, HirDisplay}; |
2 | use ra_db::SourceDatabase; | 2 | use ra_db::SourceDatabase; |
3 | use ra_syntax::{ | 3 | use ra_syntax::{ |
4 | algo::{ | 4 | algo::{ |
@@ -129,13 +129,9 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn | |||
129 | } | 129 | } |
130 | } | 130 | } |
131 | hir::ModuleDef::Function(it) => res.extend(from_def_source(db, it)), | 131 | hir::ModuleDef::Function(it) => res.extend(from_def_source(db, it)), |
132 | hir::ModuleDef::AdtDef(AdtDef::Struct(it)) => { | 132 | hir::ModuleDef::Adt(Adt::Struct(it)) => res.extend(from_def_source(db, it)), |
133 | res.extend(from_def_source(db, it)) | 133 | hir::ModuleDef::Adt(Adt::Union(it)) => res.extend(from_def_source(db, it)), |
134 | } | 134 | hir::ModuleDef::Adt(Adt::Enum(it)) => res.extend(from_def_source(db, it)), |
135 | hir::ModuleDef::AdtDef(AdtDef::Union(it)) => { | ||
136 | res.extend(from_def_source(db, it)) | ||
137 | } | ||
138 | hir::ModuleDef::AdtDef(AdtDef::Enum(it)) => res.extend(from_def_source(db, it)), | ||
139 | hir::ModuleDef::EnumVariant(it) => res.extend(from_def_source(db, it)), | 135 | hir::ModuleDef::EnumVariant(it) => res.extend(from_def_source(db, it)), |
140 | hir::ModuleDef::Const(it) => res.extend(from_def_source(db, it)), | 136 | hir::ModuleDef::Const(it) => res.extend(from_def_source(db, it)), |
141 | hir::ModuleDef::Static(it) => res.extend(from_def_source(db, it)), | 137 | hir::ModuleDef::Static(it) => res.extend(from_def_source(db, it)), |
@@ -149,9 +145,9 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn | |||
149 | Some(SelfType(ty)) => { | 145 | Some(SelfType(ty)) => { |
150 | if let Some((adt_def, _)) = ty.as_adt() { | 146 | if let Some((adt_def, _)) = ty.as_adt() { |
151 | res.extend(match adt_def { | 147 | res.extend(match adt_def { |
152 | hir::AdtDef::Struct(it) => from_def_source(db, it), | 148 | hir::Adt::Struct(it) => from_def_source(db, it), |
153 | hir::AdtDef::Union(it) => from_def_source(db, it), | 149 | hir::Adt::Union(it) => from_def_source(db, it), |
154 | hir::AdtDef::Enum(it) => from_def_source(db, it), | 150 | hir::Adt::Enum(it) => from_def_source(db, it), |
155 | }) | 151 | }) |
156 | } | 152 | } |
157 | } | 153 | } |