fix(langserver): correct some completion quirks at line or file ends

Author: d-biehl

README.md

@@ -262,7 +262,7 @@ put this to the `settings.json`
             }
         },
         {
-            "scope": "constant.character.escape.robotframework",
+            "scope": "string.unquoted.escape.robotframework",
             "settings": {
                 //"foreground": "#FF0000",
             }

package.json

@@ -97,7 +97,11 @@
       "[robotframework]": {
         "editor.wordBasedSuggestions": false,
         "editor.semanticHighlighting.enabled": true,
-        "editor.inlayHints.enabled": "offUnlessPressed"
+        "editor.inlayHints.enabled": "offUnlessPressed",
+        "editor.quickSuggestionsDelay": 100,
+        "editor.quickSuggestions": {
+          "strings": "on"
+        }
       },
       "editor.tokenColorCustomizations": {
         "textMateRules": [
@@ -114,7 +118,7 @@
             }
           },
           {
-            "scope": "constant.character.embeddedArgument.robotframework",
+            "scope": "string.unquoted.embeddedArgument.robotframework",
             "settings": {
               "fontStyle": "italic"
             }
@@ -182,7 +186,7 @@
             }
           },
           {
-            "scope": "constant.character.character.escape.robotframework",
+            "scope": "string.unquoted.character.escape.robotframework",
             "settings": {}
           }
         ]
@@ -245,10 +249,10 @@
             "keyword.operator.for.robotframework"
           ],
           "argument": [
-            "constant.character.argument.robotframework"
+            "string.unquoted.argument.robotframework"
           ],
           "embeddedArgument": [
-            "constant.character.embeddedArgument.robotframework"
+            "string.unquoted.embeddedArgument.robotframework"
           ],
           "variable": [
             "variable.other.readwrite.robotframework"
@@ -279,7 +283,7 @@
             "punctuation.definition.variable.end.robotframework"
           ],
           "escape": [
-            "constant.character.character.escape.robotframework"
+            "string.unquoted.character.escape.robotframework"
           ],
           "namespace": [
             "entity.other.namespace.robotframework"
@@ -328,7 +332,7 @@
         "args": {
           "text": "    "
         },
-        "when": "editorLangId == robotframework && editorTextFocus && !editorHasSelection && !inSnippetMode && !suggestWidgetVisible && config.robotcode.editor.4SpacesTab && !inlineSuggestionVisible"
+        "when": "editorLangId == robotframework && editorTextFocus && config.robotcode.editor.4SpacesTab && !editorHasSelection && !inSnippetMode && !suggestWidgetVisible && !inlineSuggestionVisible"
       }
     ],
     "configuration": [

packages/language_server/src/robotcode/language_server/common/parts/completion.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 from asyncio import CancelledError
 from itertools import chain
 from typing import TYPE_CHECKING, Any, Final, List, Optional, Union, cast
@@ -12,6 +13,7 @@
     CompletionList,
     CompletionOptions,
     CompletionParams,
+    CompletionTriggerKind,
     InsertReplaceEdit,
     Position,
     ServerCapabilities,
@@ -90,14 +92,19 @@ async def _text_document_completion(
     ) -> Union[List[CompletionItem], CompletionList, None]:
         results: List[Union[List[CompletionItem], CompletionList]] = []
 
+        if context is not None and context.trigger_kind == CompletionTriggerKind.TRIGGER_CHARACTER:
+            await asyncio.sleep(0.25)
+
         document = await self.parent.documents.get(text_document.uri)
         if document is None:
             return None
 
+        p = document.position_from_utf16(position)
+
         for result in await self.collect(
             self,
             document,
-            document.position_from_utf16(position),
+            p,
             context,
             callback_filter=language_id_filter(document),
         ):

packages/language_server/src/robotcode/language_server/robotframework/diagnostics/library_doc.py

@@ -472,7 +472,11 @@ def resolve(
             )
             return cast(Tuple[List[Any], List[Tuple[str, Any]]], resolver.resolve(arguments, variables))
 
-        positional, named = NamedArgumentResolver(self.__robot_arguments).resolve(arguments, variables)
+        class MyNamedArgumentResolver(NamedArgumentResolver):
+            def _raise_positional_after_named(self) -> None:
+                pass
+
+        positional, named = MyNamedArgumentResolver(self.__robot_arguments).resolve(arguments, variables)
         positional, named = VariableReplacer(resolve_variables_until).replace(positional, named, variables)
         positional, named = DictToKwargs(self.__robot_arguments, dict_to_kwargs).handle(positional, named)
         return positional, named

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

@@ -32,7 +32,6 @@
     CompletionItem,
     CompletionItemKind,
     CompletionList,
-    CompletionTriggerKind,
     InsertTextFormat,
     MarkupContent,
     MarkupKind,
@@ -262,7 +261,7 @@ async def _find_methods(self, cls: Type[Any]) -> AsyncIterator[_CompleteMethod]:
     async def collect(
         self, position: Position, context: Optional[CompletionContext]
     ) -> Union[List[CompletionItem], CompletionList, None]:
-        result_nodes = await get_nodes_at_position(self.model, position)
+        result_nodes = await get_nodes_at_position(self.model, position, include_end=True)
 
         result_nodes.reverse()
 
@@ -980,7 +979,7 @@ async def complete_default(
         if len(nodes_at_position) > 1 and isinstance(nodes_at_position[0], HasTokens):
             node = nodes_at_position[0]
 
-            tokens_at_position = get_tokens_at_position(node, position)
+            tokens_at_position = get_tokens_at_position(node, position, True)
             if not tokens_at_position:
                 return None
 
@@ -1051,14 +1050,6 @@ async def complete_SettingSection(  # noqa: N802
     ) -> Union[List[CompletionItem], CompletionList, None]:
         from robot.parsing.model.statements import SectionHeader, Statement
 
-        # TODO should this be configurable?
-        if (
-            context is not None
-            and context.trigger_kind == CompletionTriggerKind.TRIGGER_CHARACTER
-            and context.trigger_character in [" ", "\t"]
-        ):
-            return None
-
         if nodes_at_position.index(node) > 0 and not isinstance(nodes_at_position[0], SectionHeader):
             node_at_pos = nodes_at_position[0]
             if (
@@ -1094,14 +1085,6 @@ async def _complete_TestCase_or_Keyword(  # noqa: N802
         from robot.parsing.lexer.tokens import Token as RobotToken
         from robot.parsing.model.statements import KeywordName, Statement, TestCaseName
 
-        # TODO should this be configurable?
-        if (
-            context is not None
-            and context.trigger_kind == CompletionTriggerKind.TRIGGER_CHARACTER
-            and context.trigger_character in [" ", "\t"]
-        ):
-            return None
-
         index = 0
         in_assign = False
 
@@ -1262,14 +1245,6 @@ async def _complete_SuiteSetup_or_SuiteTeardown_or_TestTemplate(  # noqa: N802
     ) -> Union[List[CompletionItem], CompletionList, None]:
         from robot.parsing.model.statements import Statement, TestTemplate
 
-        # TODO should this be configurable?
-        if (
-            context is not None
-            and context.trigger_kind == CompletionTriggerKind.TRIGGER_CHARACTER
-            and context.trigger_character in [" ", "\t"]
-        ):
-            return None
-
         statement_node = cast(Statement, node)
         if len(statement_node.tokens) > 1:
             token = cast(Token, statement_node.tokens[1])
@@ -1387,14 +1362,6 @@ async def complete_Setup_or_Teardown_or_Template(  # noqa: N802
     ) -> Union[List[CompletionItem], CompletionList, None]:
         from robot.parsing.model.statements import Statement, Template
 
-        # TODO should this be configurable?
-        if (
-            context is not None
-            and context.trigger_kind == CompletionTriggerKind.TRIGGER_CHARACTER
-            and context.trigger_character in [" ", "\t"]
-        ):
-            return None
-
         statement_node = cast(Statement, node)
         if len(statement_node.tokens) > 2:
             token = cast(Token, statement_node.tokens[2])
@@ -1589,7 +1556,7 @@ async def complete_arguments() -> Optional[List[CompletionItem]]:
 
             kw_node = cast(Statement, node)
 
-            tokens_at_position = get_tokens_at_position(kw_node, position)
+            tokens_at_position = get_tokens_at_position(kw_node, position, True)
 
             if not tokens_at_position:
                 return None
@@ -1853,7 +1820,7 @@ async def complete_arguments() -> Optional[List[CompletionItem]]:
 
             kw_node = cast(Statement, node)
 
-            tokens_at_position = get_tokens_at_position(kw_node, position)
+            tokens_at_position = get_tokens_at_position(kw_node, position, True)
 
             if not tokens_at_position:
                 return None
@@ -1893,16 +1860,13 @@ async def _complete_KeywordCall_or_Fixture(  # noqa: N802
         from robot.parsing.lexer.tokens import Token as RobotToken
         from robot.parsing.model.statements import Statement
 
-        # if context is None or context.trigger_kind != CompletionTriggerKind.INVOKED:
-        #     return []
-
         kw_node = cast(Statement, node)
 
         keyword_token = kw_node.get_token(keyword_name_token_type)
         if keyword_token is None:
             return None
 
-        tokens_at_position = get_tokens_at_position(kw_node, position)
+        tokens_at_position = get_tokens_at_position(kw_node, position, include_end=True)
 
         if not tokens_at_position:
             return None
@@ -1912,6 +1876,9 @@ async def _complete_KeywordCall_or_Fixture(  # noqa: N802
         if token_at_position.type not in [RobotToken.ARGUMENT, RobotToken.EOL, RobotToken.SEPARATOR]:
             return None
 
+        if len(tokens_at_position) > 1 and tokens_at_position[-2].type == RobotToken.KEYWORD:
+            return None
+
         keyword_doc_and_token: Optional[Tuple[Optional[KeywordDoc], Token]] = None
 
         keyword_token = kw_node.get_token(keyword_name_token_type)
@@ -2258,7 +2225,7 @@ async def _complete_ForceTags_or_KeywordTags_or_DefaultTags_Tags(  # noqa: N802
         from robot.parsing.model.statements import Statement
 
         statement = cast(Statement, node)
-        tokens = get_tokens_at_position(statement, position)
+        tokens = get_tokens_at_position(statement, position, True)
 
         if not tokens:
             return None

syntaxes/robotframework.tmLanguage.json

@@ -8,7 +8,7 @@
     },
     "variable_setting": {
       "name": "meta.variable.assign.robotframework",
-      "contentName": "constant.character.argument.robotframework",
+      "contentName": "string.unquoted.argument.robotframework",
       "begin": "^(?:([$@&%]\\{)(.+?}*)(\\})( ?=)?)",
       "beginCaptures": {
         "1": {
@@ -140,7 +140,7 @@
     },
     "keyword_call": {
       "name": "meta.keyword-call.content.robotframework",
-      "contentName": "constant.character.argument.robotframework",
+      "contentName": "string.unquoted.argument.robotframework",
       "begin": "^(?!(?: {2,}| ?\\t ?)+(?:(?=[$\\[@&%]|\\.)))(?: {2,}| ?\\t ?)+(.*?)(?= {2,}| ?\\t ?| ?$)",
       "end": "^(?!\\s*\\.\\.\\.)",
       "beginCaptures": {
@@ -173,7 +173,7 @@
     },
     "returning_keyword": {
       "name": "meta.returning-keyword.robotframework",
-      "contentName": "constant.character.argument.robotframework",
+      "contentName": "string.unquoted.argument.robotframework",
       "begin": "(?<=\\s)(?=\\s*(?:(?=[$@&])))((?:\\s)*(?:[$&@]{(?:.*?)}(?:\\[.*?\\])?(?: ?=?\\s*))*)(.*?)(?: {2,}| ?\\t ?|$)",
       "beginCaptures": {
         "1": {