Merge pull request #12319 from github/redsun82/swift-codegen

Codegen: make Swift codegen language agnostic

.github/workflows/swift.yml

@@ -5,6 +5,7 @@ on:
     paths:
       - "swift/**"
       - "misc/bazel/**"
+      - "misc/codegen/**"
       - "*.bazel*"
       - .github/workflows/swift.yml
       - .github/actions/**
@@ -19,6 +20,7 @@ on:
     paths:
       - "swift/**"
       - "misc/bazel/**"
+      - "misc/codegen/**"
       - "*.bazel*"
       - .github/workflows/swift.yml
       - .github/actions/**

.pre-commit-config.yaml

@@ -53,5 +53,5 @@ repos:
         name: Run Swift code generation unit tests
         files: ^swift/codegen/.*\.py$
         language: system
-        entry: bazel test //swift/codegen/test
+        entry: bazel test //misc/codegen/test
         pass_filenames: false

CODEOWNERS

@@ -6,6 +6,7 @@
 /python/ @github/codeql-dynamic
 /ruby/ @github/codeql-dynamic
 /swift/ @github/codeql-swift
+/misc/codegen/ @github/codeql-swift
 /java/kotlin-extractor/ @github/codeql-kotlin
 /java/kotlin-explorer/ @github/codeql-kotlin
 

misc/bazel/workspace.bzl

@@ -33,3 +33,13 @@ def codeql_workspace(repository_name = "codeql"):
             "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.8.1.tar.gz",
         ],
     )
+
+    maybe(
+        repo_rule = http_archive,
+        name = "bazel_skylib",
+        sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
+        urls = [
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
+            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
+        ],
+    )

misc/bazel/workspace_deps.bzl

@@ -1,9 +1,11 @@
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 load("@rules_python//python:pip.bzl", "pip_install")
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
 def codeql_workspace_deps(repository_name = "codeql"):
     pip_install(
-       name = "swift_codegen_deps",
-       requirements = "@%s//swift/codegen:requirements.txt" % repository_name,
+       name = "codegen_deps",
+       requirements = "@%s//misc/codegen:requirements.txt" % repository_name,
     )
+    bazel_skylib_workspace()
     rules_pkg_dependencies()

misc/codegen/BUILD.bazel

@@ -0,0 +1,14 @@
+load("@codegen_deps//:requirements.bzl", "requirement")
+
+py_binary(
+    name = "codegen",
+    srcs = ["codegen.py"],
+    data = [
+        "//misc/codegen/templates:cpp",
+        "//misc/codegen/templates:trap",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//misc/codegen/generators",
+    ],
+)

misc/codegen/README.md

@@ -0,0 +1,38 @@
+# Code generation suite
+
+This directory contains the code generation suite used by the Swift extractor and the QL library. This suite will use
+the abstract class specification of `schema.py` to generate:
+
+* the `dbscheme` file (see [`dbschemegen.py`](generators/dbschemegen.py))
+* the QL generated code and when appropriate the corresponding stubs (see [`qlgen.py`](generators/qlgen.py))
+* C++ tags and trap entries (see [`trapgen.py`](generators/trapgen.py))
+* C++ structured classes (see [`cppgen.py`](generators/cppgen.py))
+
+An example `schema.py` [can be found in the Swift package](../../swift/schema.py).
+
+## Usage
+
+By default `bazel run //misc/codegen -- -c your-codegen.conf` will load options from `your-codegen.conf`. See
+the [Swift configuration](../../swift/codegen.conf) for an example. Calling `misc/codegen/codegen.py` directly (provided
+you installed dependencies via `pip3 install -r misc/codegen/requirements.txt`) will use a file named `codegen.conf`
+contained in an ancestor directory if any exists.
+
+See `bazel run //misc/codegen -- --help` for a list of all options. In particular `--generate` can be used with a comma
+separated list to select what to generate (choosing among `dbscheme`, `ql`, `trap` and `cpp`).
+
+## Implementation notes
+
+The suite uses [mustache templating](https://mustache.github.io/) for generation. Templates are
+in [the `templates` directory](templates), prefixed with the generation target they are used for.
+
+Rather than passing dictionaries to the templating engine, python dataclasses are used as defined
+in [the `lib` directory](lib). For each of the four generation targets the entry point for the implementation is
+specified as the `generate` function in the modules within [the `generators` directory](generators).
+
+Finally, [`codegen.py`](codegen.py) is the driver script gluing everything together and specifying the command line
+options.
+
+Unit tests are in [the `test` directory](test) and can be run via `bazel test //misc/codegen/test`.
+
+For more details about each specific generation target, please refer to the module docstrings
+in [the `generators` directory](generators).

misc/codegen/codegen.py

@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+""" Driver script to run all code generation """
+
+import argparse
+import logging
+import os
+import sys
+import pathlib
+import typing
+import shlex
+
+if 'BUILD_WORKSPACE_DIRECTORY' not in os.environ:
+    # we are not running with `bazel run`, set up module search path
+    _repo_root = pathlib.Path(__file__).resolve().parents[2]
+    sys.path.append(str(_repo_root))
+
+from misc.codegen.lib import render, paths
+from misc.codegen.generators import generate
+
+
+def _parse_args() -> argparse.Namespace:
+    dirs = [pathlib.Path().resolve()]
+    dirs.extend(dirs[0].parents)
+    for dir in dirs:
+        conf = dir / "codegen.conf"
+        if conf.exists():
+            break
+    else:
+        conf = None
+
+    p = argparse.ArgumentParser(description="Code generation suite")
+    p.add_argument("--generate", type=lambda x: x.split(","),
+                   help="specify what targets to generate as a comma separated list, choosing among dbscheme, ql, trap "
+                        "and cpp")
+    p.add_argument("--verbose", "-v", action="store_true", help="print more information")
+    p.add_argument("--quiet", "-q", action="store_true", help="only print errors")
+    p.add_argument("--configuration-file", "-c", type=_abspath, default=conf,
+                   help="A configuration file to load options from. By default, the first codegen.conf file found by "
+                        "going up directories from the current location. If present all paths provided in options are "
+                        "considered relative to its directory")
+    p.add_argument("--root-dir", type=_abspath,
+                   help="the directory that should be regarded as the root of the language pack codebase. Used to "
+                        "compute QL imports and in some comments and as root for relative paths provided as options. "
+                        "If not provided it defaults to the directory of the configuration file, if any")
+    path_arguments = [
+        p.add_argument("--schema", default="schema.py",
+                       help="input schema file (default %(default)s)"),
+        p.add_argument("--dbscheme",
+                       help="output file for dbscheme generation, input file for trap generation"),
+        p.add_argument("--ql-output",
+                       help="output directory for generated QL files"),
+        p.add_argument("--ql-stub-output",
+                       help="output directory for QL stub/customization files. Defines also the "
+                            "generated qll file importing every class file"),
+        p.add_argument("--ql-test-output",
+                       help="output directory for QL generated extractor test files"),
+        p.add_argument("--cpp-output",
+                       help="output directory for generated C++ files, required if trap or cpp is provided to "
+                            "--generate"),
+        p.add_argument("--generated-registry",
+                       help="registry file containing information about checked-in generated code"),
+    ]
+    p.add_argument("--script-name",
+                   help="script name to put in header comments of generated files. By default, the path of this "
+                        "script relative to the root directory")
+    p.add_argument("--trap-library",
+                   help="path to the trap library from an include directory, required if generating C++ trap bindings"),
+    p.add_argument("--ql-format", action="store_true", default=True,
+                   help="use codeql to autoformat QL files (which is the default)")
+    p.add_argument("--no-ql-format", action="store_false", dest="ql_format", help="do not format QL files")
+    p.add_argument("--codeql-binary", default="codeql", help="command to use for QL formatting (default %(default)s)")
+    p.add_argument("--force", "-f", action="store_true",
+                   help="generate all files without skipping unchanged files and overwriting modified ones")
+    p.add_argument("--use-current-directory", action="store_true",
+                   help="do not consider paths as relative to --root-dir or the configuration directory")
+    opts = p.parse_args()
+    if opts.configuration_file is not None:
+        with open(opts.configuration_file) as config:
+            defaults = p.parse_args(shlex.split(config.read(), comments=True))
+            for flag, value in opts._get_kwargs():
+                if value is None:
+                    setattr(opts, flag, getattr(defaults, flag))
+        if opts.root_dir is None:
+            opts.root_dir = opts.configuration_file.parent
+    if not opts.generate:
+        p.error("Nothing to do, specify --generate")
+    # absolutize all paths
+    for arg in path_arguments:
+        path = getattr(opts, arg.dest)
+        if path is not None:
+            setattr(opts, arg.dest, _abspath(path) if opts.use_current_directory else (opts.root_dir / path))
+    if not opts.script_name:
+        opts.script_name = paths.exe_file.relative_to(opts.root_dir)
+    return opts
+
+
+def _abspath(x: str) -> typing.Optional[pathlib.Path]:
+    return pathlib.Path(x).resolve() if x else None
+
+
+def run():
+    opts = _parse_args()
+    if opts.verbose:
+        log_level = logging.DEBUG
+    elif opts.quiet:
+        log_level = logging.ERROR
+    else:
+        log_level = logging.INFO
+    logging.basicConfig(format="{levelname} {message}", style='{', level=log_level)
+    for target in opts.generate:
+        generate(target, opts, render.Renderer(opts.script_name, opts.root_dir))
+
+
+if __name__ == "__main__":
+    run()

misc/codegen/generators/BUILD.bazel

@@ -0,0 +1,11 @@
+load("@codegen_deps//:requirements.bzl", "requirement")
+
+py_library(
+    name = "generators",
+    srcs = glob(["*.py"]),
+    visibility = ["//misc/codegen:__subpackages__"],
+    deps = [
+        "//misc/codegen/lib",
+        "//misc/codegen/loaders",
+    ],
+)

misc/codegen/generators/cppgen.py

@@ -16,8 +16,8 @@ import typing
 
 import inflection
 
-from swift.codegen.lib import cpp, schema
-from swift.codegen.loaders import schemaloader
+from misc.codegen.lib import cpp, schema
+from misc.codegen.loaders import schemaloader
 
 
 def _get_type(t: str, add_or_none_except: typing.Optional[str] = None) -> str:
@@ -95,4 +95,5 @@ def generate(opts, renderer):
     out = opts.cpp_output
     for dir, classes in processor.get_classes().items():
         renderer.render(cpp.ClassList(classes, opts.schema,
-                                      include_parent=bool(dir)), out / dir / "TrapClasses")
+                                      include_parent=bool(dir),
+                                      trap_library=opts.trap_library), out / dir / "TrapClasses")

misc/codegen/generators/dbschemegen.py

@@ -17,9 +17,9 @@ import typing
 
 import inflection
 
-from swift.codegen.lib import schema
-from swift.codegen.loaders import schemaloader
-from swift.codegen.lib.dbscheme import *
+from misc.codegen.lib import schema
+from misc.codegen.loaders import schemaloader
+from misc.codegen.lib.dbscheme import *
 
 log = logging.getLogger(__name__)
 
@@ -110,12 +110,12 @@ def get_declarations(data: schema.Schema):
     return declarations
 
 
-def get_includes(data: schema.Schema, include_dir: pathlib.Path, swift_dir: pathlib.Path):
+def get_includes(data: schema.Schema, include_dir: pathlib.Path, root_dir: pathlib.Path):
     includes = []
     for inc in data.includes:
         inc = include_dir / inc
         with open(inc) as inclusion:
-            includes.append(SchemeInclude(src=inc.relative_to(swift_dir), data=inclusion.read()))
+            includes.append(SchemeInclude(src=inc.relative_to(root_dir), data=inclusion.read()))
     return includes
 
 
@@ -125,8 +125,8 @@ def generate(opts, renderer):
 
     data = schemaloader.load_file(input)
 
-    dbscheme = Scheme(src=input.relative_to(opts.swift_dir),
-                      includes=get_includes(data, include_dir=input.parent, swift_dir=opts.swift_dir),
+    dbscheme = Scheme(src=input.name,
+                      includes=get_includes(data, include_dir=input.parent, root_dir=input.parent),
                       declarations=get_declarations(data))
 
     renderer.render(dbscheme, out)

misc/codegen/generators/qlgen.py

@@ -14,7 +14,7 @@ QL code generation
    corresponding to raw types)
 Moreover in the test directory for each <Class> in <group> it will generate beneath the
 extractor-tests/generated/<group>/<Class> directory either
- * a `MISSING_SOURCE.txt` explanation file if no `swift` source is present, or
+ * a `MISSING_SOURCE.txt` explanation file if no source is present, or
  * one `<Class>.ql` test query for all single properties and on `<Class>_<property>.ql` test query for each optional or
    repeated property
 """
@@ -29,8 +29,8 @@ import itertools
 
 import inflection
 
-from swift.codegen.lib import schema, ql
-from swift.codegen.loaders import schemaloader
+from misc.codegen.lib import schema, ql
+from misc.codegen.loaders import schemaloader
 
 log = logging.getLogger(__name__)
 
@@ -198,8 +198,8 @@ def get_ql_ipa_class(cls: schema.Class):
     return get_ql_ipa_class_db(cls.name)
 
 
-def get_import(file: pathlib.Path, swift_dir: pathlib.Path):
-    stem = file.relative_to(swift_dir / "ql/lib").with_suffix("")
+def get_import(file: pathlib.Path, root_dir: pathlib.Path):
+    stem = file.relative_to(root_dir / "ql/lib").with_suffix("")
     return str(stem).replace("/", ".")
 
 
@@ -287,7 +287,7 @@ def _should_skip_qltest(cls: schema.Class, lookup: typing.Dict[str, schema.Class
         cls, lookup)
 
 
-def _get_stub(cls: schema.Class, base_import: str) -> ql.Stub:
+def _get_stub(cls: schema.Class, base_import: str, generated_import_prefix: str) -> ql.Stub:
     if isinstance(cls.ipa, schema.IpaInfo):
         if cls.ipa.from_class is not None:
             accessors = [
@@ -307,7 +307,7 @@ def _get_stub(cls: schema.Class, base_import: str) -> ql.Stub:
             ]
     else:
         accessors = []
-    return ql.Stub(name=cls.name, base_import=base_import, ipa_accessors=accessors)
+    return ql.Stub(name=cls.name, base_import=base_import, import_prefix=generated_import_prefix, ipa_accessors=accessors)
 
 
 def generate(opts, renderer):
@@ -320,8 +320,9 @@ def generate(opts, renderer):
 
     generated = {q for q in out.rglob("*.qll")}
     generated.add(include_file)
-    generated.update(q for q in test_out.rglob("*.ql"))
-    generated.update(q for q in test_out.rglob(missing_test_source_filename))
+    if test_out:
+        generated.update(q for q in test_out.rglob("*.ql"))
+        generated.update(q for q in test_out.rglob(missing_test_source_filename))
 
     stubs = {q for q in stub_out.rglob("*.qll")}
 
@@ -335,6 +336,7 @@ def generate(opts, renderer):
         raise RootElementHasChildren(root)
 
     imports = {}
+    generated_import_prefix = get_import(out, opts.root_dir)
 
     with renderer.manage(generated=generated, stubs=stubs, registry=opts.generated_registry,
                          force=opts.force) as renderer:
@@ -344,51 +346,57 @@ def generate(opts, renderer):
 
         classes_by_dir_and_name = sorted(classes.values(), key=lambda cls: (cls.dir, cls.name))
         for c in classes_by_dir_and_name:
-            imports[c.name] = get_import(stub_out / c.path, opts.swift_dir)
+            imports[c.name] = get_import(stub_out / c.path, opts.root_dir)
 
         for c in classes.values():
             qll = out / c.path.with_suffix(".qll")
             c.imports = [imports[t] for t in get_classes_used_by(c)]
+            c.import_prefix = generated_import_prefix
             renderer.render(c, qll)
 
         for c in data.classes.values():
             path = _get_path(c)
             stub_file = stub_out / path
             if not renderer.is_customized_stub(stub_file):
-                base_import = get_import(out / path, opts.swift_dir)
-                renderer.render(_get_stub(c, base_import), stub_file)
+                base_import = get_import(out / path, opts.root_dir)
+                renderer.render(_get_stub(c, base_import, generated_import_prefix), stub_file)
 
         # for example path/to/elements -> path/to/elements.qll
         renderer.render(ql.ImportList([i for name, i in imports.items() if not classes[name].ql_internal]),
                         include_file)
 
+        elements_module = get_import(include_file, opts.root_dir)
+
         renderer.render(
             ql.GetParentImplementation(
                 classes=list(classes.values()),
-                additional_imports=[i for name, i in imports.items() if classes[name].ql_internal],
+                imports=[elements_module] + [i for name, i in imports.items() if classes[name].ql_internal],
             ),
             out / 'ParentChild.qll')
 
-        for c in data.classes.values():
-            if _should_skip_qltest(c, data.classes):
-                continue
-            test_dir = test_out / c.group / c.name
-            test_dir.mkdir(parents=True, exist_ok=True)
-            if not any(test_dir.glob("*.swift")):
-                log.warning(f"no test source in {test_dir.relative_to(test_out)}")
-                renderer.render(ql.MissingTestInstructions(),
-                                test_dir / missing_test_source_filename)
-                continue
-            total_props, partial_props = _partition(_get_all_properties_to_be_tested(c, data.classes),
-                                                    lambda p: p.is_total)
-            renderer.render(ql.ClassTester(class_name=c.name,
-                                           properties=total_props,
-                                           # in case of collapsed hierarchies we want to see the actual QL class in results
-                                           show_ql_class="qltest_collapse_hierarchy" in c.pragmas),
-                            test_dir / f"{c.name}.ql")
-            for p in partial_props:
-                renderer.render(ql.PropertyTester(class_name=c.name,
-                                                  property=p), test_dir / f"{c.name}_{p.getter}.ql")
+        if test_out:
+            for c in data.classes.values():
+                if _should_skip_qltest(c, data.classes):
+                    continue
+                test_dir = test_out / c.group / c.name
+                test_dir.mkdir(parents=True, exist_ok=True)
+                if all(f.suffix in (".txt", ".ql", ".actual", ".expected") for f in test_dir.glob("*.*")):
+                    log.warning(f"no test source in {test_dir.relative_to(test_out)}")
+                    renderer.render(ql.MissingTestInstructions(),
+                                    test_dir / missing_test_source_filename)
+                    continue
+                total_props, partial_props = _partition(_get_all_properties_to_be_tested(c, data.classes),
+                                                        lambda p: p.is_total)
+                renderer.render(ql.ClassTester(class_name=c.name,
+                                               properties=total_props,
+                                               elements_module=elements_module,
+                                               # in case of collapsed hierarchies we want to see the actual QL class in results
+                                               show_ql_class="qltest_collapse_hierarchy" in c.pragmas),
+                                test_dir / f"{c.name}.ql")
+                for p in partial_props:
+                    renderer.render(ql.PropertyTester(class_name=c.name,
+                                                      elements_module=elements_module,
+                                                      property=p), test_dir / f"{c.name}_{p.getter}.ql")
 
         final_ipa_types = []
         non_final_ipa_types = []
@@ -403,8 +411,8 @@ def generate(opts, renderer):
                     stub_file = stub_out / cls.group / f"{cls.name}Constructor.qll"
                     if not renderer.is_customized_stub(stub_file):
                         # stub rendering must be postponed as we might not have yet all subtracted ipa types in `ipa_type`
-                        stubs[stub_file] = ql.Synth.ConstructorStub(ipa_type)
-                    constructor_import = get_import(stub_file, opts.swift_dir)
+                        stubs[stub_file] = ql.Synth.ConstructorStub(ipa_type, import_prefix=generated_import_prefix)
+                    constructor_import = get_import(stub_file, opts.root_dir)
                     constructor_imports.append(constructor_import)
                     if ipa_type.is_ipa:
                         ipa_constructor_imports.append(constructor_import)
@@ -413,7 +421,8 @@ def generate(opts, renderer):
 
         for stub_file, data in stubs.items():
             renderer.render(data, stub_file)
-        renderer.render(ql.Synth.Types(root.name, final_ipa_types, non_final_ipa_types), out / "Synth.qll")
+        renderer.render(ql.Synth.Types(root.name, generated_import_prefix,
+                        final_ipa_types, non_final_ipa_types), out / "Synth.qll")
         renderer.render(ql.ImportList(constructor_imports), out / "SynthConstructors.qll")
         renderer.render(ql.ImportList(ipa_constructor_imports), out / "PureSynthConstructors.qll")
         if opts.ql_format:

misc/codegen/generators/trapgen.py

@@ -17,8 +17,8 @@ import pathlib
 import inflection
 from toposort import toposort_flatten
 
-from swift.codegen.lib import dbscheme, cpp
-from swift.codegen.loaders import dbschemeloader
+from misc.codegen.lib import dbscheme, cpp
+from misc.codegen.loaders import dbschemeloader
 
 log = logging.getLogger(__name__)
 
@@ -72,6 +72,7 @@ def generate(opts, renderer):
     assert opts.cpp_output
     tag_graph = {}
     out = opts.cpp_output
+    trap_library = opts.trap_library
 
     traps = {pathlib.Path(): []}
     for e in dbschemeloader.iterload(opts.dbscheme):
@@ -84,7 +85,8 @@ def generate(opts, renderer):
 
     for dir, entries in traps.items():
         dir = dir or pathlib.Path()
-        renderer.render(cpp.TrapList(entries, opts.dbscheme), out / dir / "TrapEntries")
+        relative_gen_dir = pathlib.Path(*[".." for _ in dir.parents])
+        renderer.render(cpp.TrapList(entries, opts.dbscheme, trap_library, relative_gen_dir), out / dir / "TrapEntries")
 
     tags = []
     for tag in toposort_flatten(tag_graph):

misc/codegen/lib/BUILD.bazel

@@ -1,9 +1,9 @@
-load("@swift_codegen_deps//:requirements.bzl", "requirement")
+load("@codegen_deps//:requirements.bzl", "requirement")
 
 py_library(
     name = "lib",
     srcs = glob(["*.py"]),
-    visibility = ["//swift/codegen:__subpackages__"],
+    visibility = ["//misc/codegen:__subpackages__"],
     deps = [
         requirement("pystache"),
         requirement("inflection"),

misc/codegen/lib/cpp.py

@@ -1,3 +1,4 @@
+import pathlib
 import re
 from dataclasses import dataclass, field
 from typing import List, ClassVar
@@ -110,6 +111,8 @@ class TrapList:
     extensions = ["h", "cpp"]
     traps: List[Trap]
     source: str
+    trap_library_dir: pathlib.Path
+    gen_dir: pathlib.Path
 
 
 @dataclass
@@ -156,4 +159,5 @@ class ClassList:
 
     classes: List[Class]
     source: str
+    trap_library: str
     include_parent: bool = False

misc/codegen/lib/paths.py

@@ -4,15 +4,16 @@ import pathlib
 import sys
 import os
 
+_this_file = pathlib.Path(__file__).resolve()
+
 try:
     workspace_dir = pathlib.Path(os.environ['BUILD_WORKSPACE_DIRECTORY']).resolve()  # <- means we are using bazel run
-    swift_dir = workspace_dir / 'swift'
+    root_dir = workspace_dir / 'swift'
 except KeyError:
-    _this_file = pathlib.Path(__file__).resolve()
-    swift_dir = _this_file.parents[2]
-    workspace_dir = swift_dir.parent
+    root_dir = _this_file.parents[2]
+    workspace_dir = root_dir.parent
 
-lib_dir = swift_dir / 'codegen' / 'lib'
-templates_dir = swift_dir / 'codegen' / 'templates'
+lib_dir = _this_file.parents[2] / 'codegen' / 'lib'
+templates_dir = _this_file.parents[2] / 'codegen' / 'templates'
 
 exe_file = pathlib.Path(sys.argv[0]).resolve()

misc/codegen/lib/ql.py

@@ -97,6 +97,7 @@ class Class:
     properties: List[Property] = field(default_factory=list)
     dir: pathlib.Path = pathlib.Path()
     imports: List[str] = field(default_factory=list)
+    import_prefix: Optional[str] = None
     qltest_skip: bool = False
     qltest_collapse_hierarchy: bool = False
     qltest_uncollapse_hierarchy: bool = False
@@ -152,6 +153,7 @@ class Stub:
 
     name: str
     base_import: str
+    import_prefix: str
     ipa_accessors: List[IpaUnderlyingAccessor] = field(default_factory=list)
 
     @property
@@ -178,7 +180,7 @@ class GetParentImplementation:
     template: ClassVar = 'ql_parent'
 
     classes: List[Class] = field(default_factory=list)
-    additional_imports: List[str] = field(default_factory=list)
+    imports: List[str] = field(default_factory=list)
 
 
 @dataclass
@@ -190,19 +192,23 @@ class PropertyForTest:
 
 
 @dataclass
-class ClassTester:
+class TesterBase:
+    class_name: str
+    elements_module: str
+
+
+@dataclass
+class ClassTester(TesterBase):
     template: ClassVar = 'ql_test_class'
 
-    class_name: str
     properties: List[PropertyForTest] = field(default_factory=list)
     show_ql_class: bool = False
 
 
 @dataclass
-class PropertyTester:
+class PropertyTester(TesterBase):
     template: ClassVar = 'ql_test_property'
 
-    class_name: str
     property: PropertyForTest
 
 
@@ -290,6 +296,7 @@ class Synth:
         template: ClassVar = "ql_ipa_types"
 
         root: str
+        import_prefix: str
         final_classes: List["Synth.FinalClass"] = field(default_factory=list)
         non_final_classes: List["Synth.NonFinalClass"] = field(default_factory=list)
 
@@ -302,3 +309,4 @@ class Synth:
         template: ClassVar = "ql_ipa_constructor_stub"
 
         cls: "Synth.FinalClass"
+        import_prefix: str

misc/codegen/lib/render.py

@@ -25,13 +25,13 @@ class Error(Exception):
 class Renderer:
     """ Template renderer using mustache templates in the `templates` directory """
 
-    def __init__(self, swift_dir: pathlib.Path):
+    def __init__(self, generator: pathlib.Path, root_dir: pathlib.Path):
         self._r = pystache.Renderer(search_dirs=str(paths.templates_dir), escape=lambda u: u)
-        self._swift_dir = swift_dir
-        self._generator = self._get_path(paths.exe_file)
+        self._root_dir = root_dir
+        self._generator = generator
 
     def _get_path(self, file: pathlib.Path):
-        return file.relative_to(self._swift_dir)
+        return file.relative_to(self._root_dir)
 
     def render(self, data: object, output: pathlib.Path):
         """ Render `data` to `output`.
@@ -60,7 +60,7 @@ class Renderer:
 
     def manage(self, generated: typing.Iterable[pathlib.Path], stubs: typing.Iterable[pathlib.Path],
                registry: pathlib.Path, force: bool = False) -> "RenderManager":
-        return RenderManager(self._swift_dir, generated, stubs, registry, force)
+        return RenderManager(self._generator, self._root_dir, generated, stubs, registry, force)
 
 
 class RenderManager(Renderer):
@@ -85,10 +85,10 @@ class RenderManager(Renderer):
         pre: str
         post: typing.Optional[str] = None
 
-    def __init__(self, swift_dir: pathlib.Path, generated: typing.Iterable[pathlib.Path],
+    def __init__(self, generator: pathlib.Path, root_dir: pathlib.Path, generated: typing.Iterable[pathlib.Path],
                  stubs: typing.Iterable[pathlib.Path],
                  registry: pathlib.Path, force: bool = False):
-        super().__init__(swift_dir)
+        super().__init__(generator, root_dir)
         self._registry_path = registry
         self._force = force
         self._hashes = {}
@@ -117,7 +117,7 @@ class RenderManager(Renderer):
                 self._hashes.pop(self._get_path(f), None)
         # clean up the registry from files that do not exist any more
         for f in list(self._hashes):
-            if not (self._swift_dir / f).exists():
+            if not (self._root_dir / f).exists():
                 self._hashes.pop(f)
         self._dump_registry()
 

misc/codegen/lib/schemadefs.py

@@ -1,5 +1,5 @@
 from typing import Callable as _Callable
-from swift.codegen.lib import schema as _schema
+from misc.codegen.lib import schema as _schema
 import inspect as _inspect
 from dataclasses import dataclass as _dataclass
 

misc/codegen/loaders/BUILD.bazel

@@ -1,9 +1,9 @@
-load("@swift_codegen_deps//:requirements.bzl", "requirement")
+load("@codegen_deps//:requirements.bzl", "requirement")
 
 py_library(
     name = "loaders",
     srcs = glob(["*.py"]),
-    visibility = ["//swift/codegen:__subpackages__"],
+    visibility = ["//misc/codegen:__subpackages__"],
     deps = [
         requirement("toposort"),
         requirement("inflection"),

misc/codegen/loaders/dbschemeloader.py

@@ -1,6 +1,6 @@
 import pathlib
 import re
-from swift.codegen.lib import dbscheme
+from misc.codegen.lib import dbscheme
 
 
 class _Re:

misc/codegen/loaders/schemaloader.py

@@ -8,7 +8,7 @@ import importlib.util
 from dataclasses import dataclass
 from toposort import toposort_flatten
 
-from swift.codegen.lib import schema, schemadefs
+from misc.codegen.lib import schema, schemadefs
 
 
 @dataclass
@@ -99,7 +99,7 @@ def load(m: types.ModuleType) -> schema.Schema:
     classes = {}
     known = {"int", "string", "boolean"}
     known.update(n for n in m.__dict__ if not n.startswith("__"))
-    import swift.codegen.lib.schemadefs as defs
+    import misc.codegen.lib.schemadefs as defs
     null = None
     for name, data in m.__dict__.items():
         if hasattr(defs, name):

misc/codegen/schemadefs.py

@@ -1,5 +1,5 @@
 from typing import Callable as _Callable
-from swift.codegen.lib import schema as _schema
+from misc.codegen.lib import schema as _schema
 import inspect as _inspect
 from dataclasses import dataclass as _dataclass
 

misc/codegen/templates/BUILD.bazel

@@ -1,4 +1,4 @@
-package(default_visibility = ["//swift:__subpackages__"])
+package(default_visibility = ["//misc/codegen:__subpackages__"])
 
 filegroup(
     name = "trap",

misc/codegen/templates/cpp_classes_h.mustache

@@ -6,8 +6,8 @@
 #include <optional>
 #include <vector>
 
-#include "swift/extractor/trap/TrapLabel.h"
-#include "swift/extractor/trap/TrapTagTraits.h"
+#include "{{trap_library}}/TrapLabel.h"
+#include "{{trap_library}}/TrapTagTraits.h"
 #include "./TrapEntries.h"
 {{#include_parent}}
 #include "../TrapClasses.h"

misc/codegen/templates/ql_class.mustache

@@ -1,6 +1,6 @@
 // generated by {{generator}}
-private import codeql.swift.generated.Synth
-private import codeql.swift.generated.Raw
+private import {{import_prefix}}.Synth
+private import {{import_prefix}}.Raw
 {{#imports}}
 import {{.}}
 {{/imports}}

misc/codegen/templates/ql_ipa_constructor_stub.mustache

@@ -1,9 +1,9 @@
 // generated by {{generator}}, remove this comment if you wish to edit this file
-private import codeql.swift.generated.Raw
+private import {{import_prefix}}.Raw
 {{#cls}}
 {{#is_db}}
 {{#has_subtracted_ipa_types}}
-private import codeql.swift.generated.PureSynthConstructors
+private import {{import_prefix}}.PureSynthConstructors
 {{/has_subtracted_ipa_types}}
 {{/is_db}}
 

misc/codegen/templates/ql_ipa_types.mustache

@@ -1,5 +1,5 @@
-private import codeql.swift.generated.SynthConstructors
-private import codeql.swift.generated.Raw
+private import {{import_prefix}}.SynthConstructors
+private import {{import_prefix}}.Raw
 
 cached module Synth {
   cached newtype T{{root}} =

misc/codegen/templates/ql_parent.mustache

@@ -1,9 +1,8 @@
 // generated by {{generator}}
 
-import codeql.swift.elements
-{{#additional_imports}}
+{{#imports}}
 import {{.}}
-{{/additional_imports}}
+{{/imports}}
 
 private module Impl {
 {{#classes}}

misc/codegen/templates/ql_stub.mustache

@@ -1,8 +1,8 @@
 // generated by {{generator}}, remove this comment if you wish to edit this file
 private import {{base_import}}
 {{#has_ipa_accessors}}
-private import codeql.swift.generated.Raw
-private import codeql.swift.generated.Synth
+private import {{import_prefix}}.Raw
+private import {{import_prefix}}.Synth
 {{/has_ipa_accessors}}
 
 {{#ql_internal}}

misc/codegen/templates/ql_test_class.mustache

@@ -1,6 +1,6 @@
 // generated by {{generator}}
 
-import codeql.swift.elements
+import {{elements_module}}
 import TestUtils
 
 from {{class_name}} x{{#properties}}, {{#type}}{{.}}{{/type}}{{^type}}string{{/type}} {{getter}}{{/properties}}

misc/codegen/templates/ql_test_missing.mustache

@@ -0,0 +1,4 @@
+// generated by {{generator}}
+
+After a source file is added in this directory and {{generator}} is run again, test queries
+will appear and this file will be deleted

misc/codegen/templates/ql_test_property.mustache

@@ -1,6 +1,6 @@
 // generated by {{generator}}
 
-import codeql.swift.elements
+import {{elements_module}}
 import TestUtils
 
 {{#property}}

misc/codegen/templates/trap_traps_h.mustache

@@ -5,9 +5,9 @@
 #include <iostream>
 #include <string>
 
-#include "swift/extractor/trap/TrapLabel.h"
-#include "swift/extractor/trap/TrapTagTraits.h"
-#include "swift/extractor/trap/generated/TrapTags.h"
+#include "{{trap_library_dir}}/TrapLabel.h"
+#include "{{trap_library_dir}}/TrapTagTraits.h"
+#include "{{gen_dir}}/TrapTags.h"
 
 namespace codeql {
 {{#traps}}

misc/codegen/test/BUILD.bazel

@@ -1,11 +1,11 @@
-load("@swift_codegen_deps//:requirements.bzl", "requirement")
+load("@codegen_deps//:requirements.bzl", "requirement")
 
 py_library(
     name = "utils",
     testonly = True,
     srcs = ["utils.py"],
     deps = [
-        "//swift/codegen/lib",
+        "//misc/codegen/lib",
         requirement("pytest"),
     ],
 )
@@ -17,7 +17,7 @@ py_library(
         srcs = [src],
         deps = [
             ":utils",
-            "//swift/codegen/generators",
+            "//misc/codegen/generators",
         ],
     )
     for src in glob(["test_*.py"])

misc/codegen/test/test_cpp.py

@@ -3,7 +3,7 @@ from copy import deepcopy
 
 import pytest
 
-from swift.codegen.lib import cpp
+from misc.codegen.lib import cpp
 
 
 @pytest.mark.parametrize("keyword", cpp.cpp_keywords)

misc/codegen/test/test_cppgen.py

@@ -1,8 +1,8 @@
 import sys
 
-from swift.codegen.generators import cppgen
-from swift.codegen.lib import cpp
-from swift.codegen.test.utils import *
+from misc.codegen.generators import cppgen
+from misc.codegen.lib import cpp
+from misc.codegen.test.utils import *
 
 output_dir = pathlib.Path("path", "to", "output")
 

misc/codegen/test/test_dbscheme.py

@@ -1,8 +1,8 @@
 import sys
 from copy import deepcopy
 
-from swift.codegen.lib import dbscheme
-from swift.codegen.test.utils import *
+from misc.codegen.lib import dbscheme
+from misc.codegen.test.utils import *
 
 
 def test_dbcolumn_name():

misc/codegen/test/test_dbschemegen.py

@@ -1,9 +1,9 @@
 import collections
 import sys
 
-from swift.codegen.generators import dbschemegen
-from swift.codegen.lib import dbscheme
-from swift.codegen.test.utils import *
+from misc.codegen.generators import dbschemegen
+from misc.codegen.lib import dbscheme
+from misc.codegen.test.utils import *
 
 InputExpectedPair = collections.namedtuple("InputExpectedPair", ("input", "expected"))
 
@@ -30,7 +30,7 @@ def generate(opts, input, renderer):
 
 def test_empty(generate):
     assert generate([]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[],
     )
@@ -43,10 +43,10 @@ def test_includes(input, opts, generate):
         write(opts.schema.parent / i, i + " data")
 
     assert generate([]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[
             dbscheme.SchemeInclude(
-                src=schema_dir / i,
+                src=pathlib.Path(i),
                 data=i + " data",
             ) for i in includes
         ],
@@ -58,7 +58,7 @@ def test_empty_final_class(generate, dir_param):
     assert generate([
         schema.Class("Object", group=dir_param.input),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Table(
@@ -78,7 +78,7 @@ def test_final_class_with_single_scalar_field(generate, dir_param):
             schema.SingleProperty("foo", "bar"),
         ]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Table(
@@ -98,7 +98,7 @@ def test_final_class_with_single_class_field(generate, dir_param):
             schema.SingleProperty("foo", "Bar"),
         ]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Table(
@@ -118,7 +118,7 @@ def test_final_class_with_optional_field(generate, dir_param):
             schema.OptionalProperty("foo", "bar"),
         ]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Table(
@@ -146,7 +146,7 @@ def test_final_class_with_repeated_field(generate, property_cls, dir_param):
             property_cls("foo", "bar"),
         ]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Table(
@@ -174,7 +174,7 @@ def test_final_class_with_predicate_field(generate, dir_param):
             schema.PredicateProperty("foo"),
         ]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Table(
@@ -205,7 +205,7 @@ def test_final_class_with_more_fields(generate, dir_param):
             schema.PredicateProperty("six"),
         ]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Table(
@@ -259,7 +259,7 @@ def test_empty_class_with_derived(generate):
         schema.Class(name="Left", bases=["Base"]),
         schema.Class(name="Right", bases=["Base"]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Union(
@@ -290,7 +290,7 @@ def test_class_with_derived_and_single_property(generate, dir_param):
         schema.Class(name="Left", bases=["Base"]),
         schema.Class(name="Right", bases=["Base"]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Union(
@@ -330,7 +330,7 @@ def test_class_with_derived_and_optional_property(generate, dir_param):
         schema.Class(name="Left", bases=["Base"]),
         schema.Class(name="Right", bases=["Base"]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Union(
@@ -370,7 +370,7 @@ def test_class_with_derived_and_repeated_property(generate, dir_param):
         schema.Class(name="Left", bases=["Base"]),
         schema.Class(name="Right", bases=["Base"]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Union(
@@ -432,7 +432,7 @@ def test_null_class(generate):
             bases=["Base"],
         ),
     ], null="Null") == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Union(
@@ -514,7 +514,7 @@ def test_ipa_classes_ignored(generate):
         schema.Class(name="B", ipa=schema.IpaInfo(from_class="A")),
         schema.Class(name="C", ipa=schema.IpaInfo(on_arguments={"x": "A"})),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[],
     )
@@ -526,7 +526,7 @@ def test_ipa_derived_classes_ignored(generate):
         schema.Class(name="B", bases=["A"], ipa=schema.IpaInfo()),
         schema.Class(name="C", bases=["A"]),
     ]) == dbscheme.Scheme(
-        src=schema_file,
+        src=schema_file.name,
         includes=[],
         declarations=[
             dbscheme.Union("@a", ["@c"]),

misc/codegen/test/test_dbschemelaoder.py

@@ -1,9 +1,9 @@
 import sys
 from copy import deepcopy
 
-from swift.codegen.lib import dbscheme
-from swift.codegen.loaders.dbschemeloader import iterload
-from swift.codegen.test.utils import *
+from misc.codegen.lib import dbscheme
+from misc.codegen.loaders.dbschemeloader import iterload
+from misc.codegen.test.utils import *
 
 
 @pytest.fixture

misc/codegen/test/test_ql.py

@@ -1,8 +1,8 @@
 import sys
 from copy import deepcopy
 
-from swift.codegen.lib import ql
-from swift.codegen.test.utils import *
+from misc.codegen.lib import ql
+from misc.codegen.test.utils import *
 
 
 def test_property_has_first_table_param_marked():

misc/codegen/test/test_qlgen.py

@@ -4,9 +4,9 @@ import sys
 
 import pytest
 
-from swift.codegen.generators import qlgen
-from swift.codegen.lib import ql
-from swift.codegen.test.utils import *
+from misc.codegen.generators import qlgen
+from misc.codegen.lib import ql
+from misc.codegen.test.utils import *
 
 
 @pytest.fixture(autouse=True)
@@ -17,16 +17,16 @@ def run_mock():
 
 
 # these are lambdas so that they will use patched paths when called
-def stub_path(): return paths.swift_dir / "ql/lib/stub/path"
+def stub_path(): return paths.root_dir / "ql/lib/stub/path"
 
 
-def ql_output_path(): return paths.swift_dir / "ql/lib/other/path"
+def ql_output_path(): return paths.root_dir / "ql/lib/other/path"
 
 
-def ql_test_output_path(): return paths.swift_dir / "ql/test/path"
+def ql_test_output_path(): return paths.root_dir / "ql/test/path"
 
 
-def generated_registry_path(): return paths.swift_dir / "registry.list"
+def generated_registry_path(): return paths.root_dir / "registry.list"
 
 
 def import_file(): return stub_path().with_suffix(".qll")
@@ -35,9 +35,11 @@ def import_file(): return stub_path().with_suffix(".qll")
 def children_file(): return ql_output_path() / "ParentChild.qll"
 
 
-stub_import_prefix = "stub.path."
+stub_import = "stub.path"
+stub_import_prefix = stub_import + "."
 root_import = stub_import_prefix + "Element"
-gen_import_prefix = "other.path."
+gen_import = "other.path"
+gen_import_prefix = gen_import + "."
 
 
 @pytest.fixture
@@ -47,7 +49,7 @@ def qlgen_opts(opts):
     opts.ql_test_output = ql_test_output_path()
     opts.generated_registry = generated_registry_path()
     opts.ql_format = True
-    opts.swift_dir = paths.swift_dir
+    opts.root_dir = paths.root_dir
     opts.force = False
     return opts
 
@@ -133,12 +135,20 @@ def generate_tests(generate):
     return func
 
 
+def a_ql_class(**kwargs):
+    return ql.Class(**kwargs, import_prefix=gen_import)
+
+
+def a_ql_stub(**kwargs):
+    return ql.Stub(**kwargs, import_prefix=gen_import)
+
+
 def test_one_empty_class(generate_classes):
     assert generate_classes([
         schema.Class("A")
     ]) == {
-        "A.qll": (ql.Stub(name="A", base_import=gen_import_prefix + "A"),
-                  ql.Class(name="A", final=True)),
+        "A.qll": (a_ql_stub(name="A", base_import=gen_import_prefix + "A"),
+                  a_ql_class(name="A", final=True)),
     }
 
 
@@ -149,15 +159,15 @@ def test_hierarchy(generate_classes):
         schema.Class("B", bases=["A"], derived={"D"}),
         schema.Class("A", derived={"B", "C"}),
     ]) == {
-        "A.qll": (ql.Stub(name="A", base_import=gen_import_prefix + "A"),
-                  ql.Class(name="A")),
-        "B.qll": (ql.Stub(name="B", base_import=gen_import_prefix + "B"),
-                  ql.Class(name="B", bases=["A"], imports=[stub_import_prefix + "A"])),
-        "C.qll": (ql.Stub(name="C", base_import=gen_import_prefix + "C"),
-                  ql.Class(name="C", bases=["A"], imports=[stub_import_prefix + "A"])),
-        "D.qll": (ql.Stub(name="D", base_import=gen_import_prefix + "D"),
-                  ql.Class(name="D", final=True, bases=["B", "C"],
-                           imports=[stub_import_prefix + cls for cls in "BC"])),
+        "A.qll": (a_ql_stub(name="A", base_import=gen_import_prefix + "A"),
+                  a_ql_class(name="A")),
+        "B.qll": (a_ql_stub(name="B", base_import=gen_import_prefix + "B"),
+                  a_ql_class(name="B", bases=["A"], imports=[stub_import_prefix + "A"])),
+        "C.qll": (a_ql_stub(name="C", base_import=gen_import_prefix + "C"),
+                  a_ql_class(name="C", bases=["A"], imports=[stub_import_prefix + "A"])),
+        "D.qll": (a_ql_stub(name="D", base_import=gen_import_prefix + "D"),
+                  a_ql_class(name="D", final=True, bases=["B", "C"],
+                             imports=[stub_import_prefix + cls for cls in "BC"])),
     }
 
 
@@ -186,15 +196,15 @@ def test_hierarchy_children(generate_children_implementations):
         schema.Class("C", bases=["A"], derived={"D"}, pragmas=["ql_internal"]),
         schema.Class("D", bases=["B", "C"]),
     ]) == ql.GetParentImplementation(
-        classes=[ql.Class(name="A", ql_internal=True),
-                 ql.Class(name="B", bases=["A"], imports=[
+        classes=[a_ql_class(name="A", ql_internal=True),
+                 a_ql_class(name="B", bases=["A"], imports=[
                      stub_import_prefix + "A"]),
-                 ql.Class(name="C", bases=["A"], imports=[
+                 a_ql_class(name="C", bases=["A"], imports=[
                      stub_import_prefix + "A"], ql_internal=True),
-                 ql.Class(name="D", final=True, bases=["B", "C"],
-                          imports=[stub_import_prefix + cls for cls in "BC"]),
+                 a_ql_class(name="D", final=True, bases=["B", "C"],
+                            imports=[stub_import_prefix + cls for cls in "BC"]),
                  ],
-        additional_imports=[stub_import_prefix + cls for cls in "AC"],
+        imports=[stub_import] + [stub_import_prefix + cls for cls in "AC"],
     )
 
 
@@ -203,12 +213,12 @@ def test_single_property(generate_classes):
         schema.Class("MyObject", properties=[
             schema.SingleProperty("foo", "bar")]),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True,
-                                  properties=[
-                                      ql.Property(singular="Foo", type="bar", tablename="my_objects",
-                                                  tableparams=["this", "result"], doc="foo of this my object"),
-                                  ])),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True,
+                                    properties=[
+                                        ql.Property(singular="Foo", type="bar", tablename="my_objects",
+                                                    tableparams=["this", "result"], doc="foo of this my object"),
+                                    ])),
     }
 
 
@@ -226,42 +236,45 @@ def test_children(generate_classes):
             schema.RepeatedOptionalProperty("child_4", "int", is_child=True),
         ]),
     ]) == {
-        "FakeRoot.qll": (ql.Stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
-                         ql.Class(name="FakeRoot", final=True)),
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True,
-                                  properties=[
-                                      ql.Property(singular="A", type="int", tablename="my_objects",
-                                                  tableparams=["this", "result", "_"],
-                                                  doc="a of this my object"),
-                                      ql.Property(singular="Child1", type="int", tablename="my_objects",
-                                                  tableparams=["this", "_", "result"], prev_child="",
-                                                  doc="child 1 of this my object"),
-                                      ql.Property(singular="B", plural="Bs", type="int",
-                                                  tablename="my_object_bs",
-                                                  tableparams=["this", "index", "result"],
-                                                  doc="b of this my object", doc_plural="bs of this my object"),
-                                      ql.Property(singular="Child", plural="Children", type="int",
-                                                  tablename="my_object_children",
-                                                  tableparams=["this", "index", "result"], prev_child="Child1",
-                                                  doc="child of this my object",
-                                                  doc_plural="children of this my object"),
-                                      ql.Property(singular="C", type="int", tablename="my_object_cs",
-                                                  tableparams=["this", "result"], is_optional=True,
-                                                  doc="c of this my object"),
-                                      ql.Property(singular="Child3", type="int", tablename="my_object_child_3s",
-                                                  tableparams=["this", "result"], is_optional=True,
-                                                  prev_child="Child", doc="child 3 of this my object"),
-                                      ql.Property(singular="D", plural="Ds", type="int",
-                                                  tablename="my_object_ds",
-                                                  tableparams=["this", "index", "result"], is_optional=True,
-                                                  doc="d of this my object", doc_plural="ds of this my object"),
-                                      ql.Property(singular="Child4", plural="Child4s", type="int",
-                                                  tablename="my_object_child_4s",
-                                                  tableparams=["this", "index", "result"], is_optional=True,
-                                                  prev_child="Child3", doc="child 4 of this my object",
-                                                  doc_plural="child 4s of this my object"),
-                                  ])),
+        "FakeRoot.qll": (a_ql_stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
+                         a_ql_class(name="FakeRoot", final=True)),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True,
+                                    properties=[
+                                        ql.Property(singular="A", type="int", tablename="my_objects",
+                                                    tableparams=["this", "result", "_"],
+                                                    doc="a of this my object"),
+                                        ql.Property(singular="Child1", type="int", tablename="my_objects",
+                                                    tableparams=["this", "_", "result"], prev_child="",
+                                                    doc="child 1 of this my object"),
+                                        ql.Property(singular="B", plural="Bs", type="int",
+                                                    tablename="my_object_bs",
+                                                    tableparams=["this", "index", "result"],
+                                                    doc="b of this my object",
+                                                    doc_plural="bs of this my object"),
+                                        ql.Property(singular="Child", plural="Children", type="int",
+                                                    tablename="my_object_children",
+                                                    tableparams=["this", "index", "result"], prev_child="Child1",
+                                                    doc="child of this my object",
+                                                    doc_plural="children of this my object"),
+                                        ql.Property(singular="C", type="int", tablename="my_object_cs",
+                                                    tableparams=["this", "result"], is_optional=True,
+                                                    doc="c of this my object"),
+                                        ql.Property(singular="Child3", type="int",
+                                                    tablename="my_object_child_3s",
+                                                    tableparams=["this", "result"], is_optional=True,
+                                                    prev_child="Child", doc="child 3 of this my object"),
+                                        ql.Property(singular="D", plural="Ds", type="int",
+                                                    tablename="my_object_ds",
+                                                    tableparams=["this", "index", "result"], is_optional=True,
+                                                    doc="d of this my object",
+                                                    doc_plural="ds of this my object"),
+                                        ql.Property(singular="Child4", plural="Child4s", type="int",
+                                                    tablename="my_object_child_4s",
+                                                    tableparams=["this", "index", "result"], is_optional=True,
+                                                    prev_child="Child3", doc="child 4 of this my object",
+                                                    doc_plural="child 4s of this my object"),
+                                    ])),
     }
 
 
@@ -273,19 +286,19 @@ def test_single_properties(generate_classes):
             schema.SingleProperty("three", "z"),
         ]),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True,
-                                  properties=[
-                                      ql.Property(singular="One", type="x", tablename="my_objects",
-                                                  tableparams=["this", "result", "_", "_"],
-                                                  doc="one of this my object"),
-                                      ql.Property(singular="Two", type="y", tablename="my_objects",
-                                                  tableparams=["this", "_", "result", "_"],
-                                                  doc="two of this my object"),
-                                      ql.Property(singular="Three", type="z", tablename="my_objects",
-                                                  tableparams=["this", "_", "_", "result"],
-                                                  doc="three of this my object"),
-                                  ])),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True,
+                                    properties=[
+                                        ql.Property(singular="One", type="x", tablename="my_objects",
+                                                    tableparams=["this", "result", "_", "_"],
+                                                    doc="one of this my object"),
+                                        ql.Property(singular="Two", type="y", tablename="my_objects",
+                                                    tableparams=["this", "_", "result", "_"],
+                                                    doc="two of this my object"),
+                                        ql.Property(singular="Three", type="z", tablename="my_objects",
+                                                    tableparams=["this", "_", "_", "result"],
+                                                    doc="three of this my object"),
+                                    ])),
     }
 
 
@@ -296,14 +309,14 @@ def test_optional_property(generate_classes, is_child, prev_child):
         schema.Class("MyObject", properties=[
             schema.OptionalProperty("foo", "bar", is_child=is_child)]),
     ]) == {
-        "FakeRoot.qll": (ql.Stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
-                         ql.Class(name="FakeRoot", final=True)),
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True, properties=[
-                             ql.Property(singular="Foo", type="bar", tablename="my_object_foos",
-                                         tableparams=["this", "result"],
-                                         is_optional=True, prev_child=prev_child, doc="foo of this my object"),
-                         ])),
+        "FakeRoot.qll": (a_ql_stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
+                         a_ql_class(name="FakeRoot", final=True)),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True, properties=[
+                                    ql.Property(singular="Foo", type="bar", tablename="my_object_foos",
+                                                tableparams=["this", "result"],
+                                                is_optional=True, prev_child=prev_child, doc="foo of this my object"),
+                                    ])),
     }
 
 
@@ -314,14 +327,14 @@ def test_repeated_property(generate_classes, is_child, prev_child):
         schema.Class("MyObject", properties=[
             schema.RepeatedProperty("foo", "bar", is_child=is_child)]),
     ]) == {
-        "FakeRoot.qll": (ql.Stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
-                         ql.Class(name="FakeRoot", final=True)),
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True, properties=[
-                             ql.Property(singular="Foo", plural="Foos", type="bar", tablename="my_object_foos",
-                                         tableparams=["this", "index", "result"], prev_child=prev_child,
-                                         doc="foo of this my object", doc_plural="foos of this my object"),
-                         ])),
+        "FakeRoot.qll": (a_ql_stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
+                         a_ql_class(name="FakeRoot", final=True)),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True, properties=[
+                                    ql.Property(singular="Foo", plural="Foos", type="bar", tablename="my_object_foos",
+                                                tableparams=["this", "index", "result"], prev_child=prev_child,
+                                                doc="foo of this my object", doc_plural="foos of this my object"),
+                                    ])),
     }
 
 
@@ -333,15 +346,15 @@ def test_repeated_optional_property(generate_classes, is_child, prev_child):
             schema.RepeatedOptionalProperty("foo", "bar", is_child=is_child)]),
     ]) == {
 
-        "FakeRoot.qll": (ql.Stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
-                         ql.Class(name="FakeRoot", final=True)),
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True, properties=[
-                             ql.Property(singular="Foo", plural="Foos", type="bar", tablename="my_object_foos",
-                                         tableparams=["this", "index", "result"], is_optional=True,
-                                         prev_child=prev_child, doc="foo of this my object",
-                                         doc_plural="foos of this my object"),
-                         ])),
+        "FakeRoot.qll": (a_ql_stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
+                         a_ql_class(name="FakeRoot", final=True)),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True, properties=[
+                                    ql.Property(singular="Foo", plural="Foos", type="bar", tablename="my_object_foos",
+                                                tableparams=["this", "index", "result"], is_optional=True,
+                                                prev_child=prev_child, doc="foo of this my object",
+                                                doc_plural="foos of this my object"),
+                                    ])),
     }
 
 
@@ -350,11 +363,11 @@ def test_predicate_property(generate_classes):
         schema.Class("MyObject", properties=[
             schema.PredicateProperty("is_foo")]),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True, properties=[
-                             ql.Property(singular="isFoo", type="predicate", tablename="my_object_is_foo",
-                                         tableparams=["this"], is_predicate=True, doc="this my object is foo"),
-                         ])),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True, properties=[
+                                    ql.Property(singular="isFoo", type="predicate", tablename="my_object_is_foo",
+                                                tableparams=["this"], is_predicate=True, doc="this my object is foo"),
+                                    ])),
     }
 
 
@@ -365,8 +378,8 @@ def test_single_class_property(generate_classes, is_child, prev_child):
         schema.Class("MyObject", properties=[
             schema.SingleProperty("foo", "Bar", is_child=is_child)]),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(
             name="MyObject", final=True, imports=[stub_import_prefix + "Bar"], properties=[
                 ql.Property(singular="Foo", type="Bar", tablename="my_objects",
                             tableparams=[
@@ -374,8 +387,8 @@ def test_single_class_property(generate_classes, is_child, prev_child):
                             prev_child=prev_child, doc="foo of this my object"),
             ],
         )),
-        "Bar.qll": (ql.Stub(name="Bar", base_import=gen_import_prefix + "Bar"),
-                    ql.Class(name="Bar", final=True)),
+        "Bar.qll": (a_ql_stub(name="Bar", base_import=gen_import_prefix + "Bar"),
+                    a_ql_class(name="Bar", final=True)),
     }
 
 
@@ -384,8 +397,8 @@ def test_class_with_doc(generate_classes):
     assert generate_classes([
         schema.Class("A", doc=doc),
     ]) == {
-        "A.qll": (ql.Stub(name="A", base_import=gen_import_prefix + "A"),
-                  ql.Class(name="A", final=True, doc=doc)),
+        "A.qll": (a_ql_stub(name="A", base_import=gen_import_prefix + "A"),
+                  a_ql_class(name="A", final=True, doc=doc)),
     }
 
 
@@ -395,11 +408,11 @@ def test_class_dir(generate_classes):
         schema.Class("A", derived={"B"}, group=dir),
         schema.Class("B", bases=["A"]),
     ]) == {
-        f"{dir}/A.qll": (ql.Stub(name="A", base_import=gen_import_prefix + "another.rel.path.A"),
-                         ql.Class(name="A", dir=pathlib.Path(dir))),
-        "B.qll": (ql.Stub(name="B", base_import=gen_import_prefix + "B"),
-                  ql.Class(name="B", final=True, bases=["A"],
-                           imports=[stub_import_prefix + "another.rel.path.A"])),
+        f"{dir}/A.qll": (a_ql_stub(name="A", base_import=gen_import_prefix + "another.rel.path.A"),
+                         a_ql_class(name="A", dir=pathlib.Path(dir))),
+        "B.qll": (a_ql_stub(name="B", base_import=gen_import_prefix + "B"),
+                  a_ql_class(name="B", final=True, bases=["A"],
+                             imports=[stub_import_prefix + "another.rel.path.A"])),
     }
 
 
@@ -487,12 +500,20 @@ def test_test_missing_source(generate_tests):
     }
 
 
+def a_ql_class_tester(**kwargs):
+    return ql.ClassTester(**kwargs, elements_module=stub_import)
+
+
+def a_ql_property_tester(**kwargs):
+    return ql.PropertyTester(**kwargs, elements_module=stub_import)
+
+
 def test_test_source_present(opts, generate_tests):
     write(opts.ql_test_output / "A" / "test.swift")
     assert generate_tests([
         schema.Class("A"),
     ]) == {
-        "A/A.ql": ql.ClassTester(class_name="A"),
+        "A/A.ql": a_ql_class_tester(class_name="A"),
     }
 
 
@@ -501,7 +522,7 @@ def test_test_source_present_with_dir(opts, generate_tests):
     assert generate_tests([
         schema.Class("A", group="foo"),
     ]) == {
-        "foo/A/A.ql": ql.ClassTester(class_name="A"),
+        "foo/A/A.ql": a_ql_class_tester(class_name="A"),
     }
 
 
@@ -515,7 +536,7 @@ def test_test_total_properties(opts, generate_tests):
             schema.PredicateProperty("y", "int"),
         ]),
     ]) == {
-        "B/B.ql": ql.ClassTester(class_name="B", properties=[
+        "B/B.ql": a_ql_class_tester(class_name="B", properties=[
             ql.PropertyForTest(getter="getX", type="string"),
             ql.PropertyForTest(getter="y"),
         ])
@@ -533,21 +554,21 @@ def test_test_partial_properties(opts, generate_tests):
             schema.RepeatedOptionalProperty("z", "int"),
         ]),
     ]) == {
-        "B/B.ql": ql.ClassTester(class_name="B", properties=[
+        "B/B.ql": a_ql_class_tester(class_name="B", properties=[
             ql.PropertyForTest(getter="hasX"),
             ql.PropertyForTest(getter="getNumberOfYs", type="int"),
         ]),
-        "B/B_getX.ql": ql.PropertyTester(class_name="B",
-                                         property=ql.PropertyForTest(getter="getX", is_total=False,
-                                                                            type="string")),
-        "B/B_getY.ql": ql.PropertyTester(class_name="B",
-                                         property=ql.PropertyForTest(getter="getY", is_total=False,
-                                                                     is_repeated=True,
-                                                                     type="bool")),
-        "B/B_getZ.ql": ql.PropertyTester(class_name="B",
-                                         property=ql.PropertyForTest(getter="getZ", is_total=False,
-                                                                     is_repeated=True,
-                                                                     type="int")),
+        "B/B_getX.ql": a_ql_property_tester(class_name="B",
+                                            property=ql.PropertyForTest(getter="getX", is_total=False,
+                                                                               type="string")),
+        "B/B_getY.ql": a_ql_property_tester(class_name="B",
+                                            property=ql.PropertyForTest(getter="getY", is_total=False,
+                                                                               is_repeated=True,
+                                                                               type="bool")),
+        "B/B_getZ.ql": a_ql_property_tester(class_name="B",
+                                            property=ql.PropertyForTest(getter="getZ", is_total=False,
+                                                                               is_repeated=True,
+                                                                               type="int")),
     }
 
 
@@ -562,14 +583,14 @@ def test_test_properties_deduplicated(opts, generate_tests):
         schema.Class("B", bases=["Base"], derived={"Final"}),
         schema.Class("Final", bases=["A", "B"]),
     ]) == {
-        "Final/Final.ql": ql.ClassTester(class_name="Final", properties=[
+        "Final/Final.ql": a_ql_class_tester(class_name="Final", properties=[
             ql.PropertyForTest(getter="getX", type="string"),
             ql.PropertyForTest(getter="getNumberOfYs", type="int"),
         ]),
-        "Final/Final_getY.ql": ql.PropertyTester(class_name="Final",
-                                                 property=ql.PropertyForTest(getter="getY", is_total=False,
-                                                                                    is_repeated=True,
-                                                                                    type="bool")),
+        "Final/Final_getY.ql": a_ql_property_tester(class_name="Final",
+                                                    property=ql.PropertyForTest(getter="getY", is_total=False,
+                                                                                       is_repeated=True,
+                                                                                       type="bool")),
     }
 
 
@@ -586,7 +607,7 @@ def test_test_properties_skipped(opts, generate_tests):
                 "b", "int", pragmas=["bar", "qltest_skip", "baz"]),
         ]),
     ]) == {
-        "Derived/Derived.ql": ql.ClassTester(class_name="Derived"),
+        "Derived/Derived.ql": a_ql_class_tester(class_name="Derived"),
     }
 
 
@@ -599,7 +620,7 @@ def test_test_base_class_skipped(opts, generate_tests):
         ]),
         schema.Class("Derived", bases=["Base"]),
     ]) == {
-        "Derived/Derived.ql": ql.ClassTester(class_name="Derived"),
+        "Derived/Derived.ql": a_ql_class_tester(class_name="Derived"),
     }
 
 
@@ -622,7 +643,7 @@ def test_test_class_hierarchy_collapse(opts, generate_tests):
         schema.Class("D2", bases=["Base"], derived={"D3"}, properties=[schema.SingleProperty("y", "string")]),
         schema.Class("D3", bases=["D2"], properties=[schema.SingleProperty("z", "string")]),
     ]) == {
-        "Base/Base.ql": ql.ClassTester(class_name="Base", show_ql_class=True),
+        "Base/Base.ql": a_ql_class_tester(class_name="Base", show_ql_class=True),
     }
 
 
@@ -636,9 +657,9 @@ def test_test_class_hierarchy_uncollapse(opts, generate_tests):
         schema.Class("D3", bases=["D2"]),
         schema.Class("D4", bases=["D2"]),
     ]) == {
-        "Base/Base.ql": ql.ClassTester(class_name="Base", show_ql_class=True),
-        "D3/D3.ql": ql.ClassTester(class_name="D3"),
-        "D4/D4.ql": ql.ClassTester(class_name="D4"),
+        "Base/Base.ql": a_ql_class_tester(class_name="Base", show_ql_class=True),
+        "D3/D3.ql": a_ql_class_tester(class_name="D3"),
+        "D4/D4.ql": a_ql_class_tester(class_name="D4"),
     }
 
 
@@ -651,8 +672,8 @@ def test_test_class_hierarchy_uncollapse_at_final(opts, generate_tests):
         schema.Class("D2", bases=["Base"], derived={"D3"}),
         schema.Class("D3", bases=["D2"], pragmas=["qltest_uncollapse_hierarchy", "bar"]),
     ]) == {
-        "Base/Base.ql": ql.ClassTester(class_name="Base", show_ql_class=True),
-        "D3/D3.ql": ql.ClassTester(class_name="D3"),
+        "Base/Base.ql": a_ql_class_tester(class_name="Base", show_ql_class=True),
+        "D3/D3.ql": a_ql_class_tester(class_name="D3"),
     }
 
 
@@ -663,14 +684,14 @@ def test_property_description(generate_classes):
             schema.SingleProperty("foo", "bar", description=description),
         ]),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True,
-                                  properties=[
-                                      ql.Property(singular="Foo", type="bar", tablename="my_objects",
-                                                  tableparams=["this", "result"],
-                                                  doc="foo of this my object",
-                                                  description=description),
-                                  ])),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True,
+                                    properties=[
+                                        ql.Property(singular="Foo", type="bar", tablename="my_objects",
+                                                    tableparams=["this", "result"],
+                                                    doc="foo of this my object",
+                                                    description=description),
+                                    ])),
     }
 
 
@@ -679,12 +700,12 @@ def test_property_doc_override(generate_classes):
         schema.Class("MyObject", properties=[
             schema.SingleProperty("foo", "bar", doc="baz")]),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True,
-                                  properties=[
-                                      ql.Property(singular="Foo", type="bar", tablename="my_objects",
-                                                  tableparams=["this", "result"], doc="baz"),
-                                  ])),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True,
+                                    properties=[
+                                        ql.Property(singular="Foo", type="bar", tablename="my_objects",
+                                                    tableparams=["this", "result"], doc="baz"),
+                                    ])),
     }
 
 
@@ -694,18 +715,18 @@ def test_repeated_property_doc_override(generate_classes):
             schema.RepeatedProperty("x", "int", doc="children of this"),
             schema.RepeatedOptionalProperty("y", "int", doc="child of this")]),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True,
-                                  properties=[
-                                      ql.Property(singular="X", plural="Xes", type="int",
-                                                  tablename="my_object_xes",
-                                                  tableparams=["this", "index", "result"],
-                                                  doc="child of this", doc_plural="children of this"),
-                                      ql.Property(singular="Y", plural="Ys", type="int",
-                                                  tablename="my_object_ies", is_optional=True,
-                                                  tableparams=["this", "index", "result"],
-                                                  doc="child of this", doc_plural="children of this"),
-                                  ])),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True,
+                                    properties=[
+                                        ql.Property(singular="X", plural="Xes", type="int",
+                                                    tablename="my_object_xes",
+                                                    tableparams=["this", "index", "result"],
+                                                    doc="child of this", doc_plural="children of this"),
+                                        ql.Property(singular="Y", plural="Ys", type="int",
+                                                    tablename="my_object_ies", is_optional=True,
+                                                    tableparams=["this", "index", "result"],
+                                                    doc="child of this", doc_plural="children of this"),
+                                    ])),
     }
 
 
@@ -716,13 +737,13 @@ def test_property_doc_abbreviations(generate_classes, abbr, expected):
         schema.Class("Object", properties=[
             schema.SingleProperty(f"foo_{abbr}_bar", "baz")]),
     ]) == {
-        "Object.qll": (ql.Stub(name="Object", base_import=gen_import_prefix + "Object"),
-                       ql.Class(name="Object", final=True,
-                                properties=[
-                                    ql.Property(singular=f"Foo{abbr.capitalize()}Bar", type="baz",
-                                                tablename="objects",
-                                                tableparams=["this", "result"], doc=expected_doc),
-                                ])),
+        "Object.qll": (a_ql_stub(name="Object", base_import=gen_import_prefix + "Object"),
+                       a_ql_class(name="Object", final=True,
+                                  properties=[
+                                      ql.Property(singular=f"Foo{abbr.capitalize()}Bar", type="baz",
+                                                  tablename="objects",
+                                                  tableparams=["this", "result"], doc=expected_doc),
+                                  ])),
     }
 
 
@@ -733,13 +754,13 @@ def test_property_doc_abbreviations_ignored_if_within_word(generate_classes, abb
         schema.Class("Object", properties=[
             schema.SingleProperty(f"foo_{abbr}acadabra_bar", "baz")]),
     ]) == {
-        "Object.qll": (ql.Stub(name="Object", base_import=gen_import_prefix + "Object"),
-                       ql.Class(name="Object", final=True,
-                                properties=[
-                                    ql.Property(singular=f"Foo{abbr.capitalize()}acadabraBar", type="baz",
-                                                tablename="objects",
-                                                tableparams=["this", "result"], doc=expected_doc),
-                                ])),
+        "Object.qll": (a_ql_stub(name="Object", base_import=gen_import_prefix + "Object"),
+                       a_ql_class(name="Object", final=True,
+                                  properties=[
+                                      ql.Property(singular=f"Foo{abbr.capitalize()}acadabraBar", type="baz",
+                                                  tablename="objects",
+                                                  tableparams=["this", "result"], doc=expected_doc),
+                                  ])),
     }
 
 
@@ -749,20 +770,20 @@ def test_repeated_property_doc_override_with_format(generate_classes):
             schema.RepeatedProperty("x", "int", doc="special {children} of this"),
             schema.RepeatedOptionalProperty("y", "int", doc="special {child} of this")]),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True,
-                                  properties=[
-                                      ql.Property(singular="X", plural="Xes", type="int",
-                                                  tablename="my_object_xes",
-                                                  tableparams=["this", "index", "result"],
-                                                  doc="special child of this",
-                                                  doc_plural="special children of this"),
-                                      ql.Property(singular="Y", plural="Ys", type="int",
-                                                  tablename="my_object_ies", is_optional=True,
-                                                  tableparams=["this", "index", "result"],
-                                                  doc="special child of this",
-                                                  doc_plural="special children of this"),
-                                  ])),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True,
+                                    properties=[
+                                        ql.Property(singular="X", plural="Xes", type="int",
+                                                    tablename="my_object_xes",
+                                                    tableparams=["this", "index", "result"],
+                                                    doc="special child of this",
+                                                    doc_plural="special children of this"),
+                                        ql.Property(singular="Y", plural="Ys", type="int",
+                                                    tablename="my_object_ies", is_optional=True,
+                                                    tableparams=["this", "index", "result"],
+                                                    doc="special child of this",
+                                                    doc_plural="special children of this"),
+                                    ])),
     }
 
 
@@ -772,18 +793,18 @@ def test_repeated_property_doc_override_with_multiple_formats(generate_classes):
             schema.RepeatedProperty("x", "int", doc="{cat} or {dog}"),
             schema.RepeatedOptionalProperty("y", "int", doc="{cats} or {dogs}")]),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True,
-                                  properties=[
-                                      ql.Property(singular="X", plural="Xes", type="int",
-                                                  tablename="my_object_xes",
-                                                  tableparams=["this", "index", "result"],
-                                                  doc="cat or dog", doc_plural="cats or dogs"),
-                                      ql.Property(singular="Y", plural="Ys", type="int",
-                                                  tablename="my_object_ies", is_optional=True,
-                                                  tableparams=["this", "index", "result"],
-                                                  doc="cat or dog", doc_plural="cats or dogs"),
-                                  ])),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True,
+                                    properties=[
+                                        ql.Property(singular="X", plural="Xes", type="int",
+                                                    tablename="my_object_xes",
+                                                    tableparams=["this", "index", "result"],
+                                                    doc="cat or dog", doc_plural="cats or dogs"),
+                                        ql.Property(singular="Y", plural="Ys", type="int",
+                                                    tablename="my_object_ies", is_optional=True,
+                                                    tableparams=["this", "index", "result"],
+                                                    doc="cat or dog", doc_plural="cats or dogs"),
+                                    ])),
     }
 
 
@@ -792,12 +813,12 @@ def test_property_doc_override_with_format(generate_classes):
         schema.Class("MyObject", properties=[
             schema.SingleProperty("foo", "bar", doc="special {baz} of this")]),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True,
-                                  properties=[
-                                      ql.Property(singular="Foo", type="bar", tablename="my_objects",
-                                                  tableparams=["this", "result"], doc="special baz of this"),
-                                  ])),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True,
+                                    properties=[
+                                        ql.Property(singular="Foo", type="bar", tablename="my_objects",
+                                                    tableparams=["this", "result"], doc="special baz of this"),
+                                    ])),
     }
 
 
@@ -807,12 +828,12 @@ def test_property_on_class_with_default_doc_name(generate_classes):
             schema.SingleProperty("foo", "bar")],
             default_doc_name="baz"),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
-                         ql.Class(name="MyObject", final=True,
-                                  properties=[
-                                      ql.Property(singular="Foo", type="bar", tablename="my_objects",
-                                                  tableparams=["this", "result"], doc="foo of this baz"),
-                                  ])),
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
+                         a_ql_class(name="MyObject", final=True,
+                                    properties=[
+                                        ql.Property(singular="Foo", type="bar", tablename="my_objects",
+                                                    tableparams=["this", "result"], doc="foo of this baz"),
+                                    ])),
     }
 
 
@@ -820,10 +841,10 @@ def test_stub_on_class_with_ipa_from_class(generate_classes):
     assert generate_classes([
         schema.Class("MyObject", ipa=schema.IpaInfo(from_class="A")),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject", ipa_accessors=[
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject", ipa_accessors=[
             ql.IpaUnderlyingAccessor(argument="Entity", type="Raw::A", constructorparams=["result"]),
         ]),
-            ql.Class(name="MyObject", final=True, ipa=True)),
+            a_ql_class(name="MyObject", final=True, ipa=True)),
     }
 
 
@@ -831,12 +852,12 @@ def test_stub_on_class_with_ipa_on_arguments(generate_classes):
     assert generate_classes([
         schema.Class("MyObject", ipa=schema.IpaInfo(on_arguments={"base": "A", "index": "int", "label": "string"})),
     ]) == {
-        "MyObject.qll": (ql.Stub(name="MyObject", base_import=gen_import_prefix + "MyObject", ipa_accessors=[
+        "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject", ipa_accessors=[
             ql.IpaUnderlyingAccessor(argument="Base", type="Raw::A", constructorparams=["result", "_", "_"]),
             ql.IpaUnderlyingAccessor(argument="Index", type="int", constructorparams=["_", "result", "_"]),
             ql.IpaUnderlyingAccessor(argument="Label", type="string", constructorparams=["_", "_", "result"]),
         ]),
-            ql.Class(name="MyObject", final=True, ipa=True)),
+            a_ql_class(name="MyObject", final=True, ipa=True)),
     }
 
 

misc/codegen/test/test_render.py

@@ -2,10 +2,12 @@ import sys
 
 import pytest
 
-from swift.codegen.test.utils import *
+from misc.codegen.test.utils import *
 
 import hashlib
 
+generator = "foo"
+
 
 @pytest.fixture
 def pystache_renderer_cls():
@@ -22,7 +24,7 @@ def pystache_renderer(pystache_renderer_cls):
 
 @pytest.fixture
 def sut(pystache_renderer):
-    return render.Renderer(paths.swift_dir)
+    return render.Renderer(generator, paths.root_dir)
 
 
 def assert_file(file, text):
@@ -48,12 +50,12 @@ def test_render(pystache_renderer, sut):
     data = mock.Mock(spec=("template",))
     text = "some text"
     pystache_renderer.render_name.side_effect = (text,)
-    output = paths.swift_dir / "some/output.txt"
+    output = paths.root_dir / "some/output.txt"
     sut.render(data, output)
 
     assert_file(output, text)
     assert pystache_renderer.mock_calls == [
-        mock.call.render_name(data.template, data, generator=paths.exe_file.relative_to(paths.swift_dir)),
+        mock.call.render_name(data.template, data, generator=generator),
     ]
 
 
@@ -61,8 +63,8 @@ def test_managed_render(pystache_renderer, sut):
     data = mock.Mock(spec=("template",))
     text = "some text"
     pystache_renderer.render_name.side_effect = (text,)
-    output = paths.swift_dir / "some/output.txt"
-    registry = paths.swift_dir / "a/registry.list"
+    output = paths.root_dir / "some/output.txt"
+    registry = paths.root_dir / "a/registry.list"
     write(registry)
 
     with sut.manage(generated=(), stubs=(), registry=registry) as renderer:
@@ -72,7 +74,7 @@ def test_managed_render(pystache_renderer, sut):
 
     assert_file(registry, f"some/output.txt {hash(text)} {hash(text)}\n")
     assert pystache_renderer.mock_calls == [
-        mock.call.render_name(data.template, data, generator=paths.exe_file.relative_to(paths.swift_dir)),
+        mock.call.render_name(data.template, data, generator=generator),
     ]
 
 
@@ -80,8 +82,8 @@ def test_managed_render_with_no_registry(pystache_renderer, sut):
     data = mock.Mock(spec=("template",))
     text = "some text"
     pystache_renderer.render_name.side_effect = (text,)
-    output = paths.swift_dir / "some/output.txt"
-    registry = paths.swift_dir / "a/registry.list"
+    output = paths.root_dir / "some/output.txt"
+    registry = paths.root_dir / "a/registry.list"
 
     with sut.manage(generated=(), stubs=(), registry=registry) as renderer:
         renderer.render(data, output)
@@ -90,7 +92,7 @@ def test_managed_render_with_no_registry(pystache_renderer, sut):
 
     assert_file(registry, f"some/output.txt {hash(text)} {hash(text)}\n")
     assert pystache_renderer.mock_calls == [
-        mock.call.render_name(data.template, data, generator=paths.exe_file.relative_to(paths.swift_dir)),
+        mock.call.render_name(data.template, data, generator=generator),
     ]
 
 
@@ -99,8 +101,8 @@ def test_managed_render_with_post_processing(pystache_renderer, sut):
     text = "some text"
     postprocessed_text = "some other text"
     pystache_renderer.render_name.side_effect = (text,)
-    output = paths.swift_dir / "some/output.txt"
-    registry = paths.swift_dir / "a/registry.list"
+    output = paths.root_dir / "some/output.txt"
+    registry = paths.root_dir / "a/registry.list"
     write(registry)
 
     with sut.manage(generated=(), stubs=(), registry=registry) as renderer:
@@ -111,14 +113,14 @@ def test_managed_render_with_post_processing(pystache_renderer, sut):
 
     assert_file(registry, f"some/output.txt {hash(text)} {hash(postprocessed_text)}\n")
     assert pystache_renderer.mock_calls == [
-        mock.call.render_name(data.template, data, generator=paths.exe_file.relative_to(paths.swift_dir)),
+        mock.call.render_name(data.template, data, generator=generator),
     ]
 
 
 def test_managed_render_with_erasing(pystache_renderer, sut):
-    output = paths.swift_dir / "some/output.txt"
-    stub = paths.swift_dir / "some/stub.txt"
-    registry = paths.swift_dir / "a/registry.list"
+    output = paths.root_dir / "some/output.txt"
+    stub = paths.root_dir / "some/stub.txt"
+    registry = paths.root_dir / "a/registry.list"
     write(output)
     write(stub, "// generated bla bla")
     write(registry)
@@ -134,9 +136,9 @@ def test_managed_render_with_erasing(pystache_renderer, sut):
 
 def test_managed_render_with_skipping_of_generated_file(pystache_renderer, sut):
     data = mock.Mock(spec=("template",))
-    output = paths.swift_dir / "some/output.txt"
+    output = paths.root_dir / "some/output.txt"
     some_output = "some output"
-    registry = paths.swift_dir / "a/registry.list"
+    registry = paths.root_dir / "a/registry.list"
     write(output, some_output)
     write(registry, f"some/output.txt {hash(some_output)} {hash(some_output)}\n")
 
@@ -149,16 +151,16 @@ def test_managed_render_with_skipping_of_generated_file(pystache_renderer, sut):
 
     assert_file(registry, f"some/output.txt {hash(some_output)} {hash(some_output)}\n")
     assert pystache_renderer.mock_calls == [
-        mock.call.render_name(data.template, data, generator=paths.exe_file.relative_to(paths.swift_dir)),
+        mock.call.render_name(data.template, data, generator=generator),
     ]
 
 
 def test_managed_render_with_skipping_of_stub_file(pystache_renderer, sut):
     data = mock.Mock(spec=("template",))
-    stub = paths.swift_dir / "some/stub.txt"
+    stub = paths.root_dir / "some/stub.txt"
     some_output = "// generated some output"
     some_processed_output = "// generated some processed output"
-    registry = paths.swift_dir / "a/registry.list"
+    registry = paths.root_dir / "a/registry.list"
     write(stub, some_processed_output)
     write(registry, f"some/stub.txt {hash(some_output)} {hash(some_processed_output)}\n")
 
@@ -171,14 +173,14 @@ def test_managed_render_with_skipping_of_stub_file(pystache_renderer, sut):
 
     assert_file(registry, f"some/stub.txt {hash(some_output)} {hash(some_processed_output)}\n")
     assert pystache_renderer.mock_calls == [
-        mock.call.render_name(data.template, data, generator=paths.exe_file.relative_to(paths.swift_dir)),
+        mock.call.render_name(data.template, data, generator=generator),
     ]
 
 
 def test_managed_render_with_modified_generated_file(pystache_renderer, sut):
-    output = paths.swift_dir / "some/output.txt"
+    output = paths.root_dir / "some/output.txt"
     some_processed_output = "// some processed output"
-    registry = paths.swift_dir / "a/registry.list"
+    registry = paths.root_dir / "a/registry.list"
     write(output, "// something else")
     write(registry, f"some/output.txt whatever {hash(some_processed_output)}\n")
 
@@ -187,9 +189,9 @@ def test_managed_render_with_modified_generated_file(pystache_renderer, sut):
 
 
 def test_managed_render_with_modified_stub_file_still_marked_as_generated(pystache_renderer, sut):
-    stub = paths.swift_dir / "some/stub.txt"
+    stub = paths.root_dir / "some/stub.txt"
     some_processed_output = "// generated some processed output"
-    registry = paths.swift_dir / "a/registry.list"
+    registry = paths.root_dir / "a/registry.list"
     write(stub, "// generated something else")
     write(registry, f"some/stub.txt whatever {hash(some_processed_output)}\n")
 
@@ -198,9 +200,9 @@ def test_managed_render_with_modified_stub_file_still_marked_as_generated(pystac
 
 
 def test_managed_render_with_modified_stub_file_not_marked_as_generated(pystache_renderer, sut):
-    stub = paths.swift_dir / "some/stub.txt"
+    stub = paths.root_dir / "some/stub.txt"
     some_processed_output = "// generated some processed output"
-    registry = paths.swift_dir / "a/registry.list"
+    registry = paths.root_dir / "a/registry.list"
     write(stub, "// no more generated")
     write(registry, f"some/stub.txt whatever {hash(some_processed_output)}\n")
 
@@ -218,11 +220,11 @@ def test_managed_render_exception_drops_written_and_inexsistent_from_registry(py
     data = mock.Mock(spec=("template",))
     text = "some text"
     pystache_renderer.render_name.side_effect = (text,)
-    output = paths.swift_dir / "some/output.txt"
-    registry = paths.swift_dir / "x/registry.list"
+    output = paths.root_dir / "some/output.txt"
+    registry = paths.root_dir / "x/registry.list"
     write(output, text)
-    write(paths.swift_dir / "a")
-    write(paths.swift_dir / "c")
+    write(paths.root_dir / "a")
+    write(paths.root_dir / "c")
     write(registry, "a a a\n"
                     f"some/output.txt whatever {hash(text)}\n"
                     "b b b\n"
@@ -237,9 +239,9 @@ def test_managed_render_exception_drops_written_and_inexsistent_from_registry(py
 
 
 def test_managed_render_drops_inexsistent_from_registry(pystache_renderer, sut):
-    registry = paths.swift_dir / "x/registry.list"
-    write(paths.swift_dir / "a")
-    write(paths.swift_dir / "c")
+    registry = paths.root_dir / "x/registry.list"
+    write(paths.root_dir / "a")
+    write(paths.root_dir / "c")
     write(registry, f"a {hash('')} {hash('')}\n"
                     "b b b\n"
                     f"c {hash('')} {hash('')}")
@@ -251,9 +253,9 @@ def test_managed_render_drops_inexsistent_from_registry(pystache_renderer, sut):
 
 
 def test_managed_render_exception_does_not_erase(pystache_renderer, sut):
-    output = paths.swift_dir / "some/output.txt"
-    stub = paths.swift_dir / "some/stub.txt"
-    registry = paths.swift_dir / "a/registry.list"
+    output = paths.root_dir / "some/output.txt"
+    stub = paths.root_dir / "some/stub.txt"
+    registry = paths.root_dir / "a/registry.list"
     write(output)
     write(stub, "// generated bla bla")
     write(registry)
@@ -277,7 +279,7 @@ def test_render_with_extensions(pystache_renderer, sut):
     sut.render(data, output)
     expected_templates = ["test_template_foo", "test_template_bar", "test_template_baz"]
     assert pystache_renderer.mock_calls == [
-        mock.call.render_name(t, data, generator=paths.exe_file.relative_to(paths.swift_dir))
+        mock.call.render_name(t, data, generator=generator)
         for t in expected_templates
     ]
     for expected_output, expected_contents in zip(expected_outputs, rendered):
@@ -286,9 +288,9 @@ def test_render_with_extensions(pystache_renderer, sut):
 
 def test_managed_render_with_force_not_skipping_generated_file(pystache_renderer, sut):
     data = mock.Mock(spec=("template",))
-    output = paths.swift_dir / "some/output.txt"
+    output = paths.root_dir / "some/output.txt"
     some_output = "some output"
-    registry = paths.swift_dir / "a/registry.list"
+    registry = paths.root_dir / "a/registry.list"
     write(output, some_output)
     write(registry, f"some/output.txt {hash(some_output)} {hash(some_output)}\n")
 
@@ -301,16 +303,16 @@ def test_managed_render_with_force_not_skipping_generated_file(pystache_renderer
 
     assert_file(registry, f"some/output.txt {hash(some_output)} {hash(some_output)}\n")
     assert pystache_renderer.mock_calls == [
-        mock.call.render_name(data.template, data, generator=paths.exe_file.relative_to(paths.swift_dir)),
+        mock.call.render_name(data.template, data, generator=generator),
     ]
 
 
 def test_managed_render_with_force_not_skipping_stub_file(pystache_renderer, sut):
     data = mock.Mock(spec=("template",))
-    stub = paths.swift_dir / "some/stub.txt"
+    stub = paths.root_dir / "some/stub.txt"
     some_output = "// generated some output"
     some_processed_output = "// generated some processed output"
-    registry = paths.swift_dir / "a/registry.list"
+    registry = paths.root_dir / "a/registry.list"
     write(stub, some_processed_output)
     write(registry, f"some/stub.txt {hash(some_output)} {hash(some_processed_output)}\n")
 
@@ -323,14 +325,14 @@ def test_managed_render_with_force_not_skipping_stub_file(pystache_renderer, sut
 
     assert_file(registry, f"some/stub.txt {hash(some_output)} {hash(some_output)}\n")
     assert pystache_renderer.mock_calls == [
-        mock.call.render_name(data.template, data, generator=paths.exe_file.relative_to(paths.swift_dir)),
+        mock.call.render_name(data.template, data, generator=generator),
     ]
 
 
 def test_managed_render_with_force_ignores_modified_generated_file(sut):
-    output = paths.swift_dir / "some/output.txt"
+    output = paths.root_dir / "some/output.txt"
     some_processed_output = "// some processed output"
-    registry = paths.swift_dir / "a/registry.list"
+    registry = paths.root_dir / "a/registry.list"
     write(output, "// something else")
     write(registry, f"some/output.txt whatever {hash(some_processed_output)}\n")
 
@@ -339,9 +341,9 @@ def test_managed_render_with_force_ignores_modified_generated_file(sut):
 
 
 def test_managed_render_with_force_ignores_modified_stub_file_still_marked_as_generated(sut):
-    stub = paths.swift_dir / "some/stub.txt"
+    stub = paths.root_dir / "some/stub.txt"
     some_processed_output = "// generated some processed output"
-    registry = paths.swift_dir / "a/registry.list"
+    registry = paths.root_dir / "a/registry.list"
     write(stub, "// generated something else")
     write(registry, f"some/stub.txt whatever {hash(some_processed_output)}\n")
 

misc/codegen/test/test_schemaloader.py

@@ -2,9 +2,9 @@ import sys
 
 import pytest
 
-from swift.codegen.test.utils import *
-from swift.codegen.lib import schemadefs as defs
-from swift.codegen.loaders.schemaloader import load
+from misc.codegen.test.utils import *
+from misc.codegen.lib import schemadefs as defs
+from misc.codegen.loaders.schemaloader import load
 
 
 def test_empty_schema():

misc/codegen/test/test_trapgen.py

@@ -1,8 +1,8 @@
 import sys
 
-from swift.codegen.generators import trapgen
-from swift.codegen.lib import cpp, dbscheme
-from swift.codegen.test.utils import *
+from misc.codegen.generators import trapgen
+from misc.codegen.lib import cpp, dbscheme
+from misc.codegen.test.utils import *
 
 output_dir = pathlib.Path("path", "to", "output")
 

misc/codegen/test/utils.py

@@ -3,7 +3,7 @@ from unittest import mock
 
 import pytest
 
-from swift.codegen.lib import render, schema, paths
+from misc.codegen.lib import render, schema, paths
 
 schema_dir = pathlib.Path("a", "dir")
 schema_file = schema_dir / "schema.py"
@@ -33,21 +33,21 @@ def render_manager(renderer):
 @pytest.fixture
 def opts():
     ret = mock.MagicMock()
-    ret.swift_dir = paths.swift_dir
+    ret.root_dir = paths.root_dir
     return ret
 
 
 @pytest.fixture(autouse=True)
 def override_paths(tmp_path):
-    with mock.patch("swift.codegen.lib.paths.swift_dir", tmp_path), \
-            mock.patch("swift.codegen.lib.paths.exe_file", tmp_path / "exe"):
+    with mock.patch("misc.codegen.lib.paths.root_dir", tmp_path), \
+            mock.patch("misc.codegen.lib.paths.exe_file", tmp_path / "exe"):
         yield
 
 
 @pytest.fixture
 def input(opts, tmp_path):
     opts.schema = tmp_path / schema_file
-    with mock.patch("swift.codegen.loaders.schemaloader.load_file") as load_mock:
+    with mock.patch("misc.codegen.loaders.schemaloader.load_file") as load_mock:
         load_mock.return_value = schema.Schema([])
         yield load_mock.return_value
     assert load_mock.mock_calls == [
@@ -58,7 +58,7 @@ def input(opts, tmp_path):
 @pytest.fixture
 def dbscheme_input(opts, tmp_path):
     opts.dbscheme = tmp_path / dbscheme_file
-    with mock.patch("swift.codegen.loaders.dbschemeloader.iterload") as load_mock:
+    with mock.patch("misc.codegen.loaders.dbschemeloader.iterload") as load_mock:
         load_mock.entities = []
         load_mock.side_effect = lambda _: load_mock.entities
         yield load_mock

swift/BUILD.bazel

@@ -15,6 +15,12 @@ filegroup(
     visibility = ["//swift:__subpackages__"],
 )
 
+filegroup(
+    name = "codegen_conf",
+    srcs = ["codegen.conf"],
+    visibility = ["//swift:__subpackages__"],
+)
+
 pkg_files(
     name = "dbscheme_files",
     srcs = [

swift/README.md

@@ -39,6 +39,8 @@ bazel run //swift/codegen
 to update generated files. This can be shortened to
 `bazel run codegen` if you are in the `swift` directory.
 
+You can also run `../misc/codegen/codegen.py`, as long as you are beneath the `swift` directory.
+
 ## IDE setup
 
 ### CLion and the native bazel plugin

swift/actions/build-and-test/action.yml

@@ -62,7 +62,7 @@ runs:
       if : ${{ github.event_name == 'pull_request' }}
       shell: bash
       run: |
-        bazel test //swift/codegen/test
+        bazel test //misc/codegen/test
     - name: Run qltest tests
       if : ${{ github.event_name == 'pull_request' }}
       shell: bash

swift/codegen.conf

@@ -0,0 +1,9 @@
+# configuration file for Swift code generation default options
+--generate=dbscheme,ql
+--dbscheme=ql/lib/swift.dbscheme
+--ql-output=ql/lib/codeql/swift/generated
+--ql-stub-output=ql/lib/codeql/swift/elements
+--ql-test-output=ql/test/extractor-tests/generated
+--generated-registry=ql/.generated.list
+--script-name=codegen/codegen.py
+--trap-library=swift/extractor/trap

swift/codegen/BUILD.bazel

@@ -1,16 +1,15 @@
-load("@swift_codegen_deps//:requirements.bzl", "requirement")
+load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
 
-py_binary(
+native_binary(
     name = "codegen",
-    srcs = ["codegen.py"],
+    out = "codegen",
+    src = "//misc/codegen",
     data = [
         "//swift:schema",
-        "//swift:schema_includes",
-        "//swift/codegen/templates:cpp",
-        "//swift/codegen/templates:trap",
+        "//swift:codegen_conf",
+    ],
+    args = [
+        "--configuration-file=$(location //swift:codegen_conf)",
     ],
     visibility = ["//swift:__subpackages__"],
-    deps = [
-        "//swift/codegen/generators",
-    ],
 )

swift/codegen/README.md

@@ -1,44 +1,10 @@
-# Code generation suite
+This package aliases [`misc/codegen`](../misc/codegen) providing the Swift-specific options
+in [`swift/codegen.conf`](../codegen.conf).
 
-This directory contains the code generation suite used by the Swift extractor and the QL library. This suite will use
-the abstract class specification of [`schema.yml`](schema.yml) to generate:
-
-* [the `dbscheme` file](../ql/lib/swift.dbscheme) (see [`dbschemegen.py`](generators/dbschemegen.py))
-* [the QL generated code](../ql/lib/codeql/swift/generated) and when
-  appropriate [the corresponding stubs](../ql/lib/codeql/swift/elements) (see [`qlgen.py`](generators/qlgen.py))
-* C++ tags and trap entries (see [`trapgen.py`](generators/trapgen.py))
-* C++ structured classes (see [`cppgen.py`](generators/cppgen.py))
-
-## Usage
-
-By default `bazel run //swift/codegen` will update all checked-in generated files (`dbscheme` and QL sources). You can
-append `--` followed by other options to tweak the behaviour, which is mainly intended for debugging.
-See `bazel run //swift/codegen -- --help` for a list of all options. In particular `--generate` can be used with a comma
-separated list to select what to generate (choosing among `dbscheme`, `ql`, `trap` and `cpp`).
+Running `bazel run //swift/codegen` will generate all checked in
+files ([dbscheme](../ql/lib/swift.dbscheme), [QL generated code](../ql/lib/codeql/swift/generated),
+[generated QL stubs](../ql/lib/codeql/swift/elements), [generated QL tests](../ql/test/extractor-tests/generated)).
 
 C++ code is generated during build (see [`swift/extractor/trap/BUILD.bazel`](../extractor/trap/BUILD.bazel)). After a
-build you can browse the generated code in `bazel-bin/swift/extractor/trap/generated`.
-
-For debugging you can also run `./codegen.py` directly. You must then ensure dependencies are installed, which you can
-with the command
-
-```bash
-pip3 install -r ./requirements.txt
-```
-
-## Implementation notes
-
-The suite uses [mustache templating](https://mustache.github.io/) for generation. Templates are
-in [the `templates` directory](templates), prefixed with the generation target they are used for.
-
-Rather than passing dictionaries to the templating engine, python dataclasses are used as defined
-in [the `lib` directory](lib). For each of the four generation targets the entry point for the implementation is
-specified as the `generate` function in the modules within [the `generators` directory](generators).
-
-Finally, [`codegen.py`](codegen.py) is the driver script gluing everything together and specifying the command line
-options.
-
-Unit tests are in [the `test` directory](test) and can be run via `bazel test //swift/codegen/test`.
-
-For more details about each specific generation target, please refer to the module docstrings
-in [the `generators` directory](generators).
+build you can browse the generated code in `bazel-bin/swift/extractor/trap/generated` from the root of the `codeql`
+repository.

swift/codegen/codegen.py

@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-""" Driver script to run all code generation """
-
-import argparse
-import logging
-import os
-import sys
-import pathlib
-import typing
-
-if 'BUILD_WORKSPACE_DIRECTORY' not in os.environ:
-    # we are not running with `bazel run`, set up module search path
-    _repo_root = pathlib.Path(__file__).resolve().parents[2]
-    sys.path.append(str(_repo_root))
-
-from swift.codegen.lib import render, paths
-from swift.codegen.generators import generate
-
-
-def _parse_args() -> argparse.Namespace:
-    p = argparse.ArgumentParser(description="Code generation suite")
-    p.add_argument("--generate", type=lambda x: x.split(","), default=["dbscheme", "ql"],
-                   help="specify what targets to generate as a comma separated list, choosing among dbscheme, ql, trap "
-                        "and cpp")
-    p.add_argument("--verbose", "-v", action="store_true", help="print more information")
-    p.add_argument("--quiet", "-q", action="store_true", help="only print errors")
-    p.add_argument("--swift-dir", type=_abspath, default=paths.swift_dir,
-                   help="the directory that should be regarded as the root of the swift codebase. Used to compute QL "
-                        "imports and in some comments (default %(default)s)")
-    p.add_argument("--schema", type=_abspath, default=paths.swift_dir / "schema.py",
-                   help="input schema file (default %(default)s)")
-    p.add_argument("--dbscheme", type=_abspath, default=paths.swift_dir / "ql/lib/swift.dbscheme",
-                   help="output file for dbscheme generation, input file for trap generation (default %(default)s)")
-    p.add_argument("--ql-output", type=_abspath, default=paths.swift_dir / "ql/lib/codeql/swift/generated",
-                   help="output directory for generated QL files (default %(default)s)")
-    p.add_argument("--ql-stub-output", type=_abspath, default=paths.swift_dir / "ql/lib/codeql/swift/elements",
-                   help="output directory for QL stub/customization files (default %(default)s). Defines also the "
-                        "generated qll file importing every class file")
-    p.add_argument("--ql-test-output", type=_abspath, default=paths.swift_dir / "ql/test/extractor-tests/generated",
-                   help="output directory for QL generated extractor test files (default %(default)s)")
-    p.add_argument("--ql-format", action="store_true", default=True,
-                   help="use codeql to autoformat QL files (which is the default)")
-    p.add_argument("--no-ql-format", action="store_false", dest="ql_format", help="do not format QL files")
-    p.add_argument("--codeql-binary", default="codeql", help="command to use for QL formatting (default %(default)s)")
-    p.add_argument("--cpp-output", type=_abspath,
-                   help="output directory for generated C++ files, required if trap or cpp is provided to --generate")
-    p.add_argument("--generated-registry", type=_abspath, default=paths.swift_dir / "ql/.generated.list",
-                   help="registry file containing information about checked-in generated code")
-    p.add_argument("--force", "-f", action="store_true",
-                   help="generate all files without skipping unchanged files and overwriting modified ones")
-    return p.parse_args()
-
-
-def _abspath(x: str) -> typing.Optional[pathlib.Path]:
-    return pathlib.Path(x).resolve() if x else None
-
-
-def run():
-    opts = _parse_args()
-    if opts.verbose:
-        log_level = logging.DEBUG
-    elif opts.quiet:
-        log_level = logging.ERROR
-    else:
-        log_level = logging.INFO
-    logging.basicConfig(format="{levelname} {message}", style='{', level=log_level)
-    for target in opts.generate:
-        generate(target, opts, render.Renderer(opts.swift_dir))
-
-
-if __name__ == "__main__":
-    run()

swift/codegen/generators/BUILD.bazel

@@ -1,11 +0,0 @@
-load("@swift_codegen_deps//:requirements.bzl", "requirement")
-
-py_library(
-    name = "generators",
-    srcs = glob(["*.py"]),
-    visibility = ["//swift/codegen:__subpackages__"],
-    deps = [
-        "//swift/codegen/lib",
-        "//swift/codegen/loaders",
-    ],
-)

swift/codegen/templates/ql_test_missing.mustache

@@ -1,4 +0,0 @@
-// generated by {{generator}}
-
-After a swift source file is added in this directory and {{generator}} is run again, test queries
-will appear and this file will be deleted

swift/extractor/trap/BUILD.bazel

@@ -14,12 +14,16 @@ genrule(
         for ext in ("h", "cpp")
     ],
     cmd = " ".join([
-        "$(location //swift/codegen)",
+        "$(location //misc/codegen)",
         "--generate=dbscheme,trap,cpp",
-        "--dbscheme $(RULEDIR)/generated/swift.dbscheme",
-        "--cpp-output $(RULEDIR)/generated",
+        "--dbscheme=$(RULEDIR)/generated/swift.dbscheme",
+        "--cpp-output=$(RULEDIR)/generated",
+        "--trap-library=swift/extractor/trap",
+        "--use-current-dir",
+        "--schema=$(location //swift:schema)",
+        "--script-name=codegen/codegen.py",
     ]),
-    exec_tools = ["//swift/codegen"],
+    exec_tools = ["//misc/codegen", "//swift:schema"],
 )
 
 filegroup(

swift/ql/.generated.list

@@ -660,11 +660,11 @@ ql/lib/codeql/swift/generated/type/VariadicSequenceType.qll 796537097d8e32eda38b
 ql/lib/codeql/swift/generated/type/WeakStorageType.qll dda4397a49f537ec44117a86dc09705a07d281e31bf4643738b15219053ed380 dda4397a49f537ec44117a86dc09705a07d281e31bf4643738b15219053ed380
 ql/test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.ql 6e06e222636d5e3451afdce4d5e1b801206a0abf060cc5714350d25e784f8eda 3274ca1b3d85142037d0f12ecf9e15f77c3eeb285621adc9312a6691806d08c8
 ql/test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo_getSpec.ql 44ccccad28d8648aa3349d9290bd1478bb021797c26bc2f8c1e3de14a42be3bd aefab61b6fa1c06c5c79d337cffb61335dca74ef9906deba12f7eaea42f9ac14
-ql/test/extractor-tests/generated/Comment/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/Comment/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/Diagnostics/Diagnostics.ql 6a4a9480cc929381e0337b181e5ac519a7abc6d597ebe24fb6701acf79ced86f 199c5bf8bd38e161d989e0e4db1ea1d3ddcb4d7cf571afd9112ce3ed8d9b8d2a
 ql/test/extractor-tests/generated/File/File.ql ab0968ae31b749da2b66462bd04e4dfb30604dba405a84594b575abfc4fa4c35 bcc0ff648b28c5ecd567e196e700272883756bbcc65296bbb880a979e3162628
-ql/test/extractor-tests/generated/OtherAvailabilitySpec/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/PlatformVersionAvailabilitySpec/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/OtherAvailabilitySpec/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/PlatformVersionAvailabilitySpec/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl.ql 5c017af7e6b16ee68990eec12affe81eb114338bac4d445f4b231fe0f110eccc db86c828a892b0acd150a780914e7e48c280cad473d3680a453bdee03aee1e9d
 ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl_getBody.ql 1d42eb1a5b832cfaf1949b61a01a6a11448a6d4369a44f2511bb31d1d7fc10a8 b326a6743121353f8a66410d3d9151ca969939abcbbe5c411872ca290da45123
 ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl_getCapture.ql 17f9903978c9a8fc607d970532270090cea030ff57c2f6699c37672707ce5c70 cdd7ce47691a84aa5402a8946d4027f7b9dbce930057dfd62c14b470a5710cb0
@@ -700,19 +700,19 @@ ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getProper
 ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getPropertyWrapperBackingVarBinding.ql addbf4e32d383fc35b7505a33c5a675feeedd708c4b94ce8fc89c5bc88c36f1f 549c8ec9cf2c1dc6881e848af8be9900d54604a747ded1f04bd5cadf93e5ede3
 ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getPropertyWrapperProjectionVar.ql 502a76b34c78d3cf8f38969671840dc9e28d478ba7afe671963145ba4dc9460d 6125a91820b6b8d139392c32478383e52e40e572e0f92a32f0e513409d2c4e11
 ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getPropertyWrapperProjectionVarBinding.ql 40274aac8b67cb6a285bf91ccdc725ae1556b13ebcc6854a43e759b029733687 44e569aac32148bcce4cd5e8ebb33d7418580b7f5f03dfbd18635db9965b28d9
-ql/test/extractor-tests/generated/decl/ConstructorDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/decl/DestructorDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/decl/EnumCaseDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/decl/ConstructorDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/DestructorDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/EnumCaseDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl.ql e1906b751a4b72081a61b175e016f5182fdd0e27518f16017d17e14c65dd4268 8a1dd50e951ed2c25f18823ff8b9ab36dc2dc49703801dd48da443bc384bd9b4
 ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl_getBaseType.ql 4ace6176a57dd4c759356ddbefc28b25481c80bdeddfeb396d91b07db55af22a d0d1337ccbba45a648fe68fefc51006e14506d4fb7211fb2bde45f7761c4dbf1
 ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl_getGenericTypeParam.ql 3a0927f87a21d69bfc309f5f7faedb3d0cc2956c071b16c38b2b4acd36f24ea9 aafed56a1744579f05b3817adef6a5fd011d1b5cb7da2db230a43b6f55a04649
 ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl_getMember.ql 621870b7dbeaeefa93cbbfc102e97810b15d39b49db685019c9e3cbf2423ffef e110630f0ba8f588e7f8ebc56a1a31c2ca2f22f2cc763baa76854beb3b3a4ece
-ql/test/extractor-tests/generated/decl/EnumElementDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/decl/EnumElementDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.ql 71523b034d2abc6225f433f140841a35a466e82c04cbf07bdb3a9e384024fedb 919c66eeff004324b48249fd746c38891f6f8723f1281ad60126cf4b3c1febe0
 ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl_getGenericTypeParam.ql e8c9815756cd3d82abfb421b1e38d6381e48938a21f798fd9abd93686acc070b 2574ead6e511f41ba416e831e176ecdaac27dde410157a4ee472a680f922dd20
 ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl_getMember.ql 8d1c6a2b7cb381a81d11775f0d1cfb13ee04dd27dc742e00a72d676f21481dde 430e5b9ed7eccd90383e362ffa5e512704883304c711b13c9110a57ae282bb40
 ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl_getProtocol.ql 11fc53f70f6e7f29546337a9f06157baaecd9c7d1d392910e94d18b71a0a9ae2 3591d4ff4108bd3399cecdf444161d770c01af20c14f23afac167beead564998
-ql/test/extractor-tests/generated/decl/GenericTypeParamDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/decl/GenericTypeParamDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl.ql 5322f06ce9efe44baa798f31039c2955b31a8c1272580a0db7182ff1a3082509 3b6f34bc90b337b08eb159142bd5c8cbededd5e97d160e1f7342a7eb6e72e0a1
 ql/test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl_getActiveElement.ql 914165306a2eb5c8039750e1e03bda156a684946abc8709d786b4144d9c9eb3b 5e87dfd99858ae257506415369bff937a731b6309dac2242b03ea79ead045fc1
 ql/test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl_getMember.ql 2a2f4e89cb045c0f67c18d6c25e7f8cdcee5ce416304783c25ba2efb2afb45d4 4930c38baf0295399478733e24102a99307fe398986060d29e437bd65720f62d
@@ -720,7 +720,7 @@ ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.ql 65c03a28d5f5638b
 ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getDeclaration.ql a76c6360ed7b423229ec64dc4d03f586204fbf5107408b7d07c06ef43b30526e bc8569ecf097f0e6176da4f42379158137f70dcfb9b6d60f4c16f643b68f9d91
 ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getImportedModule.ql 0339867ca4f414cceba85df20d12eca64a3eea9847bb02829dc28fa95701e987 8c292768f56cecbdfeb92985212e6b39ecada819891921c3ba1532d88d84c43e
 ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getMember.ql 6d48d3a93bc96dba3bda71ec9d9d6282615c2228a58da6167c169fafaedb3e17 8560b23d0f52b845c81727ce09c0b2f9647965c83d7de165e8cd3d91be5bdd42
-ql/test/extractor-tests/generated/decl/InfixOperatorDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/decl/InfixOperatorDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql f9216e83077ebc0cb5a5bf2d7368af86167a1bfd378f9cd5592fd484a1bbc5dd 1c2de61cb064474340db10de4399c49f15eb0a5669e6dc9587d8b4f656b0134f
 ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getBaseType.ql 54a4bd2cfa666271ae9092285bb7217b082c88483d614066cfb599fc8ab84305 8b24ab8e93efe3922cb192eb5de5f517763058782e83e8732153421adddd68e1
 ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getExportedModule.ql cfca012f0951c86560d892ea5eae182d5eda661c9484a0df71ef9c905123e8f6 dfebda4fcad0e2f2a2c944782a7355b3caeac569e5a45621c582bc1bb243b2cc
@@ -743,152 +743,152 @@ ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl_getPropertyWrapperLoc
 ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl_getPropertyWrapperLocalWrappedVarBinding.ql 14f50b706a2dba7123888868d93fa72a4871e6e04949cc87a7df52e27b7197d1 680242c73f78a64a1687cf59b0a80f715c98b994b32ec90044bcedd2c258f786
 ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl_getPropertyWrapperProjectionVar.ql 406436f415d5a6895be712471e7ab2d8b945539ac01b845ce191c4186e1cd275 4fdd0bc67207fd5cbe30743df46fdc61eeb5e58d877ef4aef5c7d7f0f684ef05
 ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl_getPropertyWrapperProjectionVarBinding.ql c79a13e49d3375edac8e51b27a58318afee959a8df639f7b0d7d77de1e2d60bc 8c3b9dae1079e674854d15f4bd43f1f507b7fac6900f0831d92f2140aae268b4
-ql/test/extractor-tests/generated/decl/PatternBindingDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/decl/PostfixOperatorDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/decl/PatternBindingDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/PostfixOperatorDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.ql 17ac00f962db0e003c5845660b0dbad4ba59ce6e1def6384084ec937158544a5 df27465bc073fc4c031f75fa6b53263df2b902a8168f5d5c08851cc24bf0a647
 ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl_getMember.ql d670ff4ea33ea15aa5f0299fd5bb6cc637e8a16faebe19433d250627732f4903 9a2482a469797248aaeed33caa226c92c97392cad3aa9608554d8ad16cc5cb38
-ql/test/extractor-tests/generated/decl/PrecedenceGroupDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/decl/PrefixOperatorDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/decl/ProtocolDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/decl/StructDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/decl/SubscriptDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/decl/TopLevelCodeDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/decl/TypeAliasDecl/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/decl/PrecedenceGroupDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/PrefixOperatorDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/ProtocolDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/StructDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/SubscriptDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/TopLevelCodeDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/TypeAliasDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/AppliedPropertyWrapperExpr.ql 88d7539565c64d29ffd99e8201a0b47954d13c6ca7df6141fab6311fc37588f0 2ebaaaa97b492762273516355004a6cbc88d75250d856ed5e21660294e150ca0
 ql/test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/AppliedPropertyWrapperExpr_getType.ql 1caa0b9c70afc6f63fb1cb05b30499a615a997849d5128006f9c7147b7f1d4a4 64474604bf6d9028bdcbbb8dd2a607c65cb74038e2d6e88e86908f82590ba7a7
-ql/test/extractor-tests/generated/expr/Argument/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/ArrayExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/AssignExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/AutoClosureExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/BinaryExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/BindOptionalExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/BooleanLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/CallExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/CaptureListExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/ClosureExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/CoerceExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/ConditionalCheckedCastExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/expr/Argument/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/ArrayExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/AssignExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/AutoClosureExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/BinaryExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/BindOptionalExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/BooleanLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/CallExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/CaptureListExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/ClosureExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/CoerceExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/ConditionalCheckedCastExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/ConstructorRefCallExpr/ConstructorRefCallExpr.ql 0214077b52ed4c152c70bbd0347c7340d42e584954fba5242f1380e357ec79a0 f8ce48428247f8616c15d39198bf8b3857f1acca12a800bcc912c34720f5f039
 ql/test/extractor-tests/generated/expr/ConstructorRefCallExpr/ConstructorRefCallExpr_getArgument.ql a3a01f99aa8df3aafed50cc7828829e567e01fed7874854e7a620904f1641fc9 962669b36b9adbc3d75bae79a9a754692c20d6e14ee2b47aca8f3f93b27895da
 ql/test/extractor-tests/generated/expr/ConstructorRefCallExpr/ConstructorRefCallExpr_getType.ql c3504dda8c41ebc386a9011deb06b0f5312538306b5ca10f7c4ff2e0f2c277dd aa6785ac86fe4954ef679fdfa6cd91f964d9281ab0162240b6e4b9eb67b0eda3
-ql/test/extractor-tests/generated/expr/DeclRefExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/DefaultArgumentExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/DictionaryExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/DiscardAssignmentExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/DotSyntaxBaseIgnoredExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/expr/DeclRefExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/DefaultArgumentExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/DictionaryExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/DiscardAssignmentExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/DotSyntaxBaseIgnoredExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/DotSyntaxCallExpr/DotSyntaxCallExpr.ql b161e81b9eee4c3ab66776542559457c02f30da68e59efb98d6388425e66d2e3 d7571dbca05dd36185c0eb2ad4ad9e821433362c10045875fb433fae5264346a
 ql/test/extractor-tests/generated/expr/DotSyntaxCallExpr/DotSyntaxCallExpr_getArgument.ql ab0023396a31a9fad384ac6ab2819fa3b45726d651fee6ee5d84ea4fbdb55992 410afe1ae14ca17bc245c9fa88f84ba1d02e20a7803910746316ddcacc062ace
 ql/test/extractor-tests/generated/expr/DotSyntaxCallExpr/DotSyntaxCallExpr_getType.ql ea3d25737d4c02d6ecd405d23471a587945362dee1160f6346484fffa166835d 3edcaae4cd47839dc716640ac9c098a9c65f365a69fb5442d15eb1955c06dcaa
 ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.ql 3c08d6e00606b76499ba1a04547cba9918f3be5b3baa4b3fc287bd288c467c8d 6685c8133d7c34346a85653589b3ae9cf2dbedaaff5e87f4dd9e94719a31b715
 ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getMember.ql ab1669430da9e60e3b5187bd4f45e7a9b501348cd0c66e4d8570c6facc3a82a3 a2e5e9781c9af9c52fe9d5735f146dc4a2e077096f2baee8db75f2a2f82b0037
 ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getType.ql 216b9caa3388b85959b19db012c6a7af40981ef92e4749b9cc644caee830041c 32691b624baed5c89fbef438214ecb893f9c1d1a575194133b56d79877e3feec
-ql/test/extractor-tests/generated/expr/DynamicTypeExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/expr/DynamicTypeExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.ql 9a4505f330e014769509be594299bcaa046d0a2c9a8ce4ac3a1d6d6b050af317 92c8392ded3fb26af7434b8aae34b1649b4c808acafc3adbd8ecb60ada5f6e72
 ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr_getType.ql edc2e175c971465f5667c4586bc4c77e5c245d267f80009a049b8f657238a5f4 5df26b5bdf975ba910a7c3446705c3ac82a67d05565d860fe58464ee82bafdde
-ql/test/extractor-tests/generated/expr/FloatLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/ForceTryExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/ForceValueExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/ForcedCheckedCastExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/expr/FloatLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/ForceTryExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/ForceValueExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/ForcedCheckedCastExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.ql f87db45ad56628ce62200e1034d1cfd2ff1c799be5a24681fe939bf80108937a e8484eaab79f3be6b53ecb258eb9a3cd8cdcba8534c0ee7d275b8b67b3d2f538
 ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr_getType.ql 7a8520abbf50642f886a3cdea37530b0577d509f31d76224467ad5d435bb0e39 a6fd63a7964cf778cc4b23ce5112138d7d5a5db96956e9514741ef9789bd1f19
-ql/test/extractor-tests/generated/expr/IfExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/expr/IfExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.ql 7ffb80368c4d80adccaa0267cc76b42b76304d5d485286f82e22ae51776812f3 51b38032cb3d392be56fa8bdf53379a174cf3de39d4bf6b730c611ae3ab7cec8
 ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr_getType.ql 184ff1dec5d65024c8a0c2b316706ac58c68c62c715c266211e947168750c89a 486fc8d65c0db86bdada2d540f665278caab43454a69ccc8c2e702729397fef0
-ql/test/extractor-tests/generated/expr/InOutExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/IntegerLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/InterpolatedStringLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/IsExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/KeyPathApplicationExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/KeyPathDotExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/KeyPathExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/LazyInitializerExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/MagicIdentifierLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/MakeTemporarilyEscapableExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/MemberRefExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/expr/InOutExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/IntegerLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/InterpolatedStringLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/IsExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/KeyPathApplicationExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/KeyPathDotExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/KeyPathExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/LazyInitializerExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/MagicIdentifierLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/MakeTemporarilyEscapableExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/MemberRefExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.ql c0c60154b070a8a7ad333544a30f216adf063ae26cac466d60d46b26154eccde 360c9a3ddd9d02a82d0c9de81b8742137d76dba74942f09c9172459565cae19d
 ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr_getMember.ql 859ce0b1f54980e6383ff87d7970eb8a7886d9e1fbe12a8a0a35d216850c6775 24faafdb4a88b0019073c06a1cda8e037154b232a364aa47ae151e95df8a868a
 ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr_getType.ql 3e749535dbf7ae2cd671b3e35b43ca4f6a5bc68c92f89a09a0a9193cd3200b9a 176102d8d9d5a7bf14ac654d98556048996f2311be0bfe67d16229fd22362ba7
-ql/test/extractor-tests/generated/expr/NilLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/expr/NilLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.ql 6c6b146537773b4b4bdb0e530bd581f4d9ffee93e784a8fdfcabe35309bdd09e 47b2a275af169a031faee39e73c67a70ec47969b731f1cc80a8f76e68d934402
 ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr_getArgument.ql ab308c1fa027136070a6ee9ebe5149c69b34bb9ae910f201f37cecd8b6341ff8 deef69f4a1a94386a32ec964e696972a2c6a91c34d7e99c7e4a3811980f5ecc4
 ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr_getType.ql 07d59d9962f3705f8f32302c0d730c179ca980172dd000b724a72e768fbf39db cd146e19249590316bb83efec19dd41234723513025cf9df45313f78f2b364dd
-ql/test/extractor-tests/generated/expr/OneWayExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/OpaqueValueExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/OpenExistentialExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/OptionalEvaluationExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/OptionalTryExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/OtherConstructorDeclRefExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/expr/OneWayExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/OpaqueValueExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/OpenExistentialExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/OptionalEvaluationExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/OptionalTryExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/OtherConstructorDeclRefExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.ql 7687a79d05efbbae7ce68780cb946cb500ed79c5e03aa0f3c132d0b98b6efe80 f23082710afb2bc247acab84b669540664461f0ec04a946125f17586640dfba8
 ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr_getArgument.ql 3b0e6f81599e5565bb78aff753932776c933fefdc8dc49e57db9f5b4164017f6 43031a3d0baa58f69b89a8a5d69f1a40ffeeaddc8a630d241e107de63ea54532
 ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr_getType.ql fa909883140fe89084c289c18ebc681402c38d0f37159d01f043f62de80521fc 4cd748e201e9374e589eaa0e3cc10310a1378bba15272a327d5cf54dbd526e8f
-ql/test/extractor-tests/generated/expr/PrefixUnaryExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/expr/PrefixUnaryExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.ql 9ac73f157d11e4ee1c47dceaadd2f686893da6557e4e600c62edad90db2eb92d bf353009ee1b6127350d976f2e869b615d54b998e59664bdb25ea8d6ab5b132d
 ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr_getType.ql 0972415a8ac29f460d480990f85c3976ad947e26510da447bbf74ee61d9b3f4e 463b8ce871911b99c495ea84669b4e6f8eafc645df483f6a99413e930bc0275e
 ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr_getWrappedValue.ql 208153f062b04bec13a860b64ea51c1d531597140d81a6d4598294dc9f8649a2 dfaea19e1075c02dfc0366fac8fd2edfae8dde06308730eb462c54be5b571129
-ql/test/extractor-tests/generated/expr/RebindSelfInConstructorExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/RegexLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/StringLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/SubscriptExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/SuperRefExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/TapExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/TryExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/TupleElementExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/TupleExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/TypeExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/expr/VarargExpansionExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/AnyPattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/BindingPattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/BoolPattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/EnumElementPattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/ExprPattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/IsPattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/NamedPattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/OptionalSomePattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/ParenPattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/TuplePattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/pattern/TypedPattern/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/BraceStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/BreakStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/CaseLabelItem/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/CaseStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/ConditionElement/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/ContinueStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/DeferStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/DoCatchStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/DoStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/expr/RebindSelfInConstructorExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/RegexLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/StringLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/SubscriptExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/SuperRefExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/TapExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/TryExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/TupleElementExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/TupleExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/TypeExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/VarargExpansionExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/AnyPattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/BindingPattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/BoolPattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/EnumElementPattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/ExprPattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/IsPattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/NamedPattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/OptionalSomePattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/ParenPattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/TuplePattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/pattern/TypedPattern/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/BraceStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/BreakStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/CaseLabelItem/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/CaseStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/ConditionElement/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/ContinueStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/DeferStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/DoCatchStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/DoStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/stmt/FailStmt/FailStmt.ql 75bf8a697d3a610caf25cb0d25748f2d1620c20fdd84c278c3e2f2502bc3f418 6e2377b8d2a63deaadbf8661dc7da70e8523637020e7d5fd601ca6893f10a573
-ql/test/extractor-tests/generated/stmt/FallthroughStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/ForEachStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/GuardStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/IfStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/stmt/FallthroughStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/ForEachStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/GuardStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/IfStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/stmt/PoundAssertStmt/PoundAssertStmt.ql dc72e3a7ff4c5dc39530322c343931cdfe63565eb76b29deef64bb311bfe302a 18eb3dab5ae8cfada5d42f1e70be9cb464a61ab5ce91897ce5a44a34387915e7
-ql/test/extractor-tests/generated/stmt/RepeatWhileStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/ReturnStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/StmtCondition/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/SwitchStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/ThrowStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/WhileStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/stmt/YieldStmt/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/ArraySliceType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/BoundGenericClassType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/BoundGenericEnumType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/BoundGenericStructType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/stmt/RepeatWhileStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/ReturnStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/StmtCondition/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/SwitchStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/ThrowStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/WhileStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/stmt/YieldStmt/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/ArraySliceType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/BoundGenericClassType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/BoundGenericEnumType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/BoundGenericStructType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.ql f85efff665246a0fb345def44cb60ae2415f82c6ef82b9689a61e08e7f1754ae 4c1c50193bfad688a708b4bc0dd08979e561ff764e0786ec37fbb6a654a404d6
 ql/test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType_getWidth.ql 61e99a3987c5a4b10d5d105184c60dacc1c08d8106cf41b81d491a7f0ac36ef2 b02395a219768e0f41cbf77e4111da3a271e777bfe448eea1ea5d6f0910ff1e8
 ql/test/extractor-tests/generated/type/BuiltinType/BuiltinType.ql 48f3b997bdb2c37dc22fd3dc2d18bc853888503d0d8d8cb075c6cd18657553e2 278d18e1fae3d8693a4d363b67c6ff111c111464f104d72ccad37793bc425200
-ql/test/extractor-tests/generated/type/ClassType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/DependentMemberType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/DictionaryType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/type/ClassType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/DependentMemberType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/DictionaryType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/type/DynamicSelfType/DynamicSelfType.ql d2c942b55f3a9f5af2cde39999b736ce2d50ae4514f36cc1e3f750905b03c49b b7ccdcf083da1598eaf4b5ad22e393253b8d58577580048290651a20f6e6df2f
-ql/test/extractor-tests/generated/type/EnumType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/ExistentialMetatypeType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/type/EnumType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/ExistentialMetatypeType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/type/ExistentialType/ExistentialType.ql f7894f01a440b5db281dfaa9c083be0898d15b67e1b0047be3f9c959b97bdeb0 725a54f6ed26d53603a3e25cbf78c90b1f16837c1c0c39b56e7d3bdd51a78265
-ql/test/extractor-tests/generated/type/FunctionType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/GenericFunctionType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/GenericTypeParamType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/type/FunctionType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/GenericFunctionType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/GenericTypeParamType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/type/InOutType/InOutType.ql 35b7c048fbd053f6821ab1d996fabf55dada014873f25c5ed7141b59eb5e0fb6 06ca9b5be9a999cbd7e1ab2f26918a5923d7d351dd9ec74137550f1947013b7d
-ql/test/extractor-tests/generated/type/LValueType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/MetatypeType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/type/LValueType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/MetatypeType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/type/ModuleType/ModuleType.ql 8f798fea381d1b502f262b5ee790758b38008cadcdee848d0ddba1bd9f8ff4f9 4c3d623607be1a5f6503500f3331ee3b3e5200e9e78cca8a4ef3d24c83d0e7ba
 ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.ql e34e98f70a987fe9a5017c897a507f9de4fffff837e3e2cf6c13287bb6165381 e60a5754173210f3af543bea15eadb2a3349e2f71653249cc421b33266adf344
 ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType_getProtocol.ql fb9baf55660e0eedf1a387267d170ae066a8d1531156eab5447feca92f05b751 139529998fc2060a46a70cb645a9aa36240ab225bd9fbdb3decc3eaec3aa2261
@@ -896,23 +896,23 @@ ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchety
 ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql d902b873db34a3b7f0bc4da82ecf59b01d283d4ca61be3b090cb47358c8dd6c2 656a938735cfa5bf5ca65a7c0e347fca993e966d568404ac204f60de18faa03f
 ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType_getProtocol.ql c208618d6bd7d4759581f06fad2b452077a0d865b4fb4288eff591fc7b16cd67 3bd6b8e1d1bc14bd27144a8356e07520d36ea21b6ea4adb61e84a2013e8701fc
 ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType_getSuperclass.ql bb7fc71b2d84e8c5492bb4c61492dabbce898bfb680979aadd88c4de44ea5af7 acae343087222e8eb7e4dfa0e256097d9592a9668afcb5706bcba5548afc0770
-ql/test/extractor-tests/generated/type/OptionalType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/type/OptionalType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.ql dad743465b62dca457d64ff04bde24027050edb6d80054738f59e6026fbb00d7 119d085d65930b0b286ccdb8dc3aecb7eb46133e9f4ea18a6733751713b8ae5c
 ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType_getArg.ql 8d10c3c858dedba47f227ebc92745916a248cd040ad944b80bf0d7a19af229d3 a29e2e0df269034c4f1fbd8f6de6d5898e895ad8b90628d5c869a45b596b53fc
-ql/test/extractor-tests/generated/type/ParenType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/type/ParenType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.ql 1d733e0447587d52a3b84ca19480e410c487c02541cd070ac80fcd2dbef5b57d 6ffd1e7ce8ec9b9fea0680805700262e472711b4d9a2b4336e57445e8f1a6d48
 ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType_getProtocol.ql 8af9b686cb9c3d988aea21cdaca42a0b625985111caa71d3eebaba4aea883e9c beecb31ab8fccb05c853926bccec33e298bed519385a25d6158646c94a019af9
 ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType_getSuperclass.ql 3b752a38eac8204ae6d902d03da8caeaad4072f30206420c97056e4bf3639eb4 fc5959969d5b229fa5d90dde7d997aa0d1b91bdb9d77cc6811377044eed4a6cb
 ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.ql 007c64d8ea8f69addc61e8759ce9cf2e32f5e8f73de6e35541a16ea19d4695ab 156ef6560aa5d866e6ed70237cf0335b2df0c75f87d23cc4d1024ee80fe0a543
 ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType_getMember.ql 8c1e8e5932cd775f0d0812a64954be5fd5b3eedd8a26eedb0bd6009cbc156e24 5c43ef8000bb67ed0e070bbd9d5fc167dcb7b6334ae34747d27eb8060af1a7e5
-ql/test/extractor-tests/generated/type/ProtocolType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/StructType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/type/ProtocolType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/StructType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/type/TupleType/TupleType.ql 3ef454f940299726c035f0472ae4362d4b34fbe18a9af2a7d3581b1c734fad66 b5756e68f4eef3a02e7f1d2a7e16e41dc90d53fc631e0bd0c91ad015d63b77ca
 ql/test/extractor-tests/generated/type/TupleType/TupleType_getName.ql ab5c578f6e257960aa43b84dd5d4a66e17f2312b5f9955af0953aaecbe9e093a 1ff62da991b35e946446ecee706ac0e07a80059f35654c022ffe06bf7ae32cfe
 ql/test/extractor-tests/generated/type/TupleType/TupleType_getType.ql 3f861729c996b37e170adab56200e0671415663ff319bbf87c7c46ec8532d575 96a9735d69f250f3d67716d6a1552909d2aaa9b7758275b1b9002dca19000d22
-ql/test/extractor-tests/generated/type/TypeAliasType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/TypeRepr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
-ql/test/extractor-tests/generated/type/UnboundGenericType/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
+ql/test/extractor-tests/generated/type/TypeAliasType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/TypeRepr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/type/UnboundGenericType/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/type/UnmanagedStorageType/UnmanagedStorageType.ql 3047ed64cbdb03d719d096fd3b2c4c54c92a2b65e46943424e84eeca705ab2d3 a8ee8ca4bf257c7472fa8cd7e661d352e8856b9e5855ebb3681f4d313209141c
 ql/test/extractor-tests/generated/type/UnownedStorageType/UnownedStorageType.ql 11e205283b368b9c9dbc79636c6007df501c952e6f715a9f07e65ec452192b38 ceb1e9c1279df07c77f9b23356b71c3e7672ec4cd5253898e09b27b2b24e4b00
 ql/test/extractor-tests/generated/type/VariadicSequenceType/VariadicSequenceType.ql 8c44ebc1fd1fa0b5caad5eb5b280f227f002dcfaddba45131b2959dad0b458f6 5f497990e2bd57a3ea8e2eb7da598af0c4ba7c7b4cc89b549e45de0ae3712e60

swift/ql/test/extractor-tests/generated/Comment/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/OtherAvailabilitySpec/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/PlatformVersionAvailabilitySpec/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/ConstructorDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/DestructorDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/EnumCaseDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/EnumElementDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/GenericTypeParamDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/InfixOperatorDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/PatternBindingDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/PostfixOperatorDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/PrecedenceGroupDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/PrefixOperatorDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/ProtocolDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/StructDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/SubscriptDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/TopLevelCodeDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/decl/TypeAliasDecl/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/Argument/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/ArrayExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/AssignExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/AutoClosureExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/BinaryExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/BindOptionalExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/BooleanLiteralExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/CallExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/CaptureListExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/ClosureExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/CoerceExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/ConditionalCheckedCastExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/DeclRefExpr/MISSING_SOURCE.txt

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py
 
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
+After a source file is added in this directory and codegen/codegen.py is run again, test queries
 will appear and this file will be deleted