Merge pull request #11274 from github/redsun82/swift-remove-double-newlines-in-schema

Swift: remove double newlines in schema

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
     rev: v1.6.0
     hooks:
       - id: autopep8
-        files: ^swift/codegen/.*\.py
+        files: ^swift/.*\.py
 
   - repo: local
     hooks:
@@ -44,7 +44,7 @@ repos:
 
       - id: swift-codegen
         name: Run Swift checked in code generation
-        files: ^swift/(codegen/|.*/generated/|ql/lib/(swift\.dbscheme$|codeql/swift/elements))
+        files: ^swift/(schema.py$|codegen/|.*/generated/|ql/lib/(swift\.dbscheme$|codeql/swift/elements))
         language: system
         entry: bazel run //swift/codegen -- --quiet
         pass_filenames: false

swift/integration-tests/posix-only/cross-references/test.py

@@ -1,6 +1,6 @@
 from create_database_utils import *
 
 run_codeql_database_create([
- 'swift package clean',
- 'swift build'
+    'swift package clean',
+    'swift build'
 ], lang='swift')

swift/integration-tests/posix-only/frontend-invocations/test.py

@@ -1,5 +1,5 @@
 from create_database_utils import *
 
 run_codeql_database_create([
- 'make',
+    'make',
 ], lang='swift')

swift/integration-tests/posix-only/hello-world/test.py

@@ -1,6 +1,6 @@
 from create_database_utils import *
 
 run_codeql_database_create([
- 'swift package clean',
- 'swift build'
+    'swift package clean',
+    'swift build'
 ], lang='swift')

swift/integration-tests/posix-only/partial-modules/test.py

@@ -1,7 +1,7 @@
 from create_database_utils import *
 
 run_codeql_database_create([
- 'env',
- 'swift package clean',
- 'swift build'
+    'env',
+    'swift package clean',
+    'swift build'
 ], lang='swift', keep_trap=True)

swift/integration-tests/runner.py

@@ -21,7 +21,7 @@ this_dir = pathlib.Path(__file__).parent.resolve()
 def options():
     p = argparse.ArgumentParser()
     p.add_argument("--test-dir", "-d", type=pathlib.Path, action="append")
-    #FIXME: the following should be the default
+    # FIXME: the following should be the default
     p.add_argument("--check-databases", action="store_true")
     p.add_argument("--learn", action="store_true")
     p.add_argument("--threads", "-j", type=int, default=0)