fixing switch-case parsing edge case

HaxeFoundation · Feb 14, 2024 · 49bc76d · 49bc76d
1 parent 7d1cf43
commit 49bc76d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/src/main/java/com/intellij/plugins/haxe/lang/parser/haxe.bnf b/src/main/java/com/intellij/plugins/haxe/lang/parser/haxe.bnf
@@ -635,7 +635,7 @@ throwStatement ::= 'throw' expression ';'?
 switchStatement ::= 'switch' expression switchBlock
 switchBlock ::= '{' (switchCase | defaultCase)* '}'{pin=1}
 
-switchCaseBlock ::= (literalExpression <<semicolonUnlessPrecededByStatement>>) | statementList
+switchCaseBlock ::=  statementList | (literalExpression <<semicolonUnlessPrecededByStatement>>)
 switchCase ::= 'case' switchCaseExpr ((','|'|') switchCaseExpr)* guard? ':' switchCaseBlock? {pin=1 recoverWhile="switch_case_recover"}
 switchCaseExpr ::= (switchExtractorExpression  | expression | switchCaseCaptureVar) {pin=1} // Should NOT be named Expression, because it should not be an expression.
 

diff --git a/src/test/resources/testData/parsing/haxe/statements/switch/CaseWithEmptyBrackets.txt b/src/test/resources/testData/parsing/haxe/statements/switch/CaseWithEmptyBrackets.txt
@@ -49,30 +49,29 @@ Haxe File
                       HaxePsiToken:true('true')
                   HaxePsiToken::(':')
                   SWITCH_CASE_BLOCK
-                    LITERAL_EXPRESSION
-                      BLOCK_STATEMENT
-                        HaxePsiToken:{('{')
-                        CALL_EXPRESSION
-                          REFERENCE_EXPRESSION
-                            IDENTIFIER
-                              HaxePsiToken:ID('trace')
-                          HaxePsiToken:(('(')
-                          CALL_EXPRESSION_LIST
-                            STRING_LITERAL_EXPRESSION
-                              HaxePsiToken:OPEN_QUOTE('"')
-                              HaxePsiToken:REGULAR_STRING_PART('true')
-                              HaxePsiToken:CLOSING_QUOTE('"')
-                          HaxePsiToken:)(')')
-                        HaxePsiToken:;(';')
-                        HaxePsiToken:}('}')
+                    BLOCK_STATEMENT
+                      HaxePsiToken:{('{')
+                      CALL_EXPRESSION
+                        REFERENCE_EXPRESSION
+                          IDENTIFIER
+                            HaxePsiToken:ID('trace')
+                        HaxePsiToken:(('(')
+                        CALL_EXPRESSION_LIST
+                          STRING_LITERAL_EXPRESSION
+                            HaxePsiToken:OPEN_QUOTE('"')
+                            HaxePsiToken:REGULAR_STRING_PART('true')
+                            HaxePsiToken:CLOSING_QUOTE('"')
+                        HaxePsiToken:)(')')
+                      HaxePsiToken:;(';')
+                      HaxePsiToken:}('}')
                 SWITCH_CASE
                   HaxePsiToken:case('case')
                   SWITCH_CASE_EXPR
                     LITERAL_EXPRESSION
                       HaxePsiToken:false('false')
                   HaxePsiToken::(':')
                   SWITCH_CASE_BLOCK
-                    OBJECT_LITERAL
+                    BLOCK_STATEMENT
                       HaxePsiToken:{('{')
                       PsiComment(MSL_COMMENT)('// do nothing')
                       HaxePsiToken:}('}')