Merge pull request #48 from MarketSquare/fix/extra_new_line

Fix Robotidy add extra new line at the end of file if Test Case or Keyword are last

Author: bhirsz

robotidy/transformers/NormalizeNewLines.py

@@ -3,7 +3,8 @@
 
 from robot.api.parsing import (
     ModelTransformer,
-    EmptyLine
+    EmptyLine,
+    Token
 )
 
 
@@ -41,7 +42,6 @@ def visit_Section(self, node):  # noqa
         self.trim_trailing_empty_lines(node)
         empty_line = EmptyLine.from_params()
         if node is self.last_section:
-            node.body.append(empty_line)
             return self.generic_visit(node)
         node.body.extend([empty_line] * self.section_lines)
         return self.generic_visit(node)
@@ -57,23 +57,31 @@ def visit_KeywordSection(self, node):  # noqa
     def visit_TestCase(self, node):  # noqa
         self.trim_leading_empty_lines(node)
         self.trim_trailing_empty_lines(node)
-        if node is self.last_test:
-            return node
-        if not self.templated:
+        if node is not self.last_test and not self.templated:
             node.body.extend([EmptyLine.from_params()] * self.test_case_lines)
-        return node
+        return self.generic_visit(node)
 
     def visit_Keyword(self, node):  # noqa
         self.trim_leading_empty_lines(node)
         self.trim_trailing_empty_lines(node)
-        if node is self.last_keyword:
-            return node
-        node.body.extend([EmptyLine.from_params()] * self.keyword_lines)
+        if node is not self.last_keyword:
+            node.body.extend([EmptyLine.from_params()] * self.keyword_lines)
+        return self.generic_visit(node)
+
+    def visit_Statement(self, node):  # noqa
+        tokens = []
+        for line in node.lines:
+            if line[-1].type == Token.EOL:
+                line[-1].value = '\n'  # TODO: use global formatting in the future
+            tokens.extend(line)
+        node.tokens = tokens
         return node
 
     @staticmethod
     def trim_trailing_empty_lines(node):
-        while hasattr(node, 'body') and node.body and isinstance(node.body[-1], EmptyLine):
+        if not hasattr(node, 'body'):
+            return
+        while node.body and isinstance(node.body[-1], EmptyLine):
             node.body.pop()
 
     @staticmethod

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

@@ -0,0 +1,6 @@
+*** Test Cases ***
+Values Are Equal Fails
+    Log   1111
+
+Values Are Equal Fails
+    Log   1111

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

@@ -0,0 +1,6 @@
+*** Test Cases ***
+Values Are Equal Fails
+    Log   1111
+
+Values Are Equal Fails
+    Log   1111

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

@@ -0,0 +1,6 @@
+*** Test Cases ***
+Values Are Equal Fails
+    Log   1111
+
+Values Are Equal Fails
+    Log   1111

tests/atest/transformers/test_transformers.py

@@ -257,6 +257,14 @@ def test_templated_tests_separated(self):
             config=':separate_templated_tests=True'
         )
 
+    @pytest.mark.parametrize('lines_at_the_end', [0, 1])
+    def test_test_case_last(self, lines_at_the_end):
+        run_tidy_and_compare(
+            self.TRANSFORMER_NAME,
+            sources=[f'test_case_last_{lines_at_the_end}_lines.robot'],
+            expected=['test_case_last.robot']
+        )
+
 
 @patch('robotidy.app.Robotidy.save_model', new=save_tmp_model)
 class TestSplitTooLongLine: