Swift: fix formatting

d10c · d10c · commit 16fc42a53f67 · 2023-04-26T16:01:57.000+02:00
diff --git a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowElements.qll b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowElements.qll
@@ -69,9 +69,7 @@ private predicate isPropertySetterElement(Accessor accessor, AssignExpr assign)
   )
 }
 
-predicate isPropertySetterElement(
-  PropertySetterElement pse, Accessor accessor, AssignExpr assign
-) {
+predicate isPropertySetterElement(PropertySetterElement pse, Accessor accessor, AssignExpr assign) {
   pse = TPropertySetterElement(accessor, assign)
 }
 
diff --git a/swift/ql/lib/codeql/swift/dataflow/ExternalFlow.qll b/swift/ql/lib/codeql/swift/dataflow/ExternalFlow.qll
@@ -397,9 +397,7 @@ private string paramsStringPart(Function c, int i) {
  * Parameter types are represented by their type erasure.
  */
 cached
-string paramsString(Function c) {
-  result = concat(int i | | paramsStringPart(c, i) order by i)
-}
+string paramsString(Function c) { result = concat(int i | | paramsStringPart(c, i) order by i) }
 
 bindingset[func]
 predicate matchesSignature(Function func, string signature) {
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImplSpecific.qll b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImplSpecific.qll
@@ -58,9 +58,7 @@ DataFlowType getSyntheticGlobalType(SummaryComponent::SyntheticGlobal sg) { any(
  * Holds if an external flow summary exists for `c` with input specification
  * `input`, output specification `output`, kind `kind`, and provenance `provenance`.
  */
-predicate summaryElement(
-  Function c, string input, string output, string kind, string provenance
-) {
+predicate summaryElement(Function c, string input, string output, string kind, string provenance) {
   exists(
     string namespace, string type, boolean subtypes, string name, string signature, string ext
   |
diff --git a/swift/ql/lib/codeql/swift/security/UnsafeJsEvalExtensions.qll b/swift/ql/lib/codeql/swift/security/UnsafeJsEvalExtensions.qll
@@ -51,9 +51,7 @@ private class WKWebViewDefaultUnsafeJsEvalSink extends UnsafeJsEvalSink {
 private class WKUserContentControllerDefaultUnsafeJsEvalSink extends UnsafeJsEvalSink {
   WKUserContentControllerDefaultUnsafeJsEvalSink() {
     any(CallExpr ce |
-      ce.getStaticTarget()
-          .(Method)
-          .hasQualifiedName("WKUserContentController", "addUserScript(_:)")
+      ce.getStaticTarget().(Method).hasQualifiedName("WKUserContentController", "addUserScript(_:)")
     ).getArgument(0).getExpr() = this.asExpr()
   }
 }
@@ -89,9 +87,9 @@ private class JSContextDefaultUnsafeJsEvalSink extends UnsafeJsEvalSink {
  */
 private class JSEvaluateScriptDefaultUnsafeJsEvalSink extends UnsafeJsEvalSink {
   JSEvaluateScriptDefaultUnsafeJsEvalSink() {
-    any(CallExpr ce |
-      ce.getStaticTarget().(FreeFunction).hasName("JSEvaluateScript(_:_:_:_:_:_:)")
-    ).getArgument(1).getExpr() = this.asExpr()
+    any(CallExpr ce | ce.getStaticTarget().(FreeFunction).hasName("JSEvaluateScript(_:_:_:_:_:_:)"))
+        .getArgument(1)
+        .getExpr() = this.asExpr()
   }
 }
 
diff --git a/swift/ql/lib/codeql/swift/security/UnsafeWebViewFetchExtensions.qll b/swift/ql/lib/codeql/swift/security/UnsafeWebViewFetchExtensions.qll
@@ -38,9 +38,7 @@ private class UIKitWebKitWebViewFetchSink extends UnsafeWebViewFetchSink {
   Expr baseUrl;
 
   UIKitWebKitWebViewFetchSink() {
-    exists(
-      Method funcDecl, CallExpr call, string className, string funcName, int arg, int baseArg
-    |
+    exists(Method funcDecl, CallExpr call, string className, string funcName, int arg, int baseArg |
       // arguments to method calls...
       (
         // `loadHTMLString`
diff --git a/swift/ql/test/TestUtils.qll b/swift/ql/test/TestUtils.qll
@@ -1,6 +1,5 @@
 private import codeql.swift.elements
 private import codeql.swift.generated.ParentChild
-
 // Internal classes are not imported by the tests:
 import codeql.swift.elements.expr.InitializerRefCallExpr
 import codeql.swift.elements.expr.DotSyntaxCallExpr

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,7 @@ private predicate isPropertySetterElement(Accessor accessor, AssignExpr assign)`
`69`	`69`	`)`
`70`	`70`	`}`
`71`	`71`
`72`		`-predicate isPropertySetterElement(`
`73`		`- PropertySetterElement pse, Accessor accessor, AssignExpr assign`
`74`		`-) {`
	`72`	`+predicate isPropertySetterElement(PropertySetterElement pse, Accessor accessor, AssignExpr assign) {`
`75`	`73`	`pse = TPropertySetterElement(accessor, assign)`
`76`	`74`	`}`
`77`	`75`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,7 @@ private class WKWebViewDefaultUnsafeJsEvalSink extends UnsafeJsEvalSink {`
`51`	`51`	`private class WKUserContentControllerDefaultUnsafeJsEvalSink extends UnsafeJsEvalSink {`
`52`	`52`	`WKUserContentControllerDefaultUnsafeJsEvalSink() {`
`53`	`53`	`any(CallExpr ce \|`
`54`		`- ce.getStaticTarget()`
`55`		`- .(Method)`
`56`		`- .hasQualifiedName("WKUserContentController", "addUserScript(_:)")`
	`54`	`+ ce.getStaticTarget().(Method).hasQualifiedName("WKUserContentController", "addUserScript(_:)")`
`57`	`55`	`).getArgument(0).getExpr() = this.asExpr()`
`58`	`56`	`}`
`59`	`57`	`}`
`@@ -89,9 +87,9 @@ private class JSContextDefaultUnsafeJsEvalSink extends UnsafeJsEvalSink {`
`89`	`87`	`*/`
`90`	`88`	`private class JSEvaluateScriptDefaultUnsafeJsEvalSink extends UnsafeJsEvalSink {`
`91`	`89`	`JSEvaluateScriptDefaultUnsafeJsEvalSink() {`
`92`		`- any(CallExpr ce \|`
`93`		`- ce.getStaticTarget().(FreeFunction).hasName("JSEvaluateScript(_:_:_:_:_:_:)")`
`94`		`- ).getArgument(1).getExpr() = this.asExpr()`
	`90`	`+ any(CallExpr ce \| ce.getStaticTarget().(FreeFunction).hasName("JSEvaluateScript(_:_:_:_:_:_:)"))`
	`91`	`+ .getArgument(1)`
	`92`	`+ .getExpr() = this.asExpr()`
`95`	`93`	`}`
`96`	`94`	`}`
`97`	`95`