robotcode-language-server 0.76.2__tar.gz → 0.77.0__tar.gz

{robotcode_language_server-0.76.2 → robotcode_language_server-0.77.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotcode-language-server
-Version: 0.76.2
+Version: 0.77.0
 Summary: RobotCode Language Server for Robot Framework
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://github.com/sponsors/d-biehl
@@ -25,8 +25,8 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: robotcode-jsonrpc2==0.76.2
-Requires-Dist: robotcode==0.76.2
+Requires-Dist: robotcode-jsonrpc2==0.77.0
+Requires-Dist: robotcode==0.77.0
 Requires-Dist: robotframework>=4.1.0
 Description-Content-Type: text/markdown
 

{robotcode_language_server-0.76.2 → robotcode_language_server-0.77.0}/pyproject.toml

@@ -27,8 +27,8 @@ classifiers = [
 ]
 dependencies = [
   "robotframework>=4.1.0",
-  "robotcode-jsonrpc2==0.76.2",
-  "robotcode==0.76.2",
+  "robotcode-jsonrpc2==0.77.0",
+  "robotcode==0.77.0",
 ]
 dynamic = ["version"]
 

robotcode_language_server-0.77.0/src/robotcode/language_server/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.77.0"

{robotcode_language_server-0.76.2 → robotcode_language_server-0.77.0}/src/robotcode/language_server/common/parts/diagnostics.py

@@ -109,7 +109,8 @@ class DiagnosticsProtocolPart(LanguageServerProtocolPart):
         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 @@ class DiagnosticsProtocolPart(LanguageServerProtocolPart):
             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 @@ class DiagnosticsProtocolPart(LanguageServerProtocolPart):
 
                 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 @@ class DiagnosticsProtocolPart(LanguageServerProtocolPart):
                     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 @@ class DiagnosticsProtocolPart(LanguageServerProtocolPart):
                             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 @@ class DiagnosticsProtocolPart(LanguageServerProtocolPart):
             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

{robotcode_language_server-0.76.2 → robotcode_language_server-0.77.0}/src/robotcode/language_server/robotframework/parts/semantic_tokens.py

@@ -109,6 +109,7 @@ class RobotSemTokenTypes(Enum):
     FOR_SEPARATOR = "forSeparator"
     VARIABLE_BEGIN = "variableBegin"
     VARIABLE_END = "variableEnd"
+    VARIABLE_EXPRESSION = "variableExpression"
     ESCAPE = "escape"
     NAMESPACE = "namespace"
     ERROR = "error"
@@ -355,27 +356,30 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
                         length = token.end_col_offset - token.col_offset
 
                     last_index = token.value.rfind("}")
+
+                    is_expr = token.value[1:2] == "{" and token.value[last_index - 1 : last_index] == "}"
+
                     if last_index >= 0:
                         yield SemTokenInfo(
                             token.lineno,
                             col_offset,
-                            2,
+                            3 if is_expr else 2,
                             RobotSemTokenTypes.VARIABLE_BEGIN,
                             sem_mod,
                         )
 
-                        yield SemTokenInfo.from_token(
-                            token,
-                            sem_type,
-                            sem_mod,
-                            col_offset + 2,
-                            last_index - 2,
-                        )
+                        # yield SemTokenInfo.from_token(
+                        #     token,
+                        #     RobotSemTokenTypes.VARIABLE_EXPRESSION if is_expr else sem_type,
+                        #     sem_mod,
+                        #     col_offset + (3 if is_expr else 2),
+                        #     last_index - (4 if is_expr else 2),
+                        # )
 
                         yield SemTokenInfo(
                             token.lineno,
-                            col_offset + last_index,
-                            1,
+                            col_offset + ((last_index - 1) if is_expr else last_index),
+                            2 if is_expr else 1,
                             RobotSemTokenTypes.VARIABLE_END,
                             sem_mod,
                         )

robotcode_language_server-0.76.2/src/robotcode/language_server/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.76.2"