Auto-format generated qll files

Benjamin Muskalla · Benjamin Muskalla · commit b92758883b31 · 2021-11-10T16:30:25.000+01:00
diff --git a/java/ql/src/utils/model-generator/GenerateFlowModel.py b/java/ql/src/utils/model-generator/GenerateFlowModel.py
@@ -11,7 +11,7 @@
 
 def printHelp():
     print("""Usage:
-GenerateFlowModel.py <library-database> "simpleName" [--with-sinks] [--with-sources] [--with-summaries]
+GenerateFlowModel.py <library-database> <simpleName> [--with-sinks] [--with-sources] [--with-summaries]
 
 This generates summary, source and sink models for the code in the database.
 The files will be placed in `java/ql/lib/semmle/code/java/frameworks/generated/<simpleName>/`
@@ -159,5 +159,11 @@ def asCsvModel(superclass, kind, rows):
 with open(frameworkTarget, "w") as frameworkQll:
     frameworkQll.write(qllContents)
 
+cmd = ['codeql', 'query', 'format', '--in-place', frameworkTarget]
+ret = subprocess.call(cmd)
+if ret != 0:
+    print("Failed to format query. Failed command was: " + shlex.join(cmd))
+    sys.exit(1)
+
 print("")
 print("CSV model written to " + frameworkTarget)
