test: fix some regression tests

Author: d-biehl

packages/language_server/src/robotcode/language_server/common/parts/diagnostics.py

@@ -109,7 +109,8 @@ def __init__(self, protocol: "LanguageServerProtocol") -> None:
         self.parent.documents.on_document_cache_invalidated.add(self._on_document_cache_invalidated)
         self.parent.documents.did_close.add(self.on_did_close)
 
-        self.in_get_workspace_diagnostics = Event()
+        self.in_get_workspace_diagnostics_event = Event()
+        self.workspace_diagnostics_started_event = Event()
 
         self.client_supports_pull = False
 
@@ -345,10 +346,12 @@ def run_workspace_diagnostics(self) -> None:
             check_current_task_canceled()
 
             self.on_workspace_diagnostics_start(self)
+            self.in_get_workspace_diagnostics_event.clear()
+            self.workspace_diagnostics_started_event.set()
+            done_something = False
 
             try:
                 self._break_diagnostics_loop_event.clear()
-                self.in_get_workspace_diagnostics.clear()
 
                 documents = sorted(
                     [doc for doc in self.parent.documents.documents if self._doc_need_update(doc)],
@@ -361,8 +364,6 @@ def run_workspace_diagnostics(self) -> None:
 
                 self._logger.debug(lambda: f"start collecting workspace diagnostics for {len(documents)} documents")
 
-                done_something = False
-
                 self.on_workspace_diagnostics_analyze(self)
 
                 if self._break_diagnostics_loop_event.is_set():
@@ -428,8 +429,6 @@ def run_workspace_diagnostics(self) -> None:
                     self.on_workspace_diagnostics_break(self)
                     continue
 
-                self.in_get_workspace_diagnostics.set()
-
                 self.on_workspace_diagnostics_collect(self)
 
                 documents_to_collect = [
@@ -506,9 +505,6 @@ def run_workspace_diagnostics(self) -> None:
                             with self._current_diagnostics_task_lock:
                                 self._current_diagnostics_task = None
 
-                if not done_something:
-                    check_current_task_canceled(1)
-
                 self._logger.debug(
                     lambda: f"collecting workspace diagnostics for {len(documents_to_collect)} "
                     f"documents takes {time.monotonic() - start}s"
@@ -519,8 +515,13 @@ def run_workspace_diagnostics(self) -> None:
             except BaseException as e:
                 self._logger.exception(e)
             finally:
+                self.workspace_diagnostics_started_event.clear()
+                self.in_get_workspace_diagnostics_event.set()
                 self.on_workspace_diagnostics_end(self)
 
+                if not done_something:
+                    check_current_task_canceled(1)
+
     def reset_document_diagnostics_data(self, document: TextDocument) -> None:
         with self.get_diagnostics_data(document) as data:
             data.force = False

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf61/test_references.test[references.robot-011-016-a_custom_library].out

@@ -57,15 +57,6 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
-- !Location
-  range:
-    end:
-      character: 19
-      line: 7
-    start:
-      character: 11
-      line: 7
-  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf61/test_references.test[references.robot-011-020-a_custom_library].out

@@ -57,15 +57,6 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
-- !Location
-  range:
-    end:
-      character: 19
-      line: 7
-    start:
-      character: 11
-      line: 7
-  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf61/test_references.test[references.robot-011-023-a_custom_library].out

@@ -57,15 +57,6 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
-- !Location
-  range:
-    end:
-      character: 19
-      line: 7
-    start:
-      character: 11
-      line: 7
-  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf61/test_references.test[references.robot-013-016-a_same_custom_library].out

@@ -57,15 +57,6 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
-- !Location
-  range:
-    end:
-      character: 19
-      line: 7
-    start:
-      character: 11
-      line: 7
-  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf61/test_references.test[references.robot-013-020-a_same_custom_library].out

@@ -57,15 +57,6 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
-- !Location
-  range:
-    end:
-      character: 19
-      line: 7
-    start:
-      character: 11
-      line: 7
-  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf61/test_references.test[references.robot-013-023-a_same_custom_library].out

@@ -57,15 +57,6 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
-- !Location
-  range:
-    end:
-      character: 19
-      line: 7
-    start:
-      character: 11
-      line: 7
-  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

tests/robotcode/language_server/robotframework/parts/conftest.py

@@ -92,6 +92,9 @@ def protocol(
     # diagnostics_end.wait(120)
     # protocol.diagnostics.cancel_workspace_diagnostics_task(None)
 
+    protocol.diagnostics.workspace_diagnostics_started_event.wait(300)
+    protocol.diagnostics.in_get_workspace_diagnostics_event.wait(300)
+
     try:
         yield protocol
     finally: