fix(langserver): correct some in refactor surrounding quirks at file ends

Author: d-biehl

packages/language_server/src/robotcode/language_server/robotframework/parts/code_action_quick_fixes.py

@@ -238,7 +238,6 @@ async def create_keyword_command(self, document_uri: DocumentUri, range: Range)
 
             arguments = []
 
-            # TODO: Check if keyword has a valid namespace and use it instead of the current namespace. (Issue #9)
             for t in node.get_tokens(RobotToken.ARGUMENT):
                 name, value = split_from_equals(cast(Token, t).value)
                 if value is not None and not contains_variable(name, "$@&%"):

packages/language_server/src/robotcode/language_server/robotframework/parts/code_action_refactor.py

@@ -259,6 +259,13 @@ async def surround_with_command(
         if document is None:
             return
 
+        lines = document.get_lines()
+        need_return = False
+        if insert_range.end.line >= len(lines):
+            insert_range.end.line == len(lines) - 1
+            insert_range.end.character = len(lines[-1])
+            need_return = True
+
         spaces = "".join(itertools.takewhile(str.isspace, document.get_lines()[insert_range.start.line]))
 
         edits: List[Union[TextEdit, AnnotatedTextEdit]] = [
@@ -281,7 +288,9 @@ async def surround_with_command(
                 AnnotatedTextEdit(
                     "add_clause",
                     Range(start=Position(insert_range.end.line, 0), end=Position(insert_range.end.line, 0)),
-                    f"{spaces}EXCEPT    message\n{spaces}    Fail    implement this\n{spaces}END\n",
+                    ("\n" if need_return else "")
+                    + f"{spaces}EXCEPT    message\n{spaces}    Fail    implement this\n{spaces}END"
+                    + ("\n" if not need_return else ""),
                 )
             )
             p = Position(insert_range.end.line + 1, len(spaces) + 6 + 4)
@@ -293,7 +302,9 @@ async def surround_with_command(
                 AnnotatedTextEdit(
                     "add_clause",
                     Range(start=Position(insert_range.end.line, 0), end=Position(insert_range.end.line, 0)),
-                    f"{spaces}FINALLY\n{spaces}    Fail    implement this\n{spaces}END\n",
+                    ("\n" if need_return else "")
+                    + f"{spaces}FINALLY\n{spaces}    Fail    implement this\n{spaces}END"
+                    + ("\n" if not need_return else ""),
                 )
             )
             p = Position(insert_range.end.line + 2, len(spaces) + 4)
@@ -304,11 +315,11 @@ async def surround_with_command(
                 AnnotatedTextEdit(
                     "add_clause",
                     Range(start=Position(insert_range.end.line, 0), end=Position(insert_range.end.line, 0)),
-                    f"{spaces}EXCEPT    message\n"
+                    ("\n" if need_return else "") + f"{spaces}EXCEPT    message\n"
                     f"{spaces}    Fail    implement this\n"
                     f"{spaces}FINALLY\n"
                     f"{spaces}    Fail    implement this\n"
-                    f"{spaces}END\n",
+                    f"{spaces}END" + ("\n" if not need_return else ""),
                 )
             )
             p = Position(insert_range.end.line + 1, len(spaces) + 6 + 4)