Merge pull request #231 from unihd-cag/issue-230

Repair static completion after mypy behavior change

Author: TM90

skillbridge/__init__.py

@@ -1,4 +1,8 @@
+from keyword import iskeyword
 from os import chdir
+from pathlib import Path
+from re import fullmatch, sub
+from sys import executable, version_info
 
 from .client.functions import FunctionCollection, keys
 from .client.globals import Globals, GlobalVar
@@ -38,19 +42,47 @@
 
 
 def generate_static_completion() -> None:
-    from keyword import iskeyword
-    from pathlib import Path
-    from re import fullmatch
-    from subprocess import run
+    from mypy.stubgen import Options, generate_stubs
 
-    ident = r'[a-zA-Z_][a-zA-Z0-9_]*'
+    base = Path(__file__).parent.absolute() / 'client'
+    annotation = base / 'workspace.pyi'
+
+    try:
+        annotation.unlink()
+    except FileNotFoundError:
+        pass
+
+    chdir(base)
+
+    o = Options(
+        (version_info.major, version_info.minor),
+        no_import=True,
+        doc_dir='',
+        search_path=[],
+        interpreter=executable,
+        parse_only=False,
+        ignore_errors=False,
+        include_private=False,
+        output_dir='.',
+        modules=['workspace'],
+        packages=[],
+        files=[],
+        verbose=True,
+        quiet=False,
+        export_less=False,
+    )
 
-    client = Path(__file__).parent.absolute() / 'client'
-    chdir(client)
-    run(['stubgen', 'workspace.py', '-o', '.'])
+    generate_stubs(o)
+
+    ident = r'[a-zA-Z_][a-zA-Z0-9_]*'
 
     ws = Workspace.open()
-    with open('workspace.pyi', 'a') as fout:
+
+    text = annotation.read_text()
+    text = sub(r' {4}[a-z][a-zA-Z]+: FunctionCollection\n', '', text)
+    annotation.write_text(text)
+
+    with open(annotation, 'a') as fout:
         for key, value in ws.__dict__.items():
             if not isinstance(value, FunctionCollection):
                 continue