Correct handling of keyword only arguments

Author: d-biehl

CHANGELOG.md

@@ -57,6 +57,7 @@ async def run(self) -> List[Diagnostic]:
     async def visit(self, node: ast.AST) -> None:
         from robot.parsing.lexer.tokens import Token as RobotToken
         from robot.parsing.model.statements import (
+            Arguments,
             DocumentationOrMetadata,
             KeywordCall,
             Template,
@@ -72,6 +73,9 @@ async def visit(self, node: ast.AST) -> None:
                     for t in node.tokens
                     if t.type != RobotToken.VARIABLE and t.error is None and contains_variable(t.value, "$@&%")
                 ):
+                    if isinstance(node, Arguments) and token.value == "@{}":
+                        continue
+
                     async for var_token, var in self.iter_variables_from_token(
                         token,
                         self.namespace,

robotcode/language_server/robotframework/diagnostics/analyzer.py

@@ -236,7 +236,7 @@ async def visit_Arguments(self, node: ast.AST) -> None:  # noqa: N802
             try:
                 argument = self.get_variable_token(argument_token)
 
-                if argument is not None:
+                if argument is not None and argument.value != "@{}":
                     if (
                         self.in_args
                         and self.position is not None

robotcode/language_server/robotframework/diagnostics/namespace.py

@@ -131,6 +131,9 @@ async def visit_Arguments(self, node: ast.AST) -> None:  # noqa: N802
 
                 if self.current_symbol is not None and self.current_symbol.children is not None:
                     for argument_token in (cast(RobotToken, e) for e in arguments):
+                        if argument_token.value == "@{}":
+                            continue
+
                         argument = self.get_variable_token(argument_token)
 
                         if argument is not None:

robotcode/language_server/robotframework/parts/document_symbols.py

@@ -510,7 +510,10 @@ async def definition_LibraryImport(  # noqa: N802
 
                     if libdoc is None or libdoc.errors:
                         libdoc = await namespace.imports_manager.get_libdoc_for_library_import(
-                            str(library_node.name), (), str(document.uri.to_path().parent)
+                            str(library_node.name),
+                            (),
+                            str(document.uri.to_path().parent),
+                            variables=await namespace.get_resolvable_variables(),
                         )
 
                     if libdoc is None:
@@ -555,7 +558,9 @@ async def definition_ResourceImport(  # noqa: N802
 
                     if libdoc is None or libdoc.errors:
                         libdoc = await namespace.imports_manager.get_libdoc_for_resource_import(
-                            str(resource_node.name), str(document.uri.to_path().parent)
+                            str(resource_node.name),
+                            str(document.uri.to_path().parent),
+                            variables=await namespace.get_resolvable_variables(),
                         )
 
                     if libdoc is None:
@@ -600,7 +605,10 @@ async def definition_VariablesImport(  # noqa: N802
 
                     if libdoc is None or libdoc.errors:
                         libdoc = await namespace.imports_manager.get_libdoc_for_variables_import(
-                            str(variables_node.name), (), str(document.uri.to_path().parent)
+                            str(variables_node.name),
+                            (),
+                            str(document.uri.to_path().parent),
+                            variables=await namespace.get_resolvable_variables(),
                         )
 
                     if libdoc is None:

robotcode/language_server/robotframework/parts/goto.py

@@ -421,7 +421,10 @@ async def hover_LibraryImport(  # noqa: N802
 
                     if libdoc is None or libdoc.errors:
                         libdoc = await namespace.imports_manager.get_libdoc_for_library_import(
-                            str(library_node.name), (), str(document.uri.to_path().parent)
+                            str(library_node.name),
+                            (),
+                            str(document.uri.to_path().parent),
+                            variables=await namespace.get_resolvable_variables(),
                         )
 
                     if libdoc is None or libdoc.errors:
@@ -464,7 +467,9 @@ async def hover_ResourceImport(  # noqa: N802
 
                     if libdoc is None or libdoc.errors:
                         libdoc = await namespace.imports_manager.get_libdoc_for_resource_import(
-                            str(resource_node.name), str(document.uri.to_path().parent)
+                            str(resource_node.name),
+                            str(document.uri.to_path().parent),
+                            variables=await namespace.get_resolvable_variables(),
                         )
 
                     if libdoc is None or libdoc.errors:
@@ -507,7 +512,10 @@ async def hover_VariablesImport(  # noqa: N802
 
                     if libdoc is None or libdoc.errors:
                         libdoc = await namespace.imports_manager.get_libdoc_for_variables_import(
-                            str(variables_node.name), (), str(document.uri.to_path().parent)
+                            str(variables_node.name),
+                            (),
+                            str(document.uri.to_path().parent),
+                            variables=await namespace.get_resolvable_variables(),
                         )
 
                     if libdoc is None or libdoc.errors:

robotcode/language_server/robotframework/parts/hover.py

@@ -241,7 +241,10 @@ async def signature_help_LibraryImport(  # noqa: N802
 
             if lib_doc is None or lib_doc.errors:
                 lib_doc = await namespace.imports_manager.get_libdoc_for_library_import(
-                    str(library_node.name), (), str(document.uri.to_path().parent)
+                    str(library_node.name),
+                    (),
+                    str(document.uri.to_path().parent),
+                    variables=await namespace.get_resolvable_variables(),
                 )
 
             if lib_doc is None:

robotcode/language_server/robotframework/parts/signature_help.py

@@ -604,14 +604,13 @@ async def acquire(self) -> bool:
             finally:
                 async with self.__inner_lock():
                     self._waiters.remove(fut)
+                    self._locked = True
         except asyncio.CancelledError:
             async with self.__inner_lock():
                 if self._locked:
                     await self._wake_up_first()
             raise
 
-        async with self.__inner_lock():
-            self._locked = True
         return True
 
     async def release(self) -> None:

robotcode/utils/async_tools.py

@@ -30,5 +30,5 @@
     // "robotcode.debug.outputMessages": true
     //"python.analysis.diagnosticMode": "workspace"
     //"robotcode.robot.paths": ["./tests", "./tests1"]
-    "robotcode.analysis.diagnosticMode": "openFilesOnly"
+    "robotcode.analysis.diagnosticMode": "workspace"
 }

tests/robotcode/language_server/robotframework/parts/data/.vscode/settings.json

@@ -174,3 +174,10 @@ check that ${a:[0-9\ ]*} plus ${b} is ${expected}
 templated kw
     [Arguments]  ${a}  ${b}  ${expected}
     log  ${a} ${b} ${expected}
+
+a keyword with kwonly separator
+    [Arguments]    ${name}    @{}    ${version}=<unknown>    ${scope}    ${keywords}    ${listener}=False
+    No Operation
+
+dummy
+    a keyword with kwonly separator  a   scope=1  keywords=1