chore: some reformatting, corrections and fixing pyright hints

Author: d-biehl

bundled_requirements.txt

@@ -1,2 +1,4 @@
+typing-extensions>=4.4.0
 click>=8.1.0
 pluggy>=1.0.0
+tomli > 2.0.0

packages/core/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
   "Topic :: Utilities",
   "Typing :: Typed",
 ]
-dependencies = []
+dependencies = ["typing-extensions>=4.4.0"]
 dynamic = ["version"]
 
 [project.urls]

packages/language_server/robotcode/language_server/robotframework/diagnostics/library_doc.py

@@ -1101,15 +1101,15 @@ def _std_capture() -> Iterator[io.StringIO]:
     old_stdout = sys.stdout
     old_stderr = sys.stderr
 
-    capturer = sys.stdout = sys.__stdout__ = sys.stderr = sys.__stderr__ = io.StringIO()
+    capturer = sys.stdout = sys.__stdout__ = sys.stderr = sys.__stderr__ = io.StringIO()  # type: ignore
 
     try:
         yield capturer
     finally:
         sys.stderr = old_stderr
         sys.stdout = old_stdout
-        sys.__stderr__ = old__stderr__
-        sys.__stdout__ = old__stdout__
+        sys.__stderr__ = old__stderr__  # type: ignore
+        sys.__stdout__ = old__stdout__  # type: ignore
 
 
 class IgnoreEasterEggLibraryWarning(Exception):  # noqa: N818

packages/language_server/robotcode/language_server/robotframework/parts/formatting.py

@@ -8,12 +8,20 @@
 
 from robotcode.core.logging import LoggingDescriptor
 from robotcode.language_server.common.decorators import language_id
-from robotcode.language_server.common.lsp_types import FormattingOptions, MessageType, Position, Range, TextEdit
+from robotcode.language_server.common.lsp_types import (
+    FormattingOptions,
+    MessageType,
+    Position,
+    Range,
+    TextEdit,
+)
 from robotcode.language_server.common.text_document import TextDocument
 from robotcode.language_server.robotframework.utils.version import get_robot_version
 
 if TYPE_CHECKING:
-    from robotcode.language_server.robotframework.protocol import RobotLanguageServerProtocol
+    from robotcode.language_server.robotframework.protocol import (
+        RobotLanguageServerProtocol,
+    )
 
 from robotcode.core.utils.version import create_version_from_str
 from robotcode.language_server.robotframework.configuration import RoboTidyConfig
@@ -57,7 +65,11 @@ async def get_config(self, document: TextDocument) -> Optional[RoboTidyConfig]:
     @language_id("robotframework")
     @_logger.call
     async def format(
-        self, sender: Any, document: TextDocument, options: FormattingOptions, **further_options: Any
+        self,
+        sender: Any,
+        document: TextDocument,
+        options: FormattingOptions,
+        **further_options: Any,
     ) -> Optional[List[TextEdit]]:
         config = await self.get_config(document)
 
@@ -68,15 +80,20 @@ async def format(
             return await self.format_internal(document, options, **further_options)
 
         self.parent.window.show_message(
-            "RobotFramework formatter is not available, please install 'robotframework-tidy'.", MessageType.ERROR
+            "RobotFramework formatter is not available, please install 'robotframework-tidy'.",
+            MessageType.ERROR,
         )
 
         return None
 
     RE_LINEBREAKS = re.compile(r"\r\n|\r|\n")
 
     async def format_robot_tidy(
-        self, document: TextDocument, options: FormattingOptions, range: Optional[Range] = None, **further_options: Any
+        self,
+        document: TextDocument,
+        options: FormattingOptions,
+        range: Optional[Range] = None,
+        **further_options: Any,
     ) -> Optional[List[TextEdit]]:
         from difflib import SequenceMatcher
 
@@ -98,7 +115,8 @@ async def format_robot_tidy(
                     robot_tidy.config.formatting.end_line = range.end.line + 1
 
                 disabler_finder = RegisterDisablers(
-                    robot_tidy.config.formatting.start_line, robot_tidy.config.formatting.end_line
+                    robot_tidy.config.formatting.start_line,
+                    robot_tidy.config.formatting.end_line,
                 )
                 disabler_finder.visit(model)
                 if disabler_finder.file_disabled:
@@ -118,7 +136,8 @@ async def format_robot_tidy(
                     from robotidy.disablers import RegisterDisablers
 
                     disabler_finder = RegisterDisablers(
-                        robot_tidy.formatting_config.start_line, robot_tidy.formatting_config.end_line
+                        robot_tidy.formatting_config.start_line,
+                        robot_tidy.formatting_config.end_line,
                     )
                     disabler_finder.visit(model)
                     if disabler_finder.file_disabled:
@@ -170,7 +189,7 @@ async def format_internal(
         self, document: TextDocument, options: FormattingOptions, **further_options: Any
     ) -> Optional[List[TextEdit]]:
         from robot.parsing.model.blocks import File
-        from robot.tidypkg import (
+        from robot.tidypkg import (  # pyright: ignore [reportMissingImports]
             Aligner,
             Cleaner,
             NewlineNormalizer,
@@ -182,7 +201,11 @@ async def format_internal(
         Cleaner().visit(model)
         NewlineNormalizer(self.line_separator, self.short_test_name_length).visit(model)
         SeparatorNormalizer(self.use_pipes, self.space_count).visit(model)
-        Aligner(self.short_test_name_length, self.setting_and_variable_name_length, self.use_pipes).visit(model)
+        Aligner(
+            self.short_test_name_length,
+            self.setting_and_variable_name_length,
+            self.use_pipes,
+        ).visit(model)
 
         with io.StringIO() as s:
             model.save(s)
@@ -191,15 +214,23 @@ async def format_internal(
                 TextEdit(
                     range=Range(
                         start=Position(line=0, character=0),
-                        end=Position(line=len(document.get_lines()), character=len((document.get_lines())[-1])),
+                        end=Position(
+                            line=len(document.get_lines()),
+                            character=len((document.get_lines())[-1]),
+                        ),
                     ),
                     new_text=s.getvalue(),
                 )
             ]
 
     @language_id("robotframework")
     async def format_range(
-        self, sender: Any, document: TextDocument, range: Range, options: FormattingOptions, **further_options: Any
+        self,
+        sender: Any,
+        document: TextDocument,
+        range: Range,
+        options: FormattingOptions,
+        **further_options: Any,
     ) -> Optional[List[TextEdit]]:
         config = await self.get_config(document)
         if config and config.enabled and robotidy_installed():

packages/plugin/robotcode/plugin/__version__.py

@@ -1 +1 @@
-__version__ = "0.27.1"
+__version__ = "0.27.2"

packages/runner/robotcode/runner/__version__.py

@@ -1 +1 @@
-__version__ = "0.27.1"
+__version__ = "0.27.2"

pyproject.toml

@@ -82,7 +82,7 @@ path = "robotcode/cli/__version__.py"
 only-include = ["robotcode", "CHANGELOG.md"]
 
 [tool.hatch.build.targets.wheel]
-only-include = ["robotcode", "CHANGELOG.md"]
+only-include = ["robotcode"]
 
 
 [tool.hatch.envs.default]
@@ -152,6 +152,7 @@ matrix.rf.dependencies = [
 
 [tool.hatch.envs.lint]
 skip-install = true
+extra-dependencies = ["tomli>=2.0.0"]
 features = ["yaml", "rest", "lint", "tidy"]
 
 [tool.hatch.envs.lint.scripts]
@@ -182,6 +183,9 @@ version_variable = [
   "packages/jsonrpc2/robotcode/jsonrpc2/__version__.py:__version__",
   "packages/language_server/robotcode/language_server/__version__.py:__version__",
   "packages/modifiers/robotcode/modifiers/__version__.py:__version__",
+  "packages/modifiers/robotcode/plugin/__version__.py:__version__",
+  "packages/modifiers/robotcode/runner/__version__.py:__version__",
+
 ]
 version_pattern = ['package.json:"version": "{version}"']
 branch = "main"
@@ -322,25 +326,28 @@ module = [
   "robotidy.*",
   "robocop.*",
   "pytest_regtest.*",
-  "pluggy"
+  "pluggy",
 ]
 ignore_missing_imports = true
 
 
-[tool.hatch.build.targets.wheel.hooks.mypyc]
-enable-by-default = false
-dependencies = ["hatch-mypyc", "types-PyYAML", "types-docutils"]
-require-runtime-dependencies = true
-include = [
-  "robotcode/utils/glob_path.py",
-  "robotcode/language_server/robotframework/diagnostics/analyzer.py",
-]
-exclude = ["__main__.py", "__version__.py", "__init__.py", "typings", "tests"]
+# [tool.hatch.build.targets.wheel.hooks.mypyc]
+# enable-by-default = false
+# dependencies = ["hatch-mypyc", "types-PyYAML", "types-docutils"]
+# require-runtime-dependencies = true
+# include = [
+#   "robotcode/utils/glob_path.py",
+#   "robotcode/language_server/robotframework/diagnostics/analyzer.py",
+# ]
+# exclude = ["__main__.py", "__version__.py", "__init__.py", "typings", "tests"]
 
 
-[tool.hatch.build.targets.wheel.hooks.mypyc.options]
+# [tool.hatch.build.targets.wheel.hooks.mypyc.options]
 # # opt_level = "3"
 # multi_file = true
 #separate = true
 #verbose = true
 #include_runtime_files = false
+
+[tool.pyright]
+exclude = ["**/.hatch", "**/node_modules", "**/__pycache__", "bundled/libs"]