diff options
author | Aleksey Kladov <[email protected]> | 2019-01-25 17:32:34 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-01-25 17:38:03 +0000 |
commit | 9f2574c97e55e2af1d1b93f60307aa9d41f55f42 (patch) | |
tree | 78e2eb10ef2046c4aa03b8d486325f1691b81342 /crates/ra_hir/src/adt.rs | |
parent | 0044514a4e5fe2484071dc81ae59fc291626c05a (diff) |
add ability to get strcut field source
Diffstat (limited to 'crates/ra_hir/src/adt.rs')
-rw-r--r-- | crates/ra_hir/src/adt.rs | 70 |
1 files changed, 66 insertions, 4 deletions
diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs index ec6a10353..22bbad964 100644 --- a/crates/ra_hir/src/adt.rs +++ b/crates/ra_hir/src/adt.rs | |||
@@ -11,7 +11,7 @@ use ra_syntax::{ | |||
11 | 11 | ||
12 | use crate::{ | 12 | use crate::{ |
13 | Name, AsName, Struct, Enum, EnumVariant, Crate, | 13 | Name, AsName, Struct, Enum, EnumVariant, Crate, |
14 | HirDatabase, HirFileId, | 14 | HirDatabase, HirFileId, StructField, FieldSource, |
15 | type_ref::TypeRef, | 15 | type_ref::TypeRef, |
16 | }; | 16 | }; |
17 | 17 | ||
@@ -150,7 +150,7 @@ impl VariantData { | |||
150 | impl VariantData { | 150 | impl VariantData { |
151 | fn new(flavor: StructFlavor) -> Self { | 151 | fn new(flavor: StructFlavor) -> Self { |
152 | let inner = match flavor { | 152 | let inner = match flavor { |
153 | StructFlavor::Tuple(fl) => { | 153 | ast::StructFlavor::Tuple(fl) => { |
154 | let fields = fl | 154 | let fields = fl |
155 | .fields() | 155 | .fields() |
156 | .enumerate() | 156 | .enumerate() |
@@ -161,7 +161,7 @@ impl VariantData { | |||
161 | .collect(); | 161 | .collect(); |
162 | VariantDataInner::Tuple(fields) | 162 | VariantDataInner::Tuple(fields) |
163 | } | 163 | } |
164 | StructFlavor::Named(fl) => { | 164 | ast::StructFlavor::Named(fl) => { |
165 | let fields = fl | 165 | let fields = fl |
166 | .fields() | 166 | .fields() |
167 | .map(|fd| StructFieldData { | 167 | .map(|fd| StructFieldData { |
@@ -171,8 +171,70 @@ impl VariantData { | |||
171 | .collect(); | 171 | .collect(); |
172 | VariantDataInner::Struct(fields) | 172 | VariantDataInner::Struct(fields) |
173 | } | 173 | } |
174 | StructFlavor::Unit => VariantDataInner::Unit, | 174 | ast::StructFlavor::Unit => VariantDataInner::Unit, |
175 | }; | 175 | }; |
176 | VariantData(inner) | 176 | VariantData(inner) |
177 | } | 177 | } |
178 | } | 178 | } |
179 | |||
180 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] | ||
181 | pub enum VariantDef { | ||
182 | Struct(Struct), | ||
183 | EnumVariant(EnumVariant), | ||
184 | } | ||
185 | impl_froms!(VariantDef: Struct, EnumVariant); | ||
186 | |||
187 | impl VariantDef { | ||
188 | pub(crate) fn field(self, db: &impl HirDatabase, name: &Name) -> Option<StructField> { | ||
189 | match self { | ||
190 | VariantDef::Struct(it) => it.field(db, name), | ||
191 | VariantDef::EnumVariant(it) => it.field(db, name), | ||
192 | } | ||
193 | } | ||
194 | pub(crate) fn variant_data(self, db: &impl HirDatabase) -> Arc<VariantData> { | ||
195 | match self { | ||
196 | VariantDef::Struct(it) => it.variant_data(db), | ||
197 | VariantDef::EnumVariant(it) => it.variant_data(db), | ||
198 | } | ||
199 | } | ||
200 | } | ||
201 | |||
202 | impl StructField { | ||
203 | pub(crate) fn source_impl(&self, db: &impl HirDatabase) -> (HirFileId, FieldSource) { | ||
204 | let var_data = self.parent.variant_data(db); | ||
205 | let fields = var_data.fields().unwrap(); | ||
206 | let ss; | ||
207 | let es; | ||
208 | let (file_id, struct_flavor) = match self.parent { | ||
209 | VariantDef::Struct(s) => { | ||
210 | let (file_id, source) = s.source(db); | ||
211 | ss = source; | ||
212 | (file_id, ss.flavor()) | ||
213 | } | ||
214 | VariantDef::EnumVariant(e) => { | ||
215 | let (file_id, source) = e.source(db); | ||
216 | es = source; | ||
217 | (file_id, es.flavor()) | ||
218 | } | ||
219 | }; | ||
220 | |||
221 | let field_sources = match struct_flavor { | ||
222 | ast::StructFlavor::Tuple(fl) => fl | ||
223 | .fields() | ||
224 | .map(|it| FieldSource::Pos(it.to_owned())) | ||
225 | .collect(), | ||
226 | ast::StructFlavor::Named(fl) => fl | ||
227 | .fields() | ||
228 | .map(|it| FieldSource::Named(it.to_owned())) | ||
229 | .collect(), | ||
230 | ast::StructFlavor::Unit => Vec::new(), | ||
231 | }; | ||
232 | let field = field_sources | ||
233 | .into_iter() | ||
234 | .zip(fields.iter()) | ||
235 | .find(|(_syntax, (id, _))| *id == self.id) | ||
236 | .unwrap() | ||
237 | .0; | ||
238 | (file_id, field) | ||
239 | } | ||
240 | } | ||