From b7cba2893245e4d7d4931e45e78bbb9ba28cdbde Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 17 Aug 2022 21:08:09 +0300 Subject: [PATCH 1/5] scripts/create_baseline_stubs.py tree-sitter-languages --- stubs/tree-sitter-languages/METADATA.toml | 4 ++++ .../tree_sitter_languages/__init__.pyi | 1 + .../tree_sitter_languages/core.pyi | 16 ++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 stubs/tree-sitter-languages/METADATA.toml create mode 100644 stubs/tree-sitter-languages/tree_sitter_languages/__init__.pyi create mode 100644 stubs/tree-sitter-languages/tree_sitter_languages/core.pyi diff --git a/stubs/tree-sitter-languages/METADATA.toml b/stubs/tree-sitter-languages/METADATA.toml new file mode 100644 index 000000000000..8d199dc3bda1 --- /dev/null +++ b/stubs/tree-sitter-languages/METADATA.toml @@ -0,0 +1,4 @@ +version = "1.2.*" + +[tool.stubtest] +ignore_missing_stub = false diff --git a/stubs/tree-sitter-languages/tree_sitter_languages/__init__.pyi b/stubs/tree-sitter-languages/tree_sitter_languages/__init__.pyi new file mode 100644 index 000000000000..1b7054e739c0 --- /dev/null +++ b/stubs/tree-sitter-languages/tree_sitter_languages/__init__.pyi @@ -0,0 +1 @@ +from .core import get_language as get_language, get_parser as get_parser diff --git a/stubs/tree-sitter-languages/tree_sitter_languages/core.pyi b/stubs/tree-sitter-languages/tree_sitter_languages/core.pyi new file mode 100644 index 000000000000..cb717edf004c --- /dev/null +++ b/stubs/tree-sitter-languages/tree_sitter_languages/core.pyi @@ -0,0 +1,16 @@ +from typing import Any, ClassVar + +class Language: + __init__: ClassVar[function] = ... + field_id_for_name: ClassVar[function] = ... + query: ClassVar[function] = ... + def build_library(self, *args, **kwargs) -> Any: ... + +class Parser: + @classmethod + def __init__(cls, *args, **kwargs) -> None: ... + def parse(self, *args, **kwargs) -> Any: ... + def set_language(self, *args, **kwargs) -> Any: ... + +def get_language(*args, **kwargs) -> Any: ... +def get_parser(*args, **kwargs) -> Any: ... From 71e8d9d268e04b151613c63dd3f78d12ee085e28 Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 17 Aug 2022 21:26:22 +0300 Subject: [PATCH 2/5] manual rewrite --- .../tree_sitter_languages/core.pyi | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/stubs/tree-sitter-languages/tree_sitter_languages/core.pyi b/stubs/tree-sitter-languages/tree_sitter_languages/core.pyi index cb717edf004c..b59c21d3839f 100644 --- a/stubs/tree-sitter-languages/tree_sitter_languages/core.pyi +++ b/stubs/tree-sitter-languages/tree_sitter_languages/core.pyi @@ -1,16 +1,4 @@ -from typing import Any, ClassVar +from tree_sitter import Language, Parser -class Language: - __init__: ClassVar[function] = ... - field_id_for_name: ClassVar[function] = ... - query: ClassVar[function] = ... - def build_library(self, *args, **kwargs) -> Any: ... - -class Parser: - @classmethod - def __init__(cls, *args, **kwargs) -> None: ... - def parse(self, *args, **kwargs) -> Any: ... - def set_language(self, *args, **kwargs) -> Any: ... - -def get_language(*args, **kwargs) -> Any: ... -def get_parser(*args, **kwargs) -> Any: ... +def get_language(language: str) -> Language: ... +def get_parser(language: str) -> Parser: ... From a2d5b9a3baa44baeb189b10546f3ac646bccf0d7 Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 17 Aug 2022 21:27:50 +0300 Subject: [PATCH 3/5] requires --- stubs/tree-sitter-languages/METADATA.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/stubs/tree-sitter-languages/METADATA.toml b/stubs/tree-sitter-languages/METADATA.toml index 8d199dc3bda1..11883960faaf 100644 --- a/stubs/tree-sitter-languages/METADATA.toml +++ b/stubs/tree-sitter-languages/METADATA.toml @@ -1,4 +1,5 @@ version = "1.2.*" +requires = ["types-tree-sitter"] [tool.stubtest] ignore_missing_stub = false From b2ac54483de351f8d8da54f8cf592e6f31a150fd Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 17 Aug 2022 22:14:47 +0300 Subject: [PATCH 4/5] fixes --- stubs/tree-sitter-languages/@tests/stubtest_allowlist.txt | 5 +++++ .../tree_sitter_languages/__init__.pyi | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 stubs/tree-sitter-languages/@tests/stubtest_allowlist.txt diff --git a/stubs/tree-sitter-languages/@tests/stubtest_allowlist.txt b/stubs/tree-sitter-languages/@tests/stubtest_allowlist.txt new file mode 100644 index 000000000000..ba0665953385 --- /dev/null +++ b/stubs/tree-sitter-languages/@tests/stubtest_allowlist.txt @@ -0,0 +1,5 @@ +# No idea what this is, seems to be auto-generated +tree_sitter_languages.core.__test__ + +# Fails to import and is not supposed to be imported, but stubtest finds it somehow +tree_sitter_languages.languages diff --git a/stubs/tree-sitter-languages/tree_sitter_languages/__init__.pyi b/stubs/tree-sitter-languages/tree_sitter_languages/__init__.pyi index 1b7054e739c0..59a083877290 100644 --- a/stubs/tree-sitter-languages/tree_sitter_languages/__init__.pyi +++ b/stubs/tree-sitter-languages/tree_sitter_languages/__init__.pyi @@ -1 +1,7 @@ from .core import get_language as get_language, get_parser as get_parser + +__version__: str +__title__: str +__author__: str +__license__: str +__copyright__: str From 42b824b7dd23d4f19ea9b9279bfd596c2f15a5de Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 17 Aug 2022 22:22:37 +0300 Subject: [PATCH 5/5] Update stubs/tree-sitter-languages/METADATA.toml Co-authored-by: Alex Waygood --- stubs/tree-sitter-languages/METADATA.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/tree-sitter-languages/METADATA.toml b/stubs/tree-sitter-languages/METADATA.toml index 11883960faaf..29308d4255e2 100644 --- a/stubs/tree-sitter-languages/METADATA.toml +++ b/stubs/tree-sitter-languages/METADATA.toml @@ -1,4 +1,4 @@ -version = "1.2.*" +version = "1.3.*" requires = ["types-tree-sitter"] [tool.stubtest]