style: switch completly to ruff for formatting and style

Author: d-biehl

.devcontainer/devcontainer.json

@@ -41,7 +41,6 @@
         "tamasfe.even-better-toml",
         "gruntfuggly.todo-tree",
         "charliermarsh.ruff",
-        "ms-python.black-formatter",
         "ms-python.mypy-type-checker",
         "ms-python.debugpy"
       ],
@@ -82,12 +81,7 @@
           "^(.*(/|\\\\)\\.?robot\\.toml|\\.?robot\\.toml)$": "http://localhost:8000/etc/robot.toml.json"
         },
         "mypy-type-checker.importStrategy": "fromEnvironment",
-        "debugpy.debugJustMyCode": false,
-        "black-formatter.importStrategy": "fromEnvironment",
-        "black-formatter.args": [
-          "--config",
-          "${workspaceFolder}./pyproject.toml"
-        ]
+        "debugpy.debugJustMyCode": false
       }
     }
   }

.pre-commit-config.yaml

@@ -49,5 +49,4 @@ repos:
         pass_filenames: false
         language: system
         stages: [pre-commit]
-        types:
-          - "javascript"
+        types_or: [javascript, jsx, ts, tsx]

.vscode/extensions.json

@@ -8,7 +8,6 @@
 		"tamasfe.even-better-toml",
 		"gruntfuggly.todo-tree",
 		"charliermarsh.ruff",
-		"ms-python.black-formatter",
 		"ms-python.mypy-type-checker"
 	]
 }

hatch.toml

@@ -22,7 +22,6 @@ dependencies = [
   "pytest-cov",
   "mypy",
   "ruff",
-  "black",
   "debugpy",
   "GitPython",
   "semantic-version",
@@ -98,7 +97,7 @@ matrix.rf.dependencies = [
   { value = "robotframework>=7.1, <7.2", if = [
     "rf71",
   ] },
-   { value = "robotframework>=7.2, <7.3", if = [
+  { value = "robotframework>=7.2, <7.3", if = [
     "rf72",
   ] },
 ]
@@ -150,10 +149,8 @@ features = ["all"]
 
 
 [envs.lint.scripts]
-typing-py = "mypy --no-incremental --cache-dir /dev/null {args:.}"
-typing = ["typing-py", "npm run compile"]
-style = ["ruff check .", "black --check --diff .", "npx eslint ."]
-fmt = ["black .", "ruff check --fix .", "style", "npx eslint --fix ."]
+typing = "mypy --no-incremental --cache-dir /dev/null {args:.}"
+style = ["ruff check .", "ruff format --diff ."]
 all = ["style", "typing"]
 
 [envs.lint.overrides]
@@ -178,3 +175,14 @@ extract-release-notes = ["python scripts/extract_release_notes.py"]
 is-prerelease = ["python scripts/is_prerelease.py"]
 bump = ["cz bump {args}"]
 install-bundled-editable = "python ./scripts/install_bundled_editable.py"
+
+
+[envs.hatch-static-analysis]
+installer="uv"
+dependencies = ["ruff"]
+
+[envs.hatch-static-analysis.scripts]
+format-check = ["ruff format --check --diff {args:.}"]
+format-fix = ["ruff format {args:.}"]
+lint-check = ["ruff check {args:.}"]
+lint-fix = "ruff check --fix {args:.}"

packages/core/src/robotcode/core/concurrent.py

@@ -53,7 +53,7 @@ def acquire(self, blocking: bool = True, timeout: Optional[float] = None) -> boo
         aquired = self._lock.acquire(blocking, timeout=timeout)
         if not aquired and blocking and timeout > 0:
             raise RuntimeError(
-                f"Could not acquire {self.__class__.__qualname__} {self.name+' ' if self.name else ' '}in {timeout}s."
+                f"Could not acquire {self.__class__.__qualname__} {self.name + ' ' if self.name else ' '}in {timeout}s."
             )
         return aquired
 

packages/core/src/robotcode/core/utils/dataclasses.py

@@ -488,7 +488,9 @@ def from_dict(
                 (
                     (getattr(e, "__name__", None) or str(e) if e is not type(None) else "None")
                     if _get_origin_cached(e) is not Literal
-                    else repr(e).replace("typing.", "") if e is not None else "None"
+                    else repr(e).replace("typing.", "")
+                    if e is not None
+                    else "None"
                 )
                 for e in types
             )

packages/core/src/robotcode/core/utils/logging.py

@@ -149,7 +149,9 @@ def __init_logger(self) -> LoggingDescriptor:
                     else (
                         ("" if self.__owner is None else self.__owner.__module__ + "." + self.__owner.__qualname__)
                         if self.__owner is not None
-                        else get_unwrapped_func(self.__func).__module__ if self.__func is not None else "<unknown>"
+                        else get_unwrapped_func(self.__func).__module__
+                        if self.__func is not None
+                        else "<unknown>"
                     )
                     + self.__postfix
                 )

packages/debugger/src/robotcode/debugger/debugger.py

@@ -547,7 +547,6 @@ def set_breakpoints(
         lines: Optional[List[int]] = None,
         source_modified: Optional[bool] = None,
     ) -> List[Breakpoint]:
-
         if self.is_windows_path(source.path or ""):
             path: pathlib.PurePath = pathlib.PureWindowsPath(source.path or "")
         else:
@@ -647,7 +646,6 @@ def process_start_state(self, source: str, line_no: int, type: str, status: str)
             if source_path in self.breakpoints:
                 breakpoints = [v for v in self.breakpoints[source_path].breakpoints if v.line == line_no]
                 if len(breakpoints) > 0:
-
                     for point in breakpoints:
                         if point.condition is not None:
                             hit = False

packages/debugger/src/robotcode/debugger/launcher/server.py

@@ -245,7 +245,9 @@ async def _launch(
                         kind=(
                             RunInTerminalKind.INTEGRATED
                             if console == "integratedTerminal"
-                            else RunInTerminalKind.EXTERNAL if console == "externalTerminal" else None
+                            else RunInTerminalKind.EXTERNAL
+                            if console == "externalTerminal"
+                            else None
                         ),
                         title=name,
                     )

packages/debugger/src/robotcode/debugger/protocol.py

@@ -44,7 +44,7 @@ class DebugAdapterErrorResponseError(JsonRPCException):
     def __init__(self, error: ErrorResponse) -> None:
         super().__init__(
             f'{error.message} (seq={error.request_seq} command="{error.command}")'
-            f'{f": {error.body.error}" if error.body is not None and error.body.error else ""}'
+            f"{f': {error.body.error}' if error.body is not None and error.body.error else ''}"
         )
         self.error = error
 
@@ -60,7 +60,7 @@ def __init__(
     ) -> None:
         super().__init__(
             f'{(message + " ") if message else ""}(seq={request_seq} command="{command}")'
-            f'{f": {error_message}" if error_message else ""}'
+            f"{f': {error_message}' if error_message else ''}"
         )
         self.message = message
         self.request_seq = request_seq

packages/jsonrpc2/src/robotcode/jsonrpc2/server.py

@@ -94,7 +94,9 @@ def start(self) -> None:
                 (
                     self.tcp_params.host
                     if isinstance(self.tcp_params.host, str)
-                    else self.tcp_params.host[0] if self.tcp_params.host else None
+                    else self.tcp_params.host[0]
+                    if self.tcp_params.host
+                    else None
                 ),
             )
         else:

packages/language_server/src/robotcode/language_server/common/parts/diagnostics.py

@@ -399,10 +399,10 @@ def run_workspace_diagnostics(self) -> None:
                                 folder = self.parent.workspace.get_workspace_folder(document.uri)
                                 name = path if folder is None else path.relative_to(folder.uri.to_path())
 
-                                progress.report(f"Analyze {i+1}/{len(documents)}: {name}", current=i + 1)
+                                progress.report(f"Analyze {i + 1}/{len(documents)}: {name}", current=i + 1)
                             elif analysis_mode == AnalysisProgressMode.SIMPLE:
                                 progress.begin()
-                                progress.report(f"Analyze {i+1}/{len(documents)}", current=i + 1)
+                                progress.report(f"Analyze {i + 1}/{len(documents)}", current=i + 1)
 
                             try:
                                 with self._current_diagnostics_task_lock:
@@ -490,10 +490,10 @@ def run_workspace_diagnostics(self) -> None:
                                 folder = self.parent.workspace.get_workspace_folder(document.uri)
                                 name = path if folder is None else path.relative_to(folder.uri.to_path())
 
-                                progress.report(f"Collect {i+1}/{len(documents_to_collect)}: {name}", current=i + 1)
+                                progress.report(f"Collect {i + 1}/{len(documents_to_collect)}: {name}", current=i + 1)
                             elif analysis_mode == AnalysisProgressMode.SIMPLE:
                                 progress.begin()
-                                progress.report(f"Collect {i+1}/{len(documents_to_collect)}", current=i + 1)
+                                progress.report(f"Collect {i + 1}/{len(documents_to_collect)}", current=i + 1)
 
                             try:
                                 with self._current_diagnostics_task_lock:

packages/language_server/src/robotcode/language_server/common/parts/semantic_tokens.py

@@ -83,7 +83,9 @@ def extend_capabilities(self, capabilities: ServerCapabilities) -> None:
                 full=(
                     SemanticTokensOptionsFullType1(delta=True if len(self.collect_full_delta) else None)
                     if len(self.collect_full) and len(self.collect_full_delta)
-                    else True if len(self.collect_full) else None
+                    else True
+                    if len(self.collect_full)
+                    else None
                 ),
                 range=True if len(self.collect_range) else None,
             )

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

@@ -90,7 +90,9 @@ def collect(
                 (
                     node.value
                     if isinstance(node, (TestTemplate, Template))
-                    else node.keyword if isinstance(node, KeywordCall) else node.name
+                    else node.keyword
+                    if isinstance(node, KeywordCall)
+                    else node.name
                 ),
                 cast(
                     Token,

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

@@ -1733,7 +1733,9 @@ def complete_import() -> Optional[List[CompletionItem]]:
                         else (
                             CompletionItemKind.FILE
                             if e.kind == CompleteResultKind.FILE
-                            else CompletionItemKind.FOLDER if e.kind == CompleteResultKind.FOLDER else None
+                            else CompletionItemKind.FOLDER
+                            if e.kind == CompleteResultKind.FOLDER
+                            else None
                         )
                     ),
                     detail=e.kind.value,
@@ -1928,7 +1930,9 @@ def complete_ResourceImport(  # noqa: N802
                     else (
                         CompletionItemKind.FILE
                         if e.kind == CompleteResultKind.FILE
-                        else CompletionItemKind.FOLDER if e.kind == CompleteResultKind.FOLDER else None
+                        else CompletionItemKind.FOLDER
+                        if e.kind == CompleteResultKind.FOLDER
+                        else None
                     )
                 ),
                 detail=e.kind.value,
@@ -2050,7 +2054,9 @@ def complete_import() -> Optional[List[CompletionItem]]:
                         else (
                             CompletionItemKind.FILE
                             if e.kind == CompleteResultKind.FILE
-                            else CompletionItemKind.FOLDER if e.kind == CompleteResultKind.FOLDER else None
+                            else CompletionItemKind.FOLDER
+                            if e.kind == CompleteResultKind.FOLDER
+                            else None
                         )
                     ),
                     detail=e.kind.value,

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

@@ -166,14 +166,12 @@ def _hover_default(self, nodes: List[ast.AST], document: TextDocument, position:
                     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:
-
                 return Hover(
                     contents=MarkupContent(kind=MarkupKind.MARKDOWN, value=text),
                     range=highlight_range,

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

@@ -354,7 +354,6 @@ def generate_sem_sub_tokens(
         length: Optional[int] = None,
         yield_arguments: bool = False,
     ) -> Iterator[SemTokenInfo]:
-
         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

packages/plugin/src/robotcode/plugin/__init__.py

@@ -165,7 +165,9 @@ def print_data(
             text = tomli_w.dumps(
                 as_dict(data, remove_defaults=remove_defaults)
                 if dataclasses.is_dataclass(data)
-                else data if isinstance(data, dict) else {data: data}
+                else data
+                if isinstance(data, dict)
+                else {data: data}
             )
 
         if text is None:

packages/repl/src/robotcode/repl/console_interpreter.py

@@ -110,7 +110,7 @@ def log_message(
         if is_true(html):
             message = f"*HTML*{message}"
 
-        self.app.echo(f"{'  '*self.indent}[ {level} ] {message}", file=sys.__stdout__ if std_err else sys.__stderr__)
+        self.app.echo(f"{'  ' * self.indent}[ {level} ] {message}", file=sys.__stdout__ if std_err else sys.__stderr__)
 
     def message(
         self, message: str, level: str, html: Union[str, bool] = False, timestamp: Union[datetime, str, None] = None
@@ -126,7 +126,8 @@ def start_keyword(self, data: "running.Keyword", result: "result.Keyword") -> No
             return
 
         self.app.echo(
-            f"{'  '*self.indent}KEYWORD {result.libname}.{result.kwname}  {'  '.join(result.args)}", file=sys.__stdout__
+            f"{'  ' * self.indent}KEYWORD {result.libname}.{result.kwname}  {'  '.join(result.args)}",
+            file=sys.__stdout__,
         )
         self.indent += 1
 

packages/robot/src/robotcode/robot/diagnostics/data_cache.py

@@ -40,7 +40,6 @@ def __init__(self, cache_dir: Path) -> None:
 
 
 class JsonDataCache(FileCacheDataBase):
-
     def build_cache_data_filename(self, section: CacheSection, entry_name: str) -> Path:
         return self.cache_dir / section.value / (entry_name + ".json")
 

packages/robot/src/robotcode/robot/diagnostics/imports_manager.py

@@ -226,7 +226,9 @@ def _update(self) -> None:
         source_or_origin = (
             self._lib_doc.source
             if self._lib_doc.source is not None
-            else self._lib_doc.module_spec.origin if self._lib_doc.module_spec is not None else None
+            else self._lib_doc.module_spec.origin
+            if self._lib_doc.module_spec is not None
+            else None
         )
 
         # we are a module, so add the module path into file watchers
@@ -1226,8 +1228,7 @@ def _get_library_libdoc(
                         saved_meta = self.data_cache.read_cache_data(CacheSection.LIBRARY, meta_file, LibraryMetaData)
                         if saved_meta.has_errors:
                             self._logger.debug(
-                                lambda: f"Saved library spec for {name}{args!r} is not used "
-                                "due to errors in meta data",
+                                lambda: f"Saved library spec for {name}{args!r} is not used due to errors in meta data",
                                 context_name="import",
                             )
 

packages/robot/src/robotcode/robot/diagnostics/library_doc.py

@@ -1797,7 +1797,9 @@ def get_library_doc(
                 source=(
                     source or module_spec.origin
                     if module_spec is not None and module_spec.origin
-                    else import_name if is_library_by_path(import_name) else None
+                    else import_name
+                    if is_library_by_path(import_name)
+                    else None
                 ),
                 module_spec=module_spec,
                 errors=[
@@ -1806,7 +1808,9 @@ def get_library_doc(
                         (
                             source or module_spec.origin
                             if module_spec is not None and module_spec.origin
-                            else import_name if is_library_by_path(import_name) else None
+                            else import_name
+                            if is_library_by_path(import_name)
+                            else None
                         ),
                         (
                             1
@@ -2402,7 +2406,9 @@ def _get_initial_handler(self, library: Any, name: Any, method: Any) -> Any:
                         (
                             source or module_spec.origin
                             if module_spec is not None and module_spec.origin
-                            else import_name if is_variables_by_path(import_name) else None
+                            else import_name
+                            if is_variables_by_path(import_name)
+                            else None
                         ),
                         (
                             1
@@ -2426,7 +2432,9 @@ def _get_initial_handler(self, library: Any, name: Any, method: Any) -> Any:
                     (
                         source or module_spec.origin
                         if module_spec is not None and module_spec.origin
-                        else import_name if is_variables_by_path(import_name) else None
+                        else import_name
+                        if is_variables_by_path(import_name)
+                        else None
                     ),
                     1 if source is not None or (module_spec is not None and module_spec.origin is not None) else None,
                 )