Fix MergeAndOrderSections trailing EOL in inline IF handling (#272)

* Fix MergeAndOrderSections trailing EOL in inline IF handling

* Prepare Github Actions for RF5

* Remove not used imports

* Extra empty line

Author: bhirsz

.github/workflows/unit-tests.yml

@@ -16,22 +16,22 @@ jobs:
         include:
           - os: 'windows-latest'
             python-version: '3.9'
-            rf-version: 'recent'
+            rf-version: 'stable5'
           - os: 'ubuntu-latest'
             python-version: '3.6'
             rf-version: 'stable4'
           - os: 'ubuntu-latest'
             python-version: '3.7'
-            rf-version: 'recent'
+            rf-version: 'stable4'
           - os: 'ubuntu-latest'
             python-version: '3.8'
-            rf-version: 'recent'
+            rf-version: 'stable5'
           - os: 'ubuntu-latest'
             python-version: '3.9'
-            rf-version: 'alpha5'
+            rf-version: 'stable5'
           - os: 'ubuntu-latest'
             python-version: '3.10'
-            rf-version: 'recent'
+            rf-version: 'stable5'
     runs-on: ${{ matrix.os }}
 
     steps:

robotidy/transformers/MergeAndOrderSections.py

@@ -2,7 +2,11 @@
 from robot.parsing.model.statements import Statement
 
 from robotidy.exceptions import InvalidParameterValueError
-import click
+
+try:
+    from robot.api.parsing import InlineIfHeader
+except ImportError:
+    InlineIfHeader = None
 
 
 class MergeAndOrderSections(ModelTransformer):
@@ -103,7 +107,15 @@ def visit_File(self, node):  # noqa
         return node
 
     @staticmethod
-    def from_last_section(node):
+    def normalize_eol(tokens):
+        new_tokens = []
+        for tok in tokens:
+            if tok.type == Token.EOL:
+                tok.value = "\n"
+            new_tokens.append(tok)
+        return new_tokens
+
+    def from_last_section(self, node):
         """Last node use different logic for new line marker. It is not possible to preserve all empty lines but
         we need at least ensure that following code::
 
@@ -114,27 +126,35 @@ def from_last_section(node):
             *** Variables ****** Test Case ***
 
         """
-        if node.body:
-            last_statement = node.body[-1]
-            new_line = [Token(Token.EOL, "\n")]
-            if hasattr(last_statement, "body"):
-                if not last_statement.body:
-                    node.body[-1].body.append(EmptyLine.from_params(eol="\n"))
-                else:
-                    last_statement = last_statement.body[-1]
-                    if hasattr(last_statement, "end"):
-                        if last_statement.end:
-                            node.body[-1].body[-1].end = Statement.from_tokens(
-                                list(last_statement.end.tokens[:-1]) + new_line
-                            )
-                    else:
-                        node.body[-1].body[-1] = Statement.from_tokens(list(last_statement.tokens[:-1]) + new_line)
-            else:
-                node.body[-1] = Statement.from_tokens(list(last_statement.tokens[:-1]) + new_line)
+        # Empty sections, just *** Test Cases *** etc
+        if not node.body:
+            node.header.tokens = self.normalize_eol(node.header.tokens)
+            return node
+
+        # Settings, Variables or Comments
+        if not hasattr(node.body[-1], "body"):
+            node.body[-1].tokens = self.normalize_eol(node.body[-1].tokens)
+            return node
+
+        # Last keyword or test case
+        if not node.body[-1].body:
+            node.body[-1].body.append(EmptyLine.from_params())
+            return node
+
+        last_statement = node.body[-1].body[-1]
+        if hasattr(last_statement, "end"):
+            if (
+                InlineIfHeader
+                and hasattr(last_statement, "header")
+                and isinstance(last_statement.header, InlineIfHeader)
+            ):
+                if not last_statement.errors:
+                    node.body[-1].body[-1].body[-1].tokens = self.normalize_eol(last_statement.body[-1].tokens)
+                return node
+            if last_statement.end:  # not end if parsing errors
+                node.body[-1].body[-1].end.tokens = self.normalize_eol(last_statement.end.tokens)
         else:
-            last_token = node.header.tokens[-1]
-            if last_token.type == Token.EOL:
-                node.header = Statement.from_tokens(list(node.header.tokens[:-1]) + [Token(Token.EOL, "\n")])
+            node.body[-1].body[-1] = Statement.from_tokens(self.normalize_eol(last_statement.tokens))
         return node
 
     def get_section_type(self, section):

tests/atest/transformers/MergeAndOrderSections/expected/inline_if.robot

@@ -0,0 +1,7 @@
+*** Test Cases ***
+foo
+    No Operation
+
+*** Keywords ***
+Bar
+    IF    ${True}    No Operation

tests/atest/transformers/MergeAndOrderSections/source/inline_if.robot

@@ -0,0 +1,7 @@
+*** Test Cases ***
+foo
+    No Operation
+
+*** Keywords ***
+Bar
+    IF    ${True}    No Operation

tests/atest/transformers/MergeAndOrderSections/test_transformer.py

@@ -67,3 +67,6 @@ def test_invalid_order_parameter(self, parameter):
             "order=comments,settings,variables,testcases,variables\n"
         )
         assert expected_output == result.output
+
+    def test_inline_if(self):
+        self.compare("inline_if.robot")

tests/atest/transformers/NormalizeNewLines/expected/inline_if.robot

@@ -0,0 +1,7 @@
+*** Test Cases ***
+foo
+    No Operation
+
+*** Keywords ***
+Bar
+    IF    ${True}    No Operation

tests/atest/transformers/NormalizeNewLines/source/inline_if_0_lines.robot

@@ -0,0 +1,7 @@
+*** Test Cases ***
+foo
+    No Operation
+
+*** Keywords ***
+Bar
+    IF    ${True}    No Operation

tests/atest/transformers/NormalizeNewLines/source/inline_if_1_lines.robot

@@ -0,0 +1,7 @@
+*** Test Cases ***
+foo
+    No Operation
+
+*** Keywords ***
+Bar
+    IF    ${True}    No Operation

tests/atest/transformers/NormalizeNewLines/source/inline_if_2_lines.robot

@@ -0,0 +1,8 @@
+*** Test Cases ***
+foo
+    No Operation
+
+*** Keywords ***
+Bar
+    IF    ${True}    No Operation
+

tests/atest/transformers/NormalizeNewLines/test_transformer.py

@@ -47,3 +47,11 @@ def test_consecutive_empty_lines(self, empty_lines):
             expected=f"consecutive_empty_lines_{empty_lines}line.robot",
             config=f":consecutive_lines={empty_lines}",
         )
+
+    @pytest.mark.parametrize("trailing_lines", [0, 1, 2])
+    def test_inline_if(self, trailing_lines):
+        self.compare(
+            source=f"inline_if_{trailing_lines}_lines.robot",
+            expected="inline_if.robot",
+            target_version=5
+        )