Fix parsing else and else if inside of for loop

mkorpela · mkorpela · commit de48ab1a5996 · 2020-10-20T16:22:33.000+03:00
diff --git a/atest/robot/running/if/complex_if.robot b/atest/robot/running/if/complex_if.robot
@@ -40,5 +40,8 @@ If creating variable
 If inside if
    Check Test Case    ${TESTNAME}
 
-For loop for loop if else if else early exit
+For loop if else early exit
+   Check Test Case    ${TESTNAME}
+
+For loop if else if early exit
    Check Test Case    ${TESTNAME}
diff --git a/atest/testdata/running/if/complex_if.robot b/atest/testdata/running/if/complex_if.robot
@@ -94,18 +94,28 @@ Nesting insanity
    END
    Should be equal  ${assumption}  2 5 9 8 7 8 9 5 2
 
-For loop for loop if else if else early exit
+For loop if else early exit
+  [Documentation]  PASS From the condition
   FOR  ${iter1}  IN  1  2  3
      IF   1 > 2
          Fail   should not execute if branch
-     ELSE IF  3 > 5
-         Fail   should not execute else if branch
      ELSE
          Pass Execution  From the condition
      END
   END
   Fail  should not execute end of test
 
+For loop if else if early exit
+  [Documentation]  PASS From the condition
+  FOR  ${iter1}  IN  1  2  3
+     IF   1 > 2
+         Fail   should not execute if branch
+     ELSE IF  ${iter1} == 2
+         Pass Execution  From the condition
+     END
+  END
+  Fail  should not execute end of test
+
 Recursive if
    Recurse  1
 
diff --git a/src/robot/parsing/lexer/blocklexers.py b/src/robot/parsing/lexer/blocklexers.py
@@ -224,7 +224,7 @@ def input(self, statement):
             statement.pop(0)
 
     def lexer_classes(self):
-        return (ForLoopHeaderLexer, IfStatementLexer, EndLexer, KeywordCallLexer)
+        return (ForLoopHeaderLexer, IfStatementLexer, ElseIfStatementLexer, ElseLexer, EndLexer, KeywordCallLexer)
 
 
 class IfBlockLexer(BlockLexer):
