find reference include declaration if kw is library kw

Author: d-biehl

robotcode/language_server/robotframework/diagnostics/imports_manager.py

@@ -883,6 +883,7 @@ def _create_handler(self, kw: Any) -> Any:
                     source=kw[0].source,
                     line_no=kw[0].lineno,
                     libname=libdoc.name,
+                    libtype=libdoc.type,
                     is_embedded=is_embedded_keyword(kw[0].name),
                     errors=getattr(kw[1], "errors") if hasattr(kw[1], "errors") else None,
                     is_error_handler=isinstance(kw[1], UserErrorHandler),

robotcode/language_server/robotframework/diagnostics/library_doc.py

@@ -294,6 +294,7 @@ class KeywordDoc:
     end_line_no: int = -1
     type: str = "keyword"
     libname: Optional[str] = None
+    libtype: Optional[str] = None
     longname: Optional[str] = None
     is_embedded: bool = False
     errors: Optional[List[Error]] = None
@@ -1221,6 +1222,7 @@ def get_test_library(
                             # libname=kw[1].libname,
                             # longname=kw[1].longname,
                             libname=libdoc.name,
+                            libtype=libdoc.type,
                             longname=f"{libdoc.name}.{kw[0].name}",
                             doc_format=str(lib.doc_format) or DEFAULT_DOC_FORMAT,
                             is_initializer=True,
@@ -1258,6 +1260,7 @@ def get_test_library(
                             source=kw[0].source,
                             line_no=kw[0].lineno,
                             libname=libdoc.name,
+                            libtype=libdoc.type,
                             longname=f"{libdoc.name}.{kw[0].name}",
                             is_embedded=is_embedded_keyword(kw[0].name),
                             doc_format=str(lib.doc_format) or DEFAULT_DOC_FORMAT,

robotcode/language_server/robotframework/parts/references.py

@@ -735,9 +735,16 @@ async def find_keyword_references(
             or await namespace.get_library_doc()
         )
 
-        return await self._find_references(
-            document, self.find_keyword_references_in_file, kw_doc, lib_doc, include_declaration
-        )
+        return [
+            *(
+                [Location(str(Uri.from_path(kw_doc.source)), kw_doc.range)]
+                if include_declaration and kw_doc.libtype == "LIBRARY" and kw_doc.source
+                else []
+            ),
+            *await self._find_references(
+                document, self.find_keyword_references_in_file, kw_doc, lib_doc, include_declaration
+            ),
+        ]
 
     @_logger.call
     async def _find_library_import_references_in_file(

robotcode/language_server/robotframework/parts/robot_workspace.py

@@ -48,7 +48,8 @@ async def get_or_open_document(
 
     @_logger.call
     async def _on_initialized(self, sender: Any) -> None:
-        self.parent.workspace.did_change_configuration.add(self._on_change_configuration)
+        # self.parent.workspace.did_change_configuration.add(self._on_change_configuration)
+        pass
 
     @_logger.call
     @threaded()