Merge branch 'master' of https://github.com/GreyElaina/slint

GreyElaina · GreyElaina · commit 67747d839ec7 · 2025-10-24T01:17:04.000+08:00
diff --git a/api/python/slint/interpreter.rs b/api/python/slint/interpreter.rs
@@ -566,11 +566,7 @@ impl PyCallbackInfo {
             let arg_name = function.arg_names.get(idx).cloned();
             parameters.push(PyCallbackParameter::new(arg_name, arg_ty));
         }
-        Self {
-            name,
-            parameters,
-            return_type: type_to_python_hint(&function.return_type),
-        }
+        Self { name, parameters, return_type: type_to_python_hint(&function.return_type) }
     }
 }
 
@@ -593,11 +589,7 @@ impl PyFunctionInfo {
             let arg_name = function.arg_names.get(idx).cloned();
             parameters.push(PyCallbackParameter::new(arg_name, arg_ty));
         }
-        Self {
-            name,
-            parameters,
-            return_type: type_to_python_hint(&function.return_type),
-        }
+        Self { name, parameters, return_type: type_to_python_hint(&function.return_type) }
     }
 }
 
diff --git a/api/python/slint/pyproject.toml b/api/python/slint/pyproject.toml
@@ -27,9 +27,7 @@ classifiers = [
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.10",
 ]
-dependencies = [
-    "libcst>=1.8.5",
-]
+dependencies = ["libcst>=1.8.5"]
 
 [project.urls]
 Homepage = "https://slint.dev"
diff --git a/api/python/slint/slint/__init__.py b/api/python/slint/slint/__init__.py
@@ -418,20 +418,32 @@ def run_as_task(*args, **kwargs) -> None:  # type: ignore
 
     return callable
 
+
 _T_Callback = TypeVar("_T_Callback", bound=Callable[..., Any])
 
+
 @overload
 def callback(__func: _T_Callback, /) -> _T_Callback: ...
 
+
 @overload
-def callback(*, global_name: str | None = ..., name: str | None = ...) -> Callable[[ _T_Callback ], _T_Callback]: ...
+def callback(
+    *, global_name: str | None = ..., name: str | None = ...
+) -> Callable[[_T_Callback], _T_Callback]: ...
+
 
 @overload
-def callback(__func: _T_Callback, /, *, global_name: str | None = ..., name: str | None = ...) -> _T_Callback: ...
+def callback(
+    __func: _T_Callback, /, *, global_name: str | None = ..., name: str | None = ...
+) -> _T_Callback: ...
 
 
 def callback(
-    __func: _T_Callback | None = None, /, *, global_name: str | None = None, name: str | None = None
+    __func: _T_Callback | None = None,
+    /,
+    *,
+    global_name: str | None = None,
+    name: str | None = None,
 ) -> typing.Union[_T_Callback, typing.Callable[[_T_Callback], _T_Callback]]:
     """Use the callback decorator to mark a method as a callback that can be invoked from the Slint component.
 
diff --git a/api/python/slint/slint/codegen/__init__.py b/api/python/slint/slint/codegen/__init__.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 from .cli import main
diff --git a/api/python/slint/slint/codegen/__main__.py b/api/python/slint/slint/codegen/__main__.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 import sys
diff --git a/api/python/slint/slint/codegen/cli.py b/api/python/slint/slint/codegen/cli.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 import argparse
@@ -10,9 +13,7 @@
 def build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         prog="slint.codegen",
-        description=(
-            "Generate Python source and stub files from Slint .slint inputs."
-        ),
+        description=("Generate Python source and stub files from Slint .slint inputs."),
     )
 
     subparsers = parser.add_subparsers(dest="command", required=False)
diff --git a/api/python/slint/slint/codegen/emitters.py b/api/python/slint/slint/codegen/emitters.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 import os
@@ -53,7 +56,9 @@ def _stmt(code: str) -> cst.BaseStatement:
     library_expr_code = f"{{{', '.join(library_items)}}}" if library_items else "None"
 
     style_expr = path_literal(config.style) if config.style else "None"
-    domain_expr = path_literal(config.translation_domain) if config.translation_domain else "None"
+    domain_expr = (
+        path_literal(config.translation_domain) if config.translation_domain else "None"
+    )
 
     export_bindings: dict[str, str] = {}
     for component in artifacts.components:
@@ -68,7 +73,9 @@ def _stmt(code: str) -> cst.BaseStatement:
     ]
 
     header: list[cst.CSTNode] = [
-        cst.EmptyLine(comment=cst.Comment(f"# Generated by slint.codegen from {source_relative}"))
+        cst.EmptyLine(
+            comment=cst.Comment(f"# Generated by slint.codegen from {source_relative}")
+        )
     ]
 
     body: list[cst.CSTNode] = [
@@ -90,7 +97,11 @@ def _stmt(code: str) -> cst.BaseStatement:
     )
     body.append(
         cst.SimpleStatementLine(
-            [cst.Assign(targets=[cst.AssignTarget(cst.Name("__all__"))], value=all_list)]
+            [
+                cst.Assign(
+                    targets=[cst.AssignTarget(cst.Name("__all__"))], value=all_list
+                )
+            ]
         )
     )
     body.append(cst.EmptyLine())
@@ -112,7 +123,7 @@ def _stmt(code: str) -> cst.BaseStatement:
 
     load_source = (
         "def _load() -> types.SimpleNamespace:\n"
-        "    \"\"\"Load the compiled Slint module for this package.\"\"\"\n"
+        '    """Load the compiled Slint module for this package."""\n'
         "    package = __package__ or (__spec__.parent if __spec__ else None)\n"
         "    if package:\n"
         "        ctx = _resources.as_file(_resources.files(package).joinpath(_SLINT_RESOURCE))\n"
@@ -180,11 +191,17 @@ def register_type(type_str: str) -> None:
     ]
     if export_names:
         all_list = cst.List(
-            elements=[cst.Element(cst.SimpleString(repr(name))) for name in export_names]
+            elements=[
+                cst.Element(cst.SimpleString(repr(name))) for name in export_names
+            ]
         )
         post_body.append(
             cst.SimpleStatementLine(
-                [cst.Assign(targets=[cst.AssignTarget(cst.Name("__all__"))], value=all_list)]
+                [
+                    cst.Assign(
+                        targets=[cst.AssignTarget(cst.Name("__all__"))], value=all_list
+                    )
+                ]
             )
         )
         post_body.append(cst.EmptyLine())
@@ -194,7 +211,9 @@ def ann_assign(name: str, type_expr: str) -> cst.BaseStatement:
             [
                 cst.AnnAssign(
                     target=cst.Name(name),
-                    annotation=cst.Annotation(annotation=cst.parse_expression(type_expr)),
+                    annotation=cst.Annotation(
+                        annotation=cst.parse_expression(type_expr)
+                    ),
                     value=None,
                 )
             ]
@@ -253,7 +272,13 @@ def init_stub() -> cst.FunctionDef:
         post_body.append(
             cst.ClassDef(
                 name=cst.Name(enum_meta.py_name),
-                bases=[cst.Arg(value=cst.Attribute(value=cst.Name("enum"), attr=cst.Name("Enum")))],
+                bases=[
+                    cst.Arg(
+                        value=cst.Attribute(
+                            value=cst.Name("enum"), attr=cst.Name("Enum")
+                        )
+                    )
+                ],
                 body=cst.IndentedBlock(body=enum_body),
             )
         )
@@ -274,12 +299,16 @@ def init_stub() -> cst.FunctionDef:
             component_body.append(ann_assign(fn.py_name, annotation))
         for global_meta in component.globals:
             component_body.append(
-                ann_assign(global_meta.py_name, f"{component.py_name}.{global_meta.py_name}")
+                ann_assign(
+                    global_meta.py_name, f"{component.py_name}.{global_meta.py_name}"
+                )
             )
 
         for global_meta in component.globals:
             inner_body: list[cst.BaseStatement] = []
-            if not (global_meta.properties or global_meta.callbacks or global_meta.functions):
+            if not (
+                global_meta.properties or global_meta.callbacks or global_meta.functions
+            ):
                 inner_body.append(ellipsis_line())
             else:
                 for prop in global_meta.properties:
@@ -306,7 +335,9 @@ def init_stub() -> cst.FunctionDef:
                 name=cst.Name(component.py_name),
                 bases=[
                     cst.Arg(
-                        value=cst.Attribute(value=cst.Name("slint"), attr=cst.Name("Component"))
+                        value=cst.Attribute(
+                            value=cst.Name("slint"), attr=cst.Name("Component")
+                        )
                     )
                 ],
                 body=cst.IndentedBlock(body=component_body),
diff --git a/api/python/slint/slint/codegen/generator.py b/api/python/slint/slint/codegen/generator.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 import shutil
diff --git a/api/python/slint/slint/codegen/models.py b/api/python/slint/slint/codegen/models.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 from dataclasses import dataclass
diff --git a/api/python/slint/slint/codegen/utils.py b/api/python/slint/slint/codegen/utils.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 from pathlib import Path
diff --git a/api/python/slint/tests/codegen/examples/__init__.py b/api/python/slint/tests/codegen/examples/__init__.py
@@ -0,0 +1,2 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
diff --git a/api/python/slint/tests/codegen/examples/counter/README.md b/api/python/slint/tests/codegen/examples/counter/README.md
@@ -1,3 +1,5 @@
+<!-- Copyright © SixtyFPS GmbH <info@slint.dev> ; SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0 -->
+
 # Counter Example Using slint.codegen
 
 This example mirrors the callback pattern described in the
diff --git a/api/python/slint/tests/codegen/examples/counter/__init__.py b/api/python/slint/tests/codegen/examples/counter/__init__.py
@@ -0,0 +1,2 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
diff --git a/api/python/slint/tests/codegen/examples/counter/counter.slint b/api/python/slint/tests/codegen/examples/counter/counter.slint
@@ -1,3 +1,6 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 export component CounterWindow inherits Window {
     width: 240px;
     height: 120px;
diff --git a/api/python/slint/tests/codegen/examples/counter/generate.py b/api/python/slint/tests/codegen/examples/counter/generate.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 from pathlib import Path
@@ -17,7 +20,9 @@ def main() -> None:
         quiet=False,
     )
 
-    generate_project(inputs=[base_dir / "counter.slint"], output_dir=output, config=config)
+    generate_project(
+        inputs=[base_dir / "counter.slint"], output_dir=output, config=config
+    )
     print(f"Generated Python bindings into {output.relative_to(base_dir)}")
 
 
diff --git a/api/python/slint/tests/codegen/examples/counter/main.py b/api/python/slint/tests/codegen/examples/counter/main.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 import slint
diff --git a/api/python/slint/tests/codegen/examples/struct_test.slint b/api/python/slint/tests/codegen/examples/struct_test.slint
@@ -1,3 +1,6 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 struct Foo {
     number: int,
 }
diff --git a/api/python/slint/tests/codegen/test_generator.py b/api/python/slint/tests/codegen/test_generator.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 import importlib
@@ -197,11 +200,13 @@ def test_generate_optional_type_hints(tmp_path: Path) -> None:
 
 def test_cli_main_without_subcommand(tmp_path: Path) -> None:
     slint_file = _write_slint_fixture(tmp_path)
-    exit_code = cli_main([
-        "--input",
-        str(slint_file),
-        "--quiet",
-    ])
+    exit_code = cli_main(
+        [
+            "--input",
+            str(slint_file),
+            "--quiet",
+        ]
+    )
 
     assert exit_code == 0
     assert (slint_file.parent / "app.py").exists()
@@ -228,6 +233,7 @@ def test_counter_example_workflow(tmp_path: Path) -> None:
     app.request_increase()
     assert app.counter == 1
 
+
 def test_parse_library_paths_and_error_handling() -> None:
     mapping = _parse_library_paths(["std=path/to/std"])
     assert mapping == {"std": Path("path/to/std")}
diff --git a/api/python/slint/tests/codegen/test_utils.py b/api/python/slint/tests/codegen/test_utils.py
@@ -1,3 +1,6 @@
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
 from __future__ import annotations
 
 from pathlib import Path

Original file line number	Diff line number	Diff line change
`@@ -566,11 +566,7 @@ impl PyCallbackInfo {`
`566`	`566`	`let arg_name = function.arg_names.get(idx).cloned();`
`567`	`567`	`parameters.push(PyCallbackParameter::new(arg_name, arg_ty));`
`568`	`568`	`}`
`569`		`- Self {`
`570`		`- name,`
`571`		`- parameters,`
`572`		`- return_type: type_to_python_hint(&function.return_type),`
`573`		`- }`
	`569`	`+ Self { name, parameters, return_type: type_to_python_hint(&function.return_type) }`
`574`	`570`	`}`
`575`	`571`	`}`
`576`	`572`
`@@ -593,11 +589,7 @@ impl PyFunctionInfo {`
`593`	`589`	`let arg_name = function.arg_names.get(idx).cloned();`
`594`	`590`	`parameters.push(PyCallbackParameter::new(arg_name, arg_ty));`
`595`	`591`	`}`
`596`		`- Self {`
`597`		`- name,`
`598`		`- parameters,`
`599`		`- return_type: type_to_python_hint(&function.return_type),`
`600`		`- }`
	`592`	`+ Self { name, parameters, return_type: type_to_python_hint(&function.return_type) }`
`601`	`593`	`}`
`602`	`594`	`}`
`603`	`595`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +# Copyright © SixtyFPS GmbH <[email protected]>
 +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
++
 from __future__ import annotations
 from .cli import main