Handle missing default ELSE branch in ReplaceRunKeywordIF (#144)

Author: bhirsz

CHANGES.md

@@ -17,6 +17,7 @@
 - Renamed short version of ``--lineseparator`` to ``-ls`` to avoid collision with ``--list\-l``
 - Description for disabled transformers can be now displayed & disabled transformers are in ``--list`` output [#114](https://github.com/MarketSquare/robotframework-tidy/issues/114)
 - Robotidy should now correctly load configuration files from path when using ``--config`` [#138](https://github.com/MarketSquare/robotframework-tidy/issues/138)
+- ReplaceRunKeywordIf will now set variable values to `None` if there is no ELSE branch [#140](https://github.com/MarketSquare/robotframework-tidy/issues/140)
 - Transformers should always use the same order. If you need to use custom order, provide --force-order flag [#142](https://github.com/MarketSquare/robotframework-tidy/issues/142)
 
 ### Other

docs/source/transformers/ReplaceRunKeywordIf.rst

@@ -60,4 +60,20 @@ Run Keywords inside Run Keyword If will be splitted into separate keywords.
             Keyword2
         END
 
-Supports global formatting params: ``--spacecount``, ``--startline`` and ``--endline``.
+Run Keyword If that assigns values but does not provide default branch will receive ELSE branch with Set Variable:
+
+.. tabs::
+
+    .. code-tab:: robotframework Before
+
+        ${var}  Run Keyword If  ${condition}  Keyword
+
+    .. code-tab:: robotframework After
+
+        IF    ${condition}
+            ${var}    Keyword
+        ELSE
+            ${var}    Set Variable    ${None}
+        END
+
+Supports global formatting params: ``--spacecount``, ``--startline`` and ``--endline``.

robotidy/transformers/ReplaceRunKeywordIf.py

@@ -87,7 +87,7 @@ def create_branched(self, node):
             Token(Token.EOL)
         ])
         prev_if = None
-        for branch in reversed(list(self.split_args_on_delimeters(raw_args, ('ELSE', 'ELSE IF')))):
+        for branch in reversed(list(self.split_args_on_delimeters(raw_args, ('ELSE', 'ELSE IF'), assign=assign))):
             if branch[0].value == 'ELSE':
                 header = ElseHeader([
                     separator,
@@ -140,10 +140,13 @@ def args_to_keyword(self, arg_tokens, assign, indent):
         return KeywordCall.from_tokens(separated_tokens)
 
     @staticmethod
-    def split_args_on_delimeters(args, delimeters):
+    def split_args_on_delimeters(args, delimeters, assign=None):
         split_points = [index for index, arg in enumerate(args) if arg.value in delimeters]
         prev_index = 0
         for split_point in split_points:
             yield args[prev_index:split_point]
             prev_index = split_point
         yield args[prev_index:len(args)]
+        if assign and 'ELSE' in delimeters and not any(arg.value == 'ELSE' for arg in args):
+            values = [Token(Token.ARGUMENT, '${None}')] * len(assign)
+            yield [Token(Token.ELSE), Token(Token.ARGUMENT, 'Set Variable'), *values]

tests/atest/transformers/ReplaceRunKeywordIf/expected/tests.robot

@@ -11,11 +11,15 @@ Leave existing if blocks
 Single Return Value
     IF    ${condition}
         ${var}    Keyword With ${var}    ${arg}
+    ELSE
+        ${var}    Set Variable    ${None}
     END
 
 Multiple Return Values
     IF    ${condition}
         ${var}    ${var2}    Keyword With ${var}    ${arg}
+    ELSE
+        ${var}    ${var2}    Set Variable    ${None}    ${None}
     END
 
 Run keyword if with else if