clear file caches if import is deleted/moved

Author: d-biehl

robotcode/language_server/robotframework/diagnostics/imports_manager.py

@@ -626,16 +626,19 @@ async def did_change_watched_files(self, sender: Any, changes: List[FileEvent])
 
     def __remove_library_entry(self, entry_key: _LibrariesEntryKey, entry: _LibrariesEntry, now: bool = False) -> None:
         async def remove(k: _LibrariesEntryKey, e: _LibrariesEntry) -> None:
-            if len(e.references) == 0 or now:
-                self._logger.debug(lambda: f"Remove Library Entry {k}")
-                async with self._libaries_lock:
-                    if len(e.references) == 0:
-                        e1 = self._libaries.get(k, None)
-                        if e1 == e:
-                            self._libaries.pop(k, None)
-
-                            await e.invalidate()
-                self._logger.debug(lambda: f"Library Entry {k} removed")
+            try:
+                if len(e.references) == 0 or now:
+                    self._logger.debug(lambda: f"Remove Library Entry {k}")
+                    async with self._libaries_lock:
+                        if len(e.references) == 0:
+                            e1 = self._libaries.get(k, None)
+                            if e1 == e:
+                                self._libaries.pop(k, None)
+
+                                await e.invalidate()
+                    self._logger.debug(lambda: f"Library Entry {k} removed")
+            finally:
+                await self._library_files_cache.clear()
 
         try:
             if asyncio.get_running_loop():
@@ -645,37 +648,44 @@ async def remove(k: _LibrariesEntryKey, e: _LibrariesEntry) -> None:
 
     def __remove_resource_entry(self, entry_key: _ResourcesEntryKey, entry: _ResourcesEntry, now: bool = False) -> None:
         async def remove(k: _ResourcesEntryKey, e: _ResourcesEntry) -> None:
-            if len(e.references) == 0 or now:
-                self._logger.debug(lambda: f"Remove Resource Entry {k}")
-                async with self._resources_lock:
-                    if len(e.references) == 0:
-                        e1 = self._resources.get(k, None)
-                        if e1 == e:
-                            self._resources.pop(k, None)
-
-                            await e.invalidate()
-                self._logger.debug(lambda: f"Resource Entry {k} removed")
+            try:
+                if len(e.references) == 0 or now:
+                    self._logger.debug(lambda: f"Remove Resource Entry {k}")
+                    async with self._resources_lock:
+                        if len(e.references) == 0 or now:
+                            e1 = self._resources.get(k, None)
+                            if e1 == e:
+                                self._resources.pop(k, None)
+
+                                await e.invalidate()
+                    self._logger.debug(lambda: f"Resource Entry {k} removed")
+            finally:
+                await self._resource_files_cache.clear()
 
         try:
             if asyncio.get_running_loop():
                 create_sub_task(remove(entry_key, entry))
+
         except RuntimeError:
             pass
 
     def __remove_variables_entry(
         self, entry_key: _VariablesEntryKey, entry: _VariablesEntry, now: bool = False
     ) -> None:
         async def remove(k: _VariablesEntryKey, e: _VariablesEntry) -> None:
-            if len(e.references) == 0 or now:
-                self._logger.debug(lambda: f"Remove Variables Entry {k}")
-                async with self._variables_lock:
-                    if len(e.references) == 0:
-                        e1 = self._variables.get(k, None)
-                        if e1 == e:
-                            self._variables.pop(k, None)
-
-                            await e.invalidate()
-                self._logger.debug(lambda: f"Variables Entry {k} removed")
+            try:
+                if len(e.references) == 0 or now:
+                    self._logger.debug(lambda: f"Remove Variables Entry {k}")
+                    async with self._variables_lock:
+                        if len(e.references) == 0:
+                            e1 = self._variables.get(k, None)
+                            if e1 == e:
+                                self._variables.pop(k, None)
+
+                                await e.invalidate()
+                    self._logger.debug(lambda: f"Variables Entry {k} removed")
+            finally:
+                await self._variables_files_cache.clear()
 
         try:
             if asyncio.get_running_loop():

robotcode/language_server/robotframework/parts/robot_workspace.py

@@ -90,6 +90,9 @@ async def _load_workspace_documents(self, sender: Any) -> List[WorkspaceDocument
                             current=i,
                         )
 
+                        if not f.exists():
+                            continue
+
                         document = await self.parent.documents.get_or_open_document(f, "robotframework")
 
                         if not document.opened_in_editor: