correct hover keywords and testcases

Author: d-biehl

robotcode/language_server/robotframework/diagnostics/library_doc.py

@@ -384,7 +384,10 @@ def _matchers(self) -> Dict[KeywordMatcher, KeywordDoc]:
             self.__matchers = {KeywordMatcher(k): v for k, v in self.keywords.items()}
         return self.__matchers
 
-    def __getitem__(self, key: str) -> "KeywordDoc":
+    def __getitem__(self, key: Union[KeywordMatcher, str]) -> "KeywordDoc":
+        if isinstance(key, str):
+            key = KeywordMatcher(key)
+
         items = [(k, v) for k, v in self._matchers.items() if k == key]
 
         if not items:
@@ -426,7 +429,7 @@ def keys(self) -> AbstractSet[str]:
     def values(self) -> ValuesView[KeywordDoc]:
         return self.keywords.values()
 
-    def get(self, key: str, default: Optional[KeywordDoc] = None) -> Optional[KeywordDoc]:
+    def get(self, key: Union[KeywordMatcher, str], default: Optional[KeywordDoc] = None) -> Optional[KeywordDoc]:
         try:
             return self.__getitem__(key)
         except KeyError:

robotcode/language_server/robotframework/parts/hover.py

@@ -19,6 +19,7 @@
 from ...common.language import language_id
 from ...common.lsp_types import Hover, MarkupContent, MarkupKind, Position
 from ...common.text_document import TextDocument
+from ..diagnostics.library_doc import KeywordMatcher
 from ..utils.ast import (
     HasTokens,
     Token,
@@ -74,17 +75,13 @@ async def run() -> Optional[Hover]:
             if not result_nodes:
                 return None
 
-            while result_nodes:
-                result_node = result_nodes[-1]
-
+            for result_node in reversed(result_nodes):
                 method = self._find_method(type(result_node))
                 if method is not None:
                     result = await method(result_node, document, position)
                     if result is not None:
                         return result
 
-                result_nodes = result_nodes[:-1]
-
             return await self._hover_default(result_nodes, document, position)
 
         return await run_coroutine_in_thread(run)
@@ -127,31 +124,6 @@ async def _hover_default(self, nodes: List[ast.AST], document: TextDocument, pos
                 pass
         return None
 
-    async def hover_KeywordName(  # noqa: N802
-        self, node: ast.AST, document: TextDocument, position: Position
-    ) -> Optional[Hover]:
-        from robot.parsing.lexer.tokens import Token as RobotToken
-        from robot.parsing.model.statements import KeywordName
-
-        namespace = await self.parent.documents_cache.get_namespace(document)
-        if namespace is None:
-            return None
-
-        kw_node = cast(KeywordName, node)
-        name_token = kw_node.get_token(RobotToken.KEYWORD_NAME)
-        if not name_token:
-            return None
-
-        result = await namespace.find_keyword(name_token.value)
-
-        if result is not None and not result.is_error_handler:
-            return Hover(
-                contents=MarkupContent(kind=MarkupKind.MARKDOWN, value=result.to_markdown()),
-                range=range_from_token_or_node(node, name_token),
-            )
-
-        return None
-
     async def hover_KeywordCall(  # noqa: N802
         self, node: ast.AST, document: TextDocument, position: Position
     ) -> Optional[Hover]:
@@ -312,6 +284,31 @@ async def hover_ResourceImport(  # noqa: N802
                     pass
         return None
 
+    async def hover_KeywordName(  # noqa: N802
+        self, node: ast.AST, document: TextDocument, position: Position
+    ) -> Optional[Hover]:
+        from robot.parsing.lexer.tokens import Token as RobotToken
+        from robot.parsing.model.statements import KeywordName
+
+        namespace = await self.parent.documents_cache.get_namespace(document)
+        if namespace is None:
+            return None
+
+        kw_node = cast(KeywordName, node)
+        name_token = kw_node.get_token(RobotToken.KEYWORD_NAME)
+        if not name_token:
+            return None
+
+        result = (await namespace.get_library_doc()).keywords.get(KeywordMatcher(name_token.value), None)
+
+        if result is not None and not result.is_error_handler:
+            return Hover(
+                contents=MarkupContent(kind=MarkupKind.MARKDOWN, value=result.to_markdown()),
+                range=range_from_token_or_node(node, name_token),
+            )
+
+        return None
+
     async def hover_TestCase(  # noqa: N802
         self, node: ast.AST, document: TextDocument, position: Position
     ) -> Optional[Hover]: