Swift: add --ql-format/--no-ql-format to codegen

Author: redsun82

swift/codegen/lib/options.py

@@ -15,6 +15,8 @@ def _init_options():
     Option("--dbscheme", tags=["dbscheme"], type=_abspath, default=paths.swift_dir / "ql/lib/swift.dbscheme")
     Option("--ql-output", tags=["ql"], type=_abspath, default=paths.swift_dir / "ql/lib/codeql/swift/generated")
     Option("--ql-stub-output", tags=["ql"], type=_abspath, default=paths.swift_dir / "ql/lib/codeql/swift/elements")
+    Option("--ql-format", tags=["ql"], action="store_true", default=True)
+    Option("--no-ql-format", tags=["ql"], action="store_false", dest="ql_format")
     Option("--codeql-binary", tags=["ql"], default="codeql")
     Option("--cpp-output", tags=["cpp"], type=_abspath, required=True)
     Option("--cpp-namespace", tags=["cpp"], default="codeql")

swift/codegen/qlgen.py

@@ -107,7 +107,8 @@ def generate(opts, renderer):
     renderer.render(all_imports, include_file)
 
     renderer.cleanup(existing)
-    format(opts.codeql_binary, renderer.written)
+    if opts.ql_format:
+        format(opts.codeql_binary, renderer.written)
 
 
 tags = ("schema", "ql")

swift/codegen/test/test_qlgen.py

@@ -23,6 +23,7 @@ def run_mock():
 def generate(opts, renderer, written=None):
     opts.ql_stub_output = stub_path()
     opts.ql_output = ql_output_path()
+    opts.ql_format = True
     renderer.written = written or []
     return run_generation(qlgen.generate, opts, renderer)