diff options
| author | Aleksey Kladov <[email protected]> | 2020-03-02 18:00:38 +0000 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2020-03-02 18:00:38 +0000 |
| commit | 2716a1fa3f8a7410248724a6ce5d4c28837db682 (patch) | |
| tree | ad1faf323e4cb1478e1e34e2ed9fe858c5be80e5 /crates/ra_hir/src/semantics.rs | |
| parent | 96eca8a1abd79840b9040250db9d1e65ec663b0e (diff) | |
More principled approach for gotodef for field shorhand
Callers can now decide for themselves if they should prefer field or
local definition. By default, it's the local.
Diffstat (limited to 'crates/ra_hir/src/semantics.rs')
| -rw-r--r-- | crates/ra_hir/src/semantics.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs index a0853957c..afc7f7ee7 100644 --- a/crates/ra_hir/src/semantics.rs +++ b/crates/ra_hir/src/semantics.rs | |||
| @@ -107,8 +107,11 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> { | |||
| 107 | self.analyze(field.syntax()).resolve_field(field) | 107 | self.analyze(field.syntax()).resolve_field(field) |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | pub fn resolve_record_field(&self, field: &ast::RecordField) -> Option<StructField> { | 110 | pub fn resolve_record_field( |
| 111 | self.analyze(field.syntax()).resolve_record_field(field) | 111 | &self, |
| 112 | field: &ast::RecordField, | ||
| 113 | ) -> Option<(StructField, Option<Local>)> { | ||
| 114 | self.analyze(field.syntax()).resolve_record_field(self.db, field) | ||
| 112 | } | 115 | } |
| 113 | 116 | ||
| 114 | pub fn resolve_record_literal(&self, record_lit: &ast::RecordLit) -> Option<VariantDef> { | 117 | pub fn resolve_record_literal(&self, record_lit: &ast::RecordLit) -> Option<VariantDef> { |