chore: remove some code smells

Author: d-biehl

packages/language_server/src/robotcode/language_server/robotframework/parts/debugging_utils.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Any, Optional
 
 from robotcode.core.async_itertools import async_next
-from robotcode.core.async_tools import run_coroutine_in_thread, threaded
+from robotcode.core.async_tools import threaded
 from robotcode.core.dataclasses import CamelSnakeMixin
 from robotcode.core.logging import LoggingDescriptor
 from robotcode.core.lsp.types import Position, Range, TextDocumentIdentifier
@@ -53,55 +53,52 @@ async def _get_evaluatable_expression(
     ) -> Optional[EvaluatableExpression]:
         from robot.parsing.lexer.tokens import Token as RobotToken
 
-        async def run() -> Optional[EvaluatableExpression]:
-            document = await self.parent.documents.get(text_document.uri)
-            if document is None:
-                return None
+        document = await self.parent.documents.get(text_document.uri)
+        if document is None:
+            return None
 
-            namespace = await self.parent.documents_cache.get_namespace(document)
-            model = await self.parent.documents_cache.get_model(document, False)
+        namespace = await self.parent.documents_cache.get_namespace(document)
+        model = await self.parent.documents_cache.get_model(document, False)
 
-            nodes = await get_nodes_at_position(model, position)
-            node = nodes[-1]
+        nodes = await get_nodes_at_position(model, position)
+        node = nodes[-1]
 
-            if not isinstance(node, HasTokens):
-                return None
+        if not isinstance(node, HasTokens):
+            return None
 
-            token = get_tokens_at_position(node, position)[-1]
+        token = get_tokens_at_position(node, position)[-1]
 
+        token_and_var = await async_next(
+            (
+                (t, v)
+                async for t, v in self.iter_variables_from_token(token, namespace, nodes, position)
+                if position in range_from_token(t)
+            ),
+            None,
+        )
+
+        if (
+            token_and_var is None
+            and isinstance(node, self.get_expression_statement_types())
+            and (token := node.get_token(RobotToken.ARGUMENT)) is not None
+            and position in range_from_token(token)
+        ):
             token_and_var = await async_next(
                 (
-                    (t, v)
-                    async for t, v in self.iter_variables_from_token(token, namespace, nodes, position)
-                    if position in range_from_token(t)
+                    (var_token, var)
+                    async for var_token, var in self.iter_expression_variables_from_token(
+                        token, namespace, nodes, position
+                    )
+                    if position in range_from_token(var_token)
                 ),
                 None,
             )
 
-            if (
-                token_and_var is None
-                and isinstance(node, self.get_expression_statement_types())
-                and (token := node.get_token(RobotToken.ARGUMENT)) is not None
-                and position in range_from_token(token)
-            ):
-                token_and_var = await async_next(
-                    (
-                        (var_token, var)
-                        async for var_token, var in self.iter_expression_variables_from_token(
-                            token, namespace, nodes, position
-                        )
-                        if position in range_from_token(var_token)
-                    ),
-                    None,
-                )
-
-            if token_and_var is None:
-                return None
-
-            var_token, var = token_and_var
-            if var.name == "${CURDIR}":
-                return None
-
-            return EvaluatableExpression(range_from_token(var_token), var.name)
-
-        return await run_coroutine_in_thread(run)
+        if token_and_var is None:
+            return None
+
+        var_token, var = token_and_var
+        if var.name == "${CURDIR}":
+            return None
+
+        return EvaluatableExpression(range_from_token(var_token), var.name)

packages/language_server/src/robotcode/language_server/robotframework/parts/inline_value.py

@@ -50,6 +50,8 @@ async def collect(
     ) -> Optional[List[InlineValue]]:
         from robot.parsing.lexer import Token as RobotToken
 
+        # TODO make this configurable
+
         namespace = await self.parent.documents_cache.get_namespace(document)
 
         model = await self.parent.documents_cache.get_model(document, False)

pyproject.toml

@@ -219,7 +219,7 @@ warn_return_any = true
 warn_unused_configs = true
 warn_unreachable = true
 implicit_optional = true
-# disallow_untyped_decorators = false
+disallow_untyped_decorators = false
 disallow_subclassing_any = false
 exclude = [
   "\\.mypy_cache",

tests/robotcode/core/test_dataclasses.py

@@ -4,24 +4,20 @@
 from typing import Any, Dict, List, Literal, Optional, Union
 
 import pytest
-
+from robotcode.core.dataclasses import as_json, from_json, to_camel_case, to_snake_case
 from robotcode.core.lsp.types import (
     CallHierarchyClientCapabilities,
     ClientCapabilities,
-    WindowClientCapabilities,
-    WorkspaceClientCapabilities,
-    FileOperationClientCapabilities,
-    InitializeParamsClientInfoType,
     CodeActionClientCapabilities,
     CodeActionClientCapabilitiesCodeActionLiteralSupportType,
     CodeActionClientCapabilitiesCodeActionLiteralSupportTypeCodeActionKindType,
     CodeActionClientCapabilitiesResolveSupportType,
     CodeLensClientCapabilities,
     CodeLensWorkspaceClientCapabilities,
     CompletionClientCapabilities,
+    CompletionClientCapabilitiesCompletionItemKindType,
     CompletionClientCapabilitiesCompletionItemType,
     CompletionClientCapabilitiesCompletionItemTypeInsertTextModeSupportType,
-    CompletionClientCapabilitiesCompletionItemKindType,
     CompletionClientCapabilitiesCompletionItemTypeResolveSupportType,
     CompletionClientCapabilitiesCompletionItemTypeTagSupportType,
     CompletionItemKind,
@@ -42,10 +38,12 @@
     DocumentSymbolClientCapabilitiesTagSupportType,
     ExecuteCommandClientCapabilities,
     FailureHandlingKind,
+    FileOperationClientCapabilities,
     FoldingRangeClientCapabilities,
     HoverClientCapabilities,
     ImplementationClientCapabilities,
     InitializeParams,
+    InitializeParamsClientInfoType,
     InsertTextMode,
     LinkedEditingRangeClientCapabilities,
     MarkupKind,
@@ -72,14 +70,15 @@
     TokenFormat,
     TraceValues,
     TypeDefinitionClientCapabilities,
+    WindowClientCapabilities,
+    WorkspaceClientCapabilities,
     WorkspaceEditClientCapabilities,
     WorkspaceEditClientCapabilitiesChangeAnnotationSupportType,
     WorkspaceFolder,
     WorkspaceSymbolClientCapabilities,
     WorkspaceSymbolClientCapabilitiesSymbolKindType,
     WorkspaceSymbolClientCapabilitiesTagSupportType,
 )
-from robotcode.core.dataclasses import as_json, from_json, to_camel_case, to_snake_case
 
 
 class EnumData(Enum):