Merge pull request #1031 from m0rkeulv/feature/bnf-ForLoopRecover

Adding recovery for `ForStatement`
HaxeFoundation · Oct 26, 2020 · ab25833 · ab25833
2 parents fb7d35f + 1d884f0
commit ab25833
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/grammar/haxe.bnf b/grammar/haxe.bnf
@@ -469,9 +469,12 @@ private notBlockStatement ::= ('untyped' statement ';'?)
                             | tryStatement
                             | expression
 
-forStatement ::= 'for' '(' forDeclaration 'in' iterable')' statement ';'?
-{mixin="com.intellij.plugins.haxe.lang.psi.impl.HaxeForStatementPsiMixinImpl" implements="com.intellij.plugins.haxe.lang.psi.HaxeForStatementPsiMixin"}
+
+forStatement ::= 'for' '(' iterableDeclaration ')' statement ';'?
+{recoverWhile=forStatement_recover mixin="com.intellij.plugins.haxe.lang.psi.impl.HaxeForStatementPsiMixinImpl" implements="com.intellij.plugins.haxe.lang.psi.HaxeForStatementPsiMixin"}
 // XXX: Somehow or another, forStatement must derive from AbstractHaxeNamedComponent, or variable resolution will break.
+private iterableDeclaration ::= forDeclaration 'in' iterable {pin=1 recoverWhile="iterable_decl_recovery"}
+private iterable_decl_recovery ::= !(')')
 private forDeclaration ::= keyValueIterator | componentName
 iteratorkey ::= componentName
 {mixin="com.intellij.plugins.haxe.lang.psi.impl.AbstractHaxeNamedComponent" implements="com.intellij.plugins.haxe.lang.psi.HaxeComponent"}