diff options
Diffstat (limited to 'crates/ra_hir/src/expr/lower.rs')
-rw-r--r-- | crates/ra_hir/src/expr/lower.rs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/crates/ra_hir/src/expr/lower.rs b/crates/ra_hir/src/expr/lower.rs index 7b3e55b7e..6afd80989 100644 --- a/crates/ra_hir/src/expr/lower.rs +++ b/crates/ra_hir/src/expr/lower.rs | |||
@@ -14,7 +14,7 @@ use crate::{ | |||
14 | ty::primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy}, | 14 | ty::primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy}, |
15 | type_ref::TypeRef, | 15 | type_ref::TypeRef, |
16 | DefWithBody, Either, HirDatabase, HirFileId, MacroCallLoc, MacroFileKind, Mutability, Path, | 16 | DefWithBody, Either, HirDatabase, HirFileId, MacroCallLoc, MacroFileKind, Mutability, Path, |
17 | Resolver, | 17 | Resolver, Source, |
18 | }; | 18 | }; |
19 | 19 | ||
20 | use super::{ | 20 | use super::{ |
@@ -103,11 +103,13 @@ where | |||
103 | let id = self.body.exprs.alloc(expr); | 103 | let id = self.body.exprs.alloc(expr); |
104 | if self.current_file_id == self.original_file_id { | 104 | if self.current_file_id == self.original_file_id { |
105 | self.source_map.expr_map.insert(ptr, id); | 105 | self.source_map.expr_map.insert(ptr, id); |
106 | self.source_map.expr_map_back.insert(id, ptr); | ||
107 | } | 106 | } |
107 | self.source_map | ||
108 | .expr_map_back | ||
109 | .insert(id, Source { file_id: self.current_file_id, ast: ptr }); | ||
108 | id | 110 | id |
109 | } | 111 | } |
110 | // deshugared exprs don't have ptr, that's wrong and should be fixed | 112 | // desugared exprs don't have ptr, that's wrong and should be fixed |
111 | // somehow. | 113 | // somehow. |
112 | fn alloc_expr_desugared(&mut self, expr: Expr) -> ExprId { | 114 | fn alloc_expr_desugared(&mut self, expr: Expr) -> ExprId { |
113 | self.body.exprs.alloc(expr) | 115 | self.body.exprs.alloc(expr) |
@@ -117,18 +119,18 @@ where | |||
117 | let id = self.body.exprs.alloc(expr); | 119 | let id = self.body.exprs.alloc(expr); |
118 | if self.current_file_id == self.original_file_id { | 120 | if self.current_file_id == self.original_file_id { |
119 | self.source_map.expr_map.insert(ptr, id); | 121 | self.source_map.expr_map.insert(ptr, id); |
120 | self.source_map.expr_map_back.insert(id, ptr); | ||
121 | } | 122 | } |
123 | self.source_map | ||
124 | .expr_map_back | ||
125 | .insert(id, Source { file_id: self.current_file_id, ast: ptr }); | ||
122 | id | 126 | id |
123 | } | 127 | } |
124 | fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId { | 128 | fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId { |
125 | let id = self.body.pats.alloc(pat); | 129 | let id = self.body.pats.alloc(pat); |
126 | |||
127 | if self.current_file_id == self.original_file_id { | 130 | if self.current_file_id == self.original_file_id { |
128 | self.source_map.pat_map.insert(ptr, id); | 131 | self.source_map.pat_map.insert(ptr, id); |
129 | self.source_map.pat_map_back.insert(id, ptr); | ||
130 | } | 132 | } |
131 | 133 | self.source_map.pat_map_back.insert(id, Source { file_id: self.current_file_id, ast: ptr }); | |
132 | id | 134 | id |
133 | } | 135 | } |
134 | 136 | ||