robotcode-language-server 1.1.0__tar.gz → 1.3.0.dev1__tar.gz

{robotcode_language_server-1.1.0 → robotcode_language_server-1.3.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robotcode-language-server
-Version: 1.1.0
+Version: 1.3.0.dev1
 Summary: RobotCode Language Server for Robot Framework
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode
@@ -25,10 +25,10 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: robotcode-analyze==1.1.0
-Requires-Dist: robotcode-jsonrpc2==1.1.0
-Requires-Dist: robotcode-robot==1.1.0
-Requires-Dist: robotcode==1.1.0
+Requires-Dist: robotcode-analyze==1.3.0-dev1
+Requires-Dist: robotcode-jsonrpc2==1.3.0-dev1
+Requires-Dist: robotcode-robot==1.3.0-dev1
+Requires-Dist: robotcode==1.3.0-dev1
 Requires-Dist: robotframework>=4.1.0
 Description-Content-Type: text/markdown
 

{robotcode_language_server-1.1.0 → robotcode_language_server-1.3.0.dev1}/pyproject.toml

@@ -27,10 +27,10 @@ classifiers = [
 ]
 dependencies = [
   "robotframework>=4.1.0",
-  "robotcode-jsonrpc2==1.1.0",
-  "robotcode-robot==1.1.0",
-  "robotcode-analyze==1.1.0",
-  "robotcode==1.1.0",
+  "robotcode-jsonrpc2==1.3.0-dev1",
+  "robotcode-robot==1.3.0-dev1",
+  "robotcode-analyze==1.3.0-dev1",
+  "robotcode==1.3.0-dev1",
 ]
 dynamic = ["version"]
 

robotcode_language_server-1.3.0.dev1/src/robotcode/language_server/__version__.py

@@ -0,0 +1 @@
+__version__ = "1.3.0-dev1"

{robotcode_language_server-1.1.0 → robotcode_language_server-1.3.0.dev1}/src/robotcode/language_server/robotframework/parts/document_symbols.py

@@ -6,7 +6,6 @@ from robot.errors import VariableError
 from robot.parsing.lexer.tokens import Token
 from robot.parsing.model.blocks import Keyword, Section, TestCase
 from robot.parsing.model.statements import Statement
-from robot.variables import search_variable
 
 from robotcode.core.language import language_id
 from robotcode.core.lsp.types import (
@@ -21,6 +20,7 @@ from robotcode.robot.utils.ast import (
     range_from_token,
     tokenize_variables,
 )
+from robotcode.robot.utils.variables import search_variable
 from robotcode.robot.utils.visitor import Visitor
 
 from .protocol_part import RobotLanguageServerProtocolPart

{robotcode_language_server-1.1.0 → robotcode_language_server-1.3.0.dev1}/src/robotcode/language_server/robotframework/parts/project_info.py

@@ -30,16 +30,24 @@ class ProjectInfoPart(RobotLanguageServerProtocolPart):
 
     @rpc_method(name="robot/projectInfo", threaded=True)
     @_logger.call
-    def _get_document_imports(
+    def _robot_project_info(
         self,
         *args: Any,
         **kwargs: Any,
     ) -> ProjectInfo:
         robocop_version_string = None
         if robocop_installed():
-            from robocop.version import __version__
+            try:
+                from robocop.version import __version__
 
-            robocop_version_string = __version__
+                robocop_version_string = __version__
+            except ImportError:
+                try:
+                    from robocop import __version__
+
+                    robocop_version_string = __version__
+                except ImportError:
+                    pass
 
         tidy_version_string = None
         if robotidy_installed():

{robotcode_language_server-1.1.0 → robotcode_language_server-1.3.0.dev1}/src/robotcode/language_server/robotframework/parts/semantic_tokens.py

@@ -70,7 +70,7 @@ from robotcode.robot.utils.ast import (
     iter_over_keyword_names_and_owners,
     token_in_range,
 )
-from robotcode.robot.utils.variables import is_variable, split_from_equals
+from robotcode.robot.utils.variables import split_from_equals
 
 from .protocol_part import RobotLanguageServerProtocolPart
 
@@ -116,6 +116,8 @@ class RobotSemTokenTypes(Enum):
     FOR_SEPARATOR = "forSeparator"
     VARIABLE_BEGIN = "variableBegin"
     VARIABLE_END = "variableEnd"
+    EXPRESSION_BEGIN = "expressionBegin"
+    EXPRESSION_END = "expressionEnd"
     VARIABLE_EXPRESSION = "variableExpression"
     ESCAPE = "escape"
     NAMESPACE = "namespace"
@@ -362,46 +364,8 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
                 sem_mod = {SemanticTokenModifiers.DOCUMENTATION}
 
             if token.type in [Token.VARIABLE, Token.ASSIGN]:
-                if is_variable(token.value, "$@&%"):
-                    if col_offset is None:
-                        col_offset = token.col_offset
-                    if length is None:
-                        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,
-                            3 if is_expr else 2,
-                            RobotSemTokenTypes.VARIABLE_BEGIN,
-                            sem_mod,
-                        )
-
-                        yield SemTokenInfo(
-                            token.lineno,
-                            col_offset + ((last_index - 1) if is_expr else last_index),
-                            2 if is_expr else 1,
-                            RobotSemTokenTypes.VARIABLE_END,
-                            sem_mod,
-                        )
-
-                        if length - last_index - 1 > 0:
-                            yield SemTokenInfo.from_token(
-                                token,
-                                sem_type,
-                                sem_mod,
-                                col_offset + last_index + 1,
-                                length - last_index - 1,
-                            )
-                    else:
-                        yield SemTokenInfo.from_token(token, sem_type, sem_mod)
-
-                else:
-                    yield SemTokenInfo.from_token(token, sem_type, sem_mod)
+                # TODO: maybe we can distinguish between local and global variables, by default all variables are global
+                pass
 
             elif token.type in [Token.KEYWORD, ROBOT_KEYWORD_INNER] or (
                 token.type == Token.NAME and cached_isinstance(node, Fixture, Template, TestTemplate)

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

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