robotcode-language-server 0.104.0__tar.gz → 0.105.0__tar.gz

{robotcode_language_server-0.104.0 → robotcode_language_server-0.105.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robotcode-language-server
-Version: 0.104.0
+Version: 0.105.0
 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==0.104.0
-Requires-Dist: robotcode-jsonrpc2==0.104.0
-Requires-Dist: robotcode-robot==0.104.0
-Requires-Dist: robotcode==0.104.0
+Requires-Dist: robotcode-analyze==0.105.0
+Requires-Dist: robotcode-jsonrpc2==0.105.0
+Requires-Dist: robotcode-robot==0.105.0
+Requires-Dist: robotcode==0.105.0
 Requires-Dist: robotframework>=4.1.0
 Description-Content-Type: text/markdown
 

{robotcode_language_server-0.104.0 → robotcode_language_server-0.105.0}/pyproject.toml

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

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

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

{robotcode_language_server-0.104.0 → robotcode_language_server-0.105.0}/src/robotcode/language_server/robotframework/parts/hover.py

@@ -44,6 +44,16 @@ if TYPE_CHECKING:
 _HoverMethod = Callable[[ast.AST, List[ast.AST], TextDocument, Position], Optional[Hover]]
 
 
+class MyRepr(reprlib.Repr):
+    def __init__(self) -> None:
+        super().__init__()
+        self.maxstring = 50
+        self.indent = 4
+
+
+_my_repr = MyRepr()
+
+
 class RobotHoverProtocolPart(RobotLanguageServerProtocolPart, ModelHelper):
     _logger = LoggingDescriptor()
 
@@ -115,6 +125,7 @@ class RobotHoverProtocolPart(RobotLanguageServerProtocolPart, ModelHelper):
                     )
                 )
                 value = None
+                real_value = None
                 if found_range is not None:
                     highlight_range = found_range
                     if variable.has_value or variable.resolvable:
@@ -132,13 +143,14 @@ class RobotHoverProtocolPart(RobotLanguageServerProtocolPart, ModelHelper):
                                 value = "[]"
                         else:
                             try:
-                                value = reprlib.repr(
-                                    namespace.imports_manager.resolve_variable(
-                                        variable.name,
-                                        str(document.uri.to_path().parent),
-                                        namespace.get_resolvable_variables(nodes, position),
-                                    )
+                                real_value = namespace.imports_manager.resolve_variable(
+                                    variable.name,
+                                    str(document.uri.to_path().parent),
+                                    namespace.get_resolvable_variables(nodes, position),
                                 )
+
+                                value = _my_repr.repr(real_value)
+
                             except (
                                 asyncio.CancelledError,
                                 SystemExit,
@@ -150,15 +162,18 @@ class RobotHoverProtocolPart(RobotLanguageServerProtocolPart, ModelHelper):
                                 value = ""
                     else:
                         value = ""
-                    if text is None:
-                        text = ""
-                    if text:
-                        text += "\n"
 
-                    text += f"| ({variable.type.value}) | {variable.name} | {f' `{value}`' if value else ''} |"
+                    text = f"### {variable.type.value.title()} `{variable.name}`\n\n"
+
+                    if value:
 
+                        text += "```python\n"
+                        text += f"value: {type(real_value).__name__} = {value}\n"
+                        text += "```\n"
+
+                    text += "\n"
             if text:
-                text = "| | | |\n|:--|:--|:--|\n" + text
+
                 return Hover(
                     contents=MarkupContent(kind=MarkupKind.MARKDOWN, value=text),
                     range=highlight_range,

{robotcode_language_server-0.104.0 → robotcode_language_server-0.105.0}/src/robotcode/language_server/robotframework/parts/semantic_tokens.py

@@ -32,6 +32,7 @@ from robot.parsing.model.statements import (
     ResourceImport,
     Statement,
     Template,
+    TemplateArguments,
     TestTemplate,
     Variable,
     VariablesImport,
@@ -163,8 +164,6 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
         parent.semantic_tokens.token_modifiers += list(RobotSemTokenModifiers)
 
         parent.semantic_tokens.collect_full.add(self.collect_full)
-        # parent.semantic_tokens.collect_range.add(self.collect_range)
-        # parent.semantic_tokens.collect_full_delta.add(self.collect_full_delta)
 
         self.parent.on_initialized.add(self._on_initialized)
 
@@ -345,9 +344,8 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
 
     BUILTIN_MATCHER: ClassVar = KeywordMatcher("BuiltIn", is_namespace=True)
 
-    @classmethod
     def generate_sem_sub_tokens(
-        cls,
+        self,
         namespace: Namespace,
         builtin_library_doc: Optional[LibraryDoc],
         token: Token,
@@ -356,7 +354,8 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
         length: Optional[int] = None,
         yield_arguments: bool = False,
     ) -> Iterator[SemTokenInfo]:
-        sem_info = cls.mapping().get(token.type, None) if token.type is not None else None
+
+        sem_info = self.mapping().get(token.type, None) if token.type is not None else None
         if sem_info is not None:
             sem_type, sem_mod = sem_info
 
@@ -419,7 +418,7 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
                     bdd_len = 0
 
                     if get_robot_version() < (6, 0):
-                        bdd_match = cls.BDD_TOKEN_REGEX.match(token.value)
+                        bdd_match = self.BDD_TOKEN_REGEX.match(token.value)
                         if bdd_match:
                             bdd_len = len(bdd_match.group(1))
                     else:
@@ -489,7 +488,7 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
                         col_offset,
                         len(kw_namespace),
                         RobotSemTokenTypes.NAMESPACE,
-                        {RobotSemTokenModifiers.BUILTIN} if kw_namespace == cls.BUILTIN_MATCHER else None,
+                        {RobotSemTokenModifiers.BUILTIN} if kw_namespace == self.BUILTIN_MATCHER else None,
                     )
                     yield SemTokenInfo(
                         token.lineno,
@@ -499,7 +498,11 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
                     )
 
                 if builtin_library_doc is not None and kw in builtin_library_doc.keywords:
-                    if kw_doc is not None and kw_doc.libname == cls.BUILTIN_MATCHER and kw_doc.matcher.match_string(kw):
+                    if (
+                        kw_doc is not None
+                        and kw_doc.libname == self.BUILTIN_MATCHER
+                        and kw_doc.matcher.match_string(kw)
+                    ):
                         if not sem_mod:
                             sem_mod = set()
                         sem_mod.add(RobotSemTokenModifiers.BUILTIN)
@@ -534,9 +537,7 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
                                 ignore_errors=True,
                                 identifiers="$@&%",
                             ):
-                                for e in cls.generate_sem_sub_tokens(
-                                    namespace, builtin_library_doc, sub_token, node, yield_arguments=True
-                                ):
+                                for e in self.generate_sem_sub_tokens(namespace, builtin_library_doc, sub_token, node):
                                     e.sem_modifiers = {RobotSemTokenModifiers.EMBEDDED}
                                     yield e
 
@@ -558,7 +559,7 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
                     if col_offset is None:
                         col_offset = token.col_offset
 
-                    for g in cls.ESCAPE_REGEX.finditer(token.value):
+                    for g in self.ESCAPE_REGEX.finditer(token.value):
                         yield SemTokenInfo.from_token(
                             token,
                             RobotSemTokenTypes.NAMESPACE if g.group("x") is None else RobotSemTokenTypes.ESCAPE,
@@ -626,6 +627,7 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
                 if (
                     yield_arguments
                     or token.type != Token.ARGUMENT
+                    or (token.type == Token.ARGUMENT and cached_isinstance(node, TemplateArguments))
                     or (token.type != Token.NAME and cached_isinstance(node, Metadata))
                 ):
                     yield SemTokenInfo.from_token(token, sem_type, sem_mod, col_offset, length)
@@ -699,13 +701,11 @@ class RobotSemanticTokenProtocolPart(RobotLanguageServerProtocolPart):
                 ignore_errors=True,
                 identifiers="$" if token.type == Token.KEYWORD_NAME else "$@&%",
             ):
-                for e in self.generate_sem_sub_tokens(
-                    namespace, builtin_library_doc, sub_token, node, yield_arguments=True
-                ):
+                for e in self.generate_sem_sub_tokens(namespace, builtin_library_doc, sub_token, node):
                     yield e
 
         else:
-            for e in self.generate_sem_sub_tokens(namespace, builtin_library_doc, token, node, yield_arguments=True):
+            for e in self.generate_sem_sub_tokens(namespace, builtin_library_doc, token, node):
                 yield e
 
     def generate_run_kw_tokens(

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

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