Skip to content

Commit 19eb7fa

Browse files
Merge #2787
2787: Add missing expr cases for expand macro r=flodiebold a=edwin0cheng I will open another issues for tracking adding back the cases implemented in the PR. Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
2 parents 029c029 + dca9195 commit 19eb7fa

File tree

1 file changed

+23
-1
lines changed
  • crates/ra_hir_expand/src

1 file changed

+23
-1
lines changed

crates/ra_hir_expand/src/db.rs

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ fn to_fragment_kind(db: &dyn AstDatabase, macro_call_id: MacroCallId) -> Fragmen
178178

179179
match parent.kind() {
180180
MACRO_ITEMS | SOURCE_FILE => FragmentKind::Items,
181+
ITEM_LIST => FragmentKind::Items,
181182
LET_STMT => {
182183
// FIXME: Handle Pattern
183184
FragmentKind::Expr
@@ -188,7 +189,28 @@ fn to_fragment_kind(db: &dyn AstDatabase, macro_call_id: MacroCallId) -> Fragmen
188189
TRY_EXPR => FragmentKind::Expr,
189190
TUPLE_EXPR => FragmentKind::Expr,
190191
PAREN_EXPR => FragmentKind::Expr,
191-
ITEM_LIST => FragmentKind::Items,
192+
193+
// FIXME: Add tests for following cases in hir_ty
194+
FOR_EXPR => FragmentKind::Expr,
195+
PATH_EXPR => FragmentKind::Expr,
196+
LAMBDA_EXPR => FragmentKind::Expr,
197+
CONDITION => FragmentKind::Expr,
198+
BREAK_EXPR => FragmentKind::Expr,
199+
RETURN_EXPR => FragmentKind::Expr,
200+
BLOCK_EXPR => FragmentKind::Expr,
201+
MATCH_EXPR => FragmentKind::Expr,
202+
MATCH_ARM => FragmentKind::Expr,
203+
MATCH_GUARD => FragmentKind::Expr,
204+
RECORD_FIELD => FragmentKind::Expr,
205+
CALL_EXPR => FragmentKind::Expr,
206+
INDEX_EXPR => FragmentKind::Expr,
207+
METHOD_CALL_EXPR => FragmentKind::Expr,
208+
AWAIT_EXPR => FragmentKind::Expr,
209+
CAST_EXPR => FragmentKind::Expr,
210+
REF_EXPR => FragmentKind::Expr,
211+
PREFIX_EXPR => FragmentKind::Expr,
212+
RANGE_EXPR => FragmentKind::Expr,
213+
BIN_EXPR => FragmentKind::Expr,
192214
_ => {
193215
// Unknown , Just guess it is `Items`
194216
FragmentKind::Items

0 commit comments

Comments
 (0)