correct _ResourcesEntry dead lock in get_libdoc

Author: d-biehl

pyproject.toml

@@ -74,6 +74,7 @@ testpaths = ["tests"]
 junit_suite_name = "robotcode"
 log_cli = true
 log_cli_level = "DEBUG"
+log_cli_format = "%(levelname)s %(name)s: %(message)s"
 
 [tool.isort]
 profile = "black"

robotcode/language_server/common/parts/workspace.py

@@ -407,7 +407,9 @@ async def add_file_watchers(
                         watchers=[FileSystemWatcher(glob_pattern=w.glob_pattern, kind=w.kind) for w in _watchers]
                     ),
                 )
-            # TODO: implement own filewatcher if not supported by language server client
+            else:
+                # TODO: implement own filewatcher if not supported by language server client
+                self._logger.warning("client did not support workspace/didChangeWatchedFiles.")
 
         def remove() -> None:
             if self._loop.is_running():

robotcode/language_server/robotframework/diagnostics/imports_manager.py

@@ -314,10 +314,17 @@ async def is_valid(self) -> bool:
     async def get_document(self) -> TextDocument:
         if self._document is None:
             async with self._lock:
-                if self._document is None:
-                    await self._update()
+                await self._get_document()
+
+        assert self._document is not None
+
+        return self._document
+
+    async def _get_document(self) -> TextDocument:
+        if self._document is None:
+            await self._update()
 
-                assert self._document is not None
+        assert self._document is not None
 
         return self._document
 
@@ -330,7 +337,7 @@ async def get_libdoc(self) -> LibraryDoc:
                 if self._lib_doc is None:
                     self._lib_doc = await (
                         await self.parent.parent_protocol.documents_cache.get_resource_namespace(
-                            await self.get_document()
+                            await self._get_document()
                         )
                     ).get_library_doc()
         return self._lib_doc

tests/robotcode/language_server/robotframework/parts/data/goto.robot

@@ -7,7 +7,7 @@ Library           ${CURDIR}/libs/myvariables.py
 Variables         ${CURDIR}/libs/myvariables.py
 # TODO                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  Variables Import: len(result) == 1 and result[0].target_uri.endswith("libs/myvariables.py")
 Resource          ${CURDIR}/resources/firstresource.resource
-#                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  Resource Import: len(result) == 1 and result[0].target_uri.endswith("/resources/firstresource.resource")
+#                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  Resource Import: len(result) == 1 and result[0].target_uri.endswith("/resources/firstresource.resource")
 
 *** Variables ***
 ${A VAR}          i'm a var