feat(if) add own statement for InlineIfHeader

yanne · yanne · commit 77b8968077c3 · 2021-10-30T16:14:27.000+03:00
diff --git a/atest/robot/running/if/inline_if_else.robot b/atest/robot/running/if/inline_if_else.robot
@@ -33,6 +33,9 @@ Assignment inside inline if
 Inline if inside for loop
     Check Test Case    ${TESTNAME}
 
+Inline if inside block if
+    Check Test Case    ${TESTNAME}
+
 Inline if inside nested loop
     Check Test Case    ${TESTNAME}
 
diff --git a/atest/testdata/cli/dryrun/if.robot b/atest/testdata/cli/dryrun/if.robot
@@ -42,7 +42,7 @@ Dryrun fail inside of ELSE
     This is validated
 
 Dryrun fail invalid IF in non executed branch
-    [Documentation]    FAIL    IF has more than one condition.
+    [Documentation]    FAIL    IF has no condition.
     IF  1 > 2
        Keyword with invalid if
     END
@@ -75,7 +75,7 @@ Dryrun fail empty if in non executed branch
 
 *** Keywords ***
 Keyword with invalid if
-    IF  1 == 1  2 == 2
+    IF
        Log  invalid
     END
 
diff --git a/atest/testdata/running/if/inline_if_else.robot b/atest/testdata/running/if/inline_if_else.robot
@@ -30,14 +30,21 @@ Inline if else - else executed - failing
 
 Assignment inside inline if
     IF    True    ${num}=   Convert to number    12
-    Variable Should Exist    $num
+    Should Be Equal    ${num}    ${12}
 
 Inline if inside for loop
     [Documentation]    FAIL The end
     FOR    ${i}    IN    1    2    3
         IF    ${i} == 3    Fail    The end    ELSE    Log    ${i}
     END
 
+Inline if inside block if
+    IF    ${True}
+        Log   Hi
+        IF    3==4    Fail    Should not be executed    ELSE    Log    Hello
+        Log   Goodbye
+    END
+
 Inline if inside nested loop
     [Documentation]    FAIL The end
     IF    ${False}
diff --git a/src/robot/api/parsing.py b/src/robot/api/parsing.py
@@ -225,6 +225,7 @@ class were exposed directly via the :mod:`robot.api` package, but other
 - :class:`~robot.parsing.model.statements.TemplateArguments`
 - :class:`~robot.parsing.model.statements.ForHeader`
 - :class:`~robot.parsing.model.statements.IfHeader`
+- :class:`~robot.parsing.model.statements.InlineIfHeader`
 - :class:`~robot.parsing.model.statements.ElseIfHeader`
 - :class:`~robot.parsing.model.statements.ElseHeader`
 - :class:`~robot.parsing.model.statements.End`
@@ -519,6 +520,7 @@ def visit_File(self, node):
     TemplateArguments,
     ForHeader,
     IfHeader,
+    InlineIfHeader,
     ElseIfHeader,
     ElseHeader,
     End,
diff --git a/src/robot/model/body.py b/src/robot/model/body.py
@@ -27,6 +27,7 @@ class BodyItem(ModelObject):
     FOR_ITERATION = 'FOR ITERATION'
     IF_ELSE_ROOT = 'IF/ELSE ROOT'
     IF = 'IF'
+    INLINE_IF = 'INLINE IF'
     ELSE_IF = 'ELSE IF'
     ELSE = 'ELSE'
     MESSAGE = 'MESSAGE'
diff --git a/src/robot/model/control.py b/src/robot/model/control.py
@@ -106,7 +106,7 @@ def id(self):
         return '%s-k%d' % (self.parent.parent.id, index)
 
     def __str__(self):
-        if self.type == self.IF:
+        if self.type in (self.IF, self.INLINE_IF):
             return 'IF    %s' % self.condition
         if self.type == self.ELSE_IF:
             return 'ELSE IF    %s' % self.condition
diff --git a/src/robot/output/logger.py b/src/robot/output/logger.py
@@ -249,6 +249,7 @@ class LoggerProxy(AbstractLoggerProxy):
     _start_keyword_methods = {
         'IF/ELSE ROOT': 'start_if',
         'IF': 'start_if_branch',
+        'INLINE IF': 'start_if_branch',
         'ELSE IF': 'start_if_branch',
         'ELSE': 'start_if_branch',
         'FOR': 'start_for',
@@ -257,6 +258,7 @@ class LoggerProxy(AbstractLoggerProxy):
     _end_keyword_methods = {
         'IF/ELSE ROOT': 'end_if',
         'IF': 'end_if_branch',
+        'INLINE IF': 'end_if_branch',
         'ELSE IF': 'end_if_branch',
         'ELSE': 'end_if_branch',
         'FOR': 'end_for',
diff --git a/src/robot/parsing/lexer/blocklexers.py b/src/robot/parsing/lexer/blocklexers.py
@@ -23,7 +23,7 @@
                               ErrorSectionHeaderLexer,
                               TestOrKeywordSettingLexer,
                               KeywordCallLexer,
-                              ForHeaderLexer,
+                              ForHeaderLexer, InlineIfHeaderLexer,
                               IfHeaderLexer, ElseIfHeaderLexer, ElseHeaderLexer,
                               EndLexer)
 
@@ -228,7 +228,7 @@ def handles(self, statement):
         return IfHeaderLexer(self.ctx).handles(statement)
 
     def lexer_classes(self):
-        return (IfHeaderLexer, ElseIfHeaderLexer, ElseHeaderLexer,
+        return (InlineIfLexer, IfHeaderLexer, ElseIfHeaderLexer, ElseHeaderLexer,
                 ForLexer, EndLexer, KeywordCallLexer)
 
 
@@ -241,16 +241,15 @@ def accepts_more(self, statement):
         return False
 
     def lexer_classes(self):
-        return (IfHeaderLexer, ElseIfHeaderLexer, ElseHeaderLexer,
+        return (InlineIfHeaderLexer, ElseIfHeaderLexer, ElseHeaderLexer,
                 KeywordCallLexer)
 
     def input(self, statement):
         for part in self.split_statements(statement):
             super().input(part)
         return self
 
-    @staticmethod
-    def split_statements(statement):
+    def split_statements(self, statement):
         current_statement = []
         expect_arg = False
         for token in statement:
@@ -272,6 +271,3 @@ def split_statements(statement):
             else:
                 current_statement.append(token)
         yield current_statement
-
-
-
diff --git a/src/robot/parsing/lexer/lexer.py b/src/robot/parsing/lexer/lexer.py
@@ -119,7 +119,7 @@ def _get_tokens(self, statements):
         else:
             ignored_types = {None}
         name_types = {Token.TESTCASE_NAME, Token.KEYWORD_NAME}
-        if_type = Token.IF
+        if_type = Token.INLINE_IF
         for statement in statements:
             eos_adder = None
             result = []
@@ -162,12 +162,9 @@ def _add_eos_to_name_statement(self, statement):
         statement.append(EOS.from_token(statement[-1]))
 
     def _add_eos_to_if_statement(self, statement):
-        if_else_markers = {Token.IF: (False, True),
+        if_else_markers = {Token.INLINE_IF: (False, True),
                            Token.ELSE_IF: (True, True),
                            Token.ELSE: (True, False)}
-        normal_if_statement_types = {Token.IF, Token.ARGUMENT,   # TODO: Continuation?
-                                     Token.SEPARATOR, Token.EOL}
-        inline_if = False
         added = 0
         add_after_arg = False
         for index, token in enumerate(statement[:]):
@@ -184,15 +181,10 @@ def _add_eos_to_if_statement(self, statement):
                 statement.insert(index + added + 1, EOS.from_token(token))
                 added += 1
                 add_after_arg = False
-            if token_type not in normal_if_statement_types:
-                inline_if = True
         last = statement[-1]
-        if not added:
-            statement.append(EOS.from_token(last))
-        if inline_if:
-            statement.extend([EOS.from_token(last),
-                              END.from_token(last, virtual=True),
-                              EOS.from_token(last)])
+        statement.extend([EOS.from_token(last),
+                          END.from_token(last, virtual=True),
+                          EOS.from_token(last)])
 
     def _split_trailing_commented_and_empty_lines(self, statement):
         lines = self._split_to_lines(statement)
diff --git a/src/robot/parsing/lexer/statementlexers.py b/src/robot/parsing/lexer/statementlexers.py
@@ -167,6 +167,17 @@ def lex(self):
             token.type = Token.ARGUMENT
 
 
+class InlineIfHeaderLexer(StatementLexer):
+
+    def handles(self, statement):
+        return statement[0].value == 'IF'
+
+    def lex(self):
+        self.statement[0].type = Token.INLINE_IF
+        for token in self.statement[1:]:
+            token.type = Token.ARGUMENT
+
+
 class ElseIfHeaderLexer(StatementLexer):
 
     def handles(self, statement):
diff --git a/src/robot/parsing/lexer/tokens.py b/src/robot/parsing/lexer/tokens.py
@@ -78,6 +78,7 @@ class Token:
     FOR_SEPARATOR = 'FOR SEPARATOR'
     END = 'END'
     IF = 'IF'
+    INLINE_IF = 'INLINE IF'
     ELSE_IF = 'ELSE IF'
     ELSE = 'ELSE'
 
@@ -140,8 +141,8 @@ def __init__(self, type=None, value=None, lineno=-1, col_offset=-1, error=None):
         if value is None:
             value = {
                 Token.IF: 'IF', Token.ELSE_IF: 'ELSE IF', Token.ELSE: 'ELSE',
-                Token.FOR: 'FOR', Token.END: 'END', Token.CONTINUATION: '...',
-                Token.EOL: '\n', Token.WITH_NAME: 'WITH NAME'
+                Token.INLINE_IF: 'IF', Token.FOR: 'FOR', Token.END: 'END',
+                Token.CONTINUATION: '...', Token.EOL: '\n', Token.WITH_NAME: 'WITH NAME'
             }.get(type, '')
         self.value = value
         self.lineno = lineno
diff --git a/src/robot/parsing/model/statements.py b/src/robot/parsing/model/statements.py
@@ -824,7 +824,7 @@ class IfHeader(Statement):
     def from_params(cls, condition, indent=FOUR_SPACES, separator=FOUR_SPACES, eol=EOL):
         return cls([
             Token(Token.SEPARATOR, indent),
-            Token(Token.IF),
+            Token(cls.type),
             Token(Token.SEPARATOR, separator),
             Token(Token.ARGUMENT, condition),
             Token(Token.EOL, eol)
@@ -842,20 +842,15 @@ def validate(self):
             self.errors += ('%s has more than one condition.' % self.type,)
 
 
+@Statement.register
+class InlineIfHeader(IfHeader):
+    type = Token.INLINE_IF
+
+
 @Statement.register
 class ElseIfHeader(IfHeader):
     type = Token.ELSE_IF
 
-    @classmethod
-    def from_params(cls, condition, indent=FOUR_SPACES, separator=FOUR_SPACES, eol=EOL):
-        return cls([
-            Token(Token.SEPARATOR, indent),
-            Token(Token.ELSE_IF),
-            Token(Token.SEPARATOR, separator),
-            Token(Token.ARGUMENT, condition),
-            Token(Token.EOL, eol)
-        ])
-
 
 @Statement.register
 class ElseHeader(Statement):
diff --git a/src/robot/parsing/parser/blockparsers.py b/src/robot/parsing/parser/blockparsers.py
@@ -36,7 +36,7 @@ class BlockParser(Parser):
 
     def __init__(self, model):
         Parser.__init__(self, model)
-        self.nested_parsers = {Token.FOR: ForParser, Token.IF: IfParser}
+        self.nested_parsers = {Token.FOR: ForParser, Token.IF: IfParser, Token.INLINE_IF: IfParser}
 
     def handles(self, statement):
         return statement.type not in self.unhandled_tokens
@@ -94,6 +94,12 @@ def parse(self, statement):
         return NestedBlockParser.parse(self, statement)
 
 
+class InlineIfParser(IfParser):
+
+    def __init__(self, header):
+        NestedBlockParser.__init__(self, InlineIf(header))
+
+
 class OrElseParser(IfParser):
 
     def handles(self, statement):
diff --git a/src/robot/reporting/jsmodelbuilders.py b/src/robot/reporting/jsmodelbuilders.py
@@ -23,8 +23,8 @@
 IF_ELSE_ROOT = BodyItem.IF_ELSE_ROOT
 STATUSES = {'FAIL': 0, 'PASS': 1, 'SKIP': 2, 'NOT RUN': 3}
 KEYWORD_TYPES = {'KEYWORD': 0, 'SETUP': 1, 'TEARDOWN': 2,
-                 'FOR': 3, 'FOR ITERATION': 4,
-                 'IF': 5, 'ELSE IF': 6, 'ELSE': 7}
+                 'FOR': 3, 'FOR ITERATION': 4, 'IF': 5,
+                 'INLINE IF': 5, 'ELSE IF': 6, 'ELSE': 7}
 MESSAGE_TYPE = 8
 
 
diff --git a/utest/parsing/test_lexer.py b/utest/parsing/test_lexer.py
@@ -1075,7 +1075,7 @@ class TestInlineIf(unittest.TestCase):
     def test_if_only(self):
         header = 'IF    ${True}    Log Many   foo    bar'
         expected = [
-            (T.IF, 'IF', 3, 4),
+            (T.INLINE_IF, 'IF', 3, 4),
             (T.ARGUMENT, '${True}', 3, 10),
             (T.EOS, '', 3, 17),
             (T.KEYWORD, 'Log Many', 3, 21),
@@ -1090,7 +1090,7 @@ def test_if_only(self):
     def test_with_else(self):
         header = 'IF    ${False}    Log    foo    ELSE   Log    bar'
         expected = [
-            (T.IF, 'IF', 3, 4),
+            (T.INLINE_IF, 'IF', 3, 4),
             (T.ARGUMENT, '${False}', 3, 10),
             (T.EOS, '', 3, 18),
             (T.KEYWORD, 'Log', 3, 22),
@@ -1109,7 +1109,7 @@ def test_with_else(self):
     def test_with_else_if_and_else(self):
         header = 'IF    ${False}    Log    foo    ELSE IF    ${True}  Log    bar    ELSE    Noop'
         expected = [
-            (T.IF, 'IF', 3, 4),
+            (T.INLINE_IF, 'IF', 3, 4),
             (T.ARGUMENT, '${False}', 3, 10),
             (T.EOS, '', 3, 18),
             (T.KEYWORD, 'Log', 3, 22),
@@ -1145,7 +1145,7 @@ def test_multiline_and_comments(self):
     ...    zap         # 13
 '''
         expected = [
-            (T.IF, 'IF', 3, 4),
+            (T.INLINE_IF, 'IF', 3, 4),
             (T.ARGUMENT, '${False}', 4, 11),
             (T.EOS, '', 4, 19),
             (T.KEYWORD, 'Log', 5, 11),
