🤖 ruff format the testgen output before writing it

Author: jorenham

tool/_ruff.py

@@ -0,0 +1,20 @@
+import subprocess
+from pathlib import Path
+
+# see https://github.com/astral-sh/ruff/pull/18224
+from ruff.__main__ import (  # type: ignore[import-untyped]  # pyright: ignore[reportMissingTypeStubs]
+    find_ruff_bin,  # noqa: PLC2701
+)
+
+
+def ruff_format(source: str) -> str:
+    result = subprocess.run(
+        [find_ruff_bin(), "format", "-"],
+        input=source,
+        text=True,
+        capture_output=True,
+        check=True,
+        cwd=Path.cwd(),
+    )
+    result.check_returncode()
+    return result.stdout

tool/testgen.py

@@ -36,6 +36,7 @@
 
 sys.path.insert(0, str(Path(__file__).parent.parent))
 
+from tool._ruff import ruff_format
 from tool.promotion import _typename as dtype_label
 from tool.ufunc import _all_types as ufunc_signatures
 
@@ -249,13 +250,7 @@ def _array_expr(
 
     expr2 = _array_expr_single(*(dts[1] for dts in dtypess), ndim=ndim, npt=npt)
 
-    expr = f"tuple[{expr1}, {expr2}]"
-    if "\n" in expr or "|" in expr:
-        expr1 = textwrap.indent(expr1, TAB)
-        expr2 = textwrap.indent(expr2, TAB)
-        expr = f"tuple[\n{expr1},\n{expr2},\n]"
-
-    return expr
+    return f"tuple[{expr1}, {expr2}]"
 
 
 def __group_types(*types: str) -> tuple[dict[str, list[str]], list[str]]:
@@ -472,11 +467,7 @@ def build(self) -> str:
 
                 lines.append(line)
 
-        # ensure trailing newline
-        if not n_empty:
-            lines.append("")
-
-        return BR.join(lines)
+        return ruff_format(BR.join(lines))
 
     @final
     def _read(self, /) -> str | None: