Merge pull request #93 from max-schaefer/autoformat

Autoformat QL and Go

Author: max-schaefer

ql/src/AlertSuppression.ql

@@ -12,7 +12,6 @@ import go
  */
 class SuppressionComment extends Locatable {
   string text;
-
   string annotation;
 
   SuppressionComment() {

ql/src/RedundantCode/DeadStoreOfField.ql

@@ -58,9 +58,9 @@ predicate escapes(DataFlow::Node nd) {
  * the embedded field has the pointer type `*T` or just type `T`.
  */
 Type getEmbeddedType(Type t, boolean isPtr) {
-  exists(Type embedded |
-    t.getUnderlyingType().(StructType).hasOwnField(_, _, embedded, true) |
-    if embedded instanceof PointerType then (
+  exists(Type embedded | t.getUnderlyingType().(StructType).hasOwnField(_, _, embedded, true) |
+    if embedded instanceof PointerType
+    then (
       result = embedded.(PointerType).getBaseType() and
       isPtr = true
     ) else (
@@ -71,9 +71,7 @@ Type getEmbeddedType(Type t, boolean isPtr) {
 }
 
 /** Gets an embedded type of `t`. */
-Type getEmbeddedType(Type t) {
-  result = getEmbeddedType(t, _)
-}
+Type getEmbeddedType(Type t) { result = getEmbeddedType(t, _) }
 
 /**
  * Gets a transitive embedded type of `t`, where at least one of the embeddings goes through a

ql/src/RedundantCode/ExprHasNoEffect.ql

@@ -26,9 +26,7 @@ predicate inVoidContext(Expr e) {
 /**
  * Holds if `ce` is a call to a stub function with an empty body.
  */
-predicate callToStubFunction(CallExpr ce) {
-  ce.getTarget().getBody().getNumStmt() = 0
-}
+predicate callToStubFunction(CallExpr ce) { ce.getTarget().getBody().getNumStmt() = 0 }
 
 from Expr e
 where

ql/src/Security/CWE-020/MissingRegexpAnchor.ql

@@ -38,7 +38,8 @@ predicate isInterestingSemiAnchoredRegexpString(string re, string msg) {
     ) and
     anchorPart = re.regexpCapture(regex, 1) and
     anchorPart.regexpMatch("(?i).*[a-z].*") and
-    msg = "Misleading operator precedence. The subexpression '" + anchorPart +
+    msg =
+      "Misleading operator precedence. The subexpression '" + anchorPart +
         "' is anchored, but the other parts of this regular expression are not."
   )
 }
@@ -53,7 +54,9 @@ predicate isInterestingUnanchoredRegexpString(string re, string msg) {
   re.regexpMatch("(?i)[():|?a-z0-9-\\\\./]+[.]" + commonTLD() + "([/#?():]\\S*)?") and
   // without any anchors
   re.regexpMatch("[^$^]+") and
-  msg = "When this is used as a regular expression on a URL, it may match anywhere, and arbitrary hosts may come before or after it."
+  msg =
+    "When this is used as a regular expression on a URL, it may match anywhere, and arbitrary " +
+      "hosts may come before or after it."
 }
 
 class Config extends DataFlow::Configuration {

ql/src/Security/CWE-190/AllocationSizeOverflow.ql

@@ -21,5 +21,5 @@ where
   cfg.hasFlowPath(source, sink) and
   cfg.isSink(sink.getNode(), allocsz)
 select sink, source, sink,
-  "This operation, which is used in an $@, involves a potentially large $@ " +
-    "and might overflow.", allocsz, "allocation", source, "value"
+  "This operation, which is used in an $@, involves a potentially large $@ " + "and might overflow.",
+  allocsz, "allocation", source, "value"

ql/src/semmle/go/Comments.qll

@@ -86,7 +86,8 @@ private predicate isInitialComment(Comment c, File f, int line, int col) {
 
 /** Gets the `i`th initial comment in `f` (0-based). */
 private Comment getInitialComment(File f, int i) {
-  result = rank[i + 1](Comment c, int line, int col |
+  result =
+    rank[i + 1](Comment c, int line, int col |
       isInitialComment(c, f, line, col)
     |
       c order by line, col

ql/src/semmle/go/Decls.qll

@@ -101,47 +101,38 @@ class FuncDef extends @funcdef, StmtParent, ExprParent {
 
   /** Gets the `i`th result variable of this function. */
   ResultVariable getResultVar(int i) {
-    result = rank[i + 1](ResultVariable res, int j, int k |
+    result =
+      rank[i + 1](ResultVariable res, int j, int k |
         res.getDeclaration() = getTypeExpr().getResultDecl(j).getNameExpr(k)
       |
         res order by j, k
       )
   }
 
   /** Gets a result variable of this function. */
-  ResultVariable getAResultVar() {
-    result.getFunction() = this
-  }
+  ResultVariable getAResultVar() { result.getFunction() = this }
 
   /**
    * Gets the `i`th parameter of this function.
    *
    * The receiver variable, if any, is considered to be the -1st parameter.
    */
-  Parameter getParameter(int i) {
-    result.isParameterOf(this, i)
-  }
+  Parameter getParameter(int i) { result.isParameterOf(this, i) }
 
   /**
    * Gets a parameter of this function.
    */
-  Parameter getAParameter() {
-    result.getFunction() = this
-  }
+  Parameter getAParameter() { result.getFunction() = this }
 
   /**
    * Gets the number of parameters of this function.
    */
-  int getNumParameter() {
-    result = count(getAParameter())
-  }
+  int getNumParameter() { result = count(getAParameter()) }
 
   /**
    * Gets a call to this function.
    */
-  DataFlow::CallNode getACall() {
-    result.getACallee() = this
-  }
+  DataFlow::CallNode getACall() { result.getACallee() = this }
 }
 
 /**
@@ -526,9 +517,7 @@ class ResultVariableDecl extends @field, Documentable, ExprParent {
   /**
    * Gets an expression representing the name of a result variable declared in this declaration.
    */
-  Expr getANameExpr() {
-    result = getNameExpr(_)
-  }
+  Expr getANameExpr() { result = getNameExpr(_) }
 
   /**
    * Gets the function type expression to which this result variable declaration belongs.
@@ -549,7 +538,6 @@ class ResultVariableDecl extends @field, Documentable, ExprParent {
  */
 class InterfaceMemberSpec extends @field, Documentable, ExprParent {
   InterfaceTypeExpr ite;
-
   int idx;
 
   InterfaceMemberSpec() { fields(this, ite, idx) }

ql/src/semmle/go/Scopes.qll

@@ -239,11 +239,12 @@ class Parameter extends DeclaredVariable {
     index = -1
     or
     exists(FuncTypeExpr tp | tp = f.getTypeExpr() |
-      this = rank[index + 1](DeclaredVariable parm, int j, int k |
-        parm.getDeclaration() = tp.getParameterDecl(j).getNameExpr(k)
-      |
-        parm order by j, k
-      )
+      this =
+        rank[index + 1](DeclaredVariable parm, int j, int k |
+          parm.getDeclaration() = tp.getParameterDecl(j).getNameExpr(k)
+        |
+          parm order by j, k
+        )
     )
   }
 
@@ -258,9 +259,7 @@ class Parameter extends DeclaredVariable {
   int getIndex() { result = index }
 
   /** Holds if this is the `i`th parameter of function `fd`. */
-  predicate isParameterOf(FuncDef fd, int i) {
-    fd = f and i = index
-  }
+  predicate isParameterOf(FuncDef fd, int i) { fd = f and i = index }
 }
 
 /** The receiver variable of a method. */
@@ -310,9 +309,7 @@ class Field extends Variable {
   StructType getDeclaringType() { result = declaringType }
 
   override Package getPackage() {
-    exists(Type tp | tp.getUnderlyingType() = declaringType |
-      result = tp.getPackage()
-    )
+    exists(Type tp | tp.getUnderlyingType() = declaringType | result = tp.getPackage())
   }
 
   /**

ql/src/semmle/go/Types.qll

@@ -430,7 +430,8 @@ class StructType extends @structtype, CompositeType {
 
   language[monotonicAggregates]
   override string pp() {
-    result = "struct { " +
+    result =
+      "struct { " +
         concat(int i, string name, Type tp |
           component_types(this, i, name, tp)
         |
@@ -488,7 +489,8 @@ class InterfaceType extends @interfacetype, CompositeType {
 
   language[monotonicAggregates]
   override string pp() {
-    result = "interface { " +
+    result =
+      "interface { " +
         concat(string name, Type tp |
           tp = getMethodType(name)
         |
@@ -506,8 +508,8 @@ class TupleType extends @tupletype, CompositeType {
 
   language[monotonicAggregates]
   override string pp() {
-    result = "(" + concat(int i, Type tp | tp = getComponentType(i) | tp.pp(), ", " order by i) +
-        ")"
+    result =
+      "(" + concat(int i, Type tp | tp = getComponentType(i) | tp.pp(), ", " order by i) + ")"
   }
 
   override string toString() { result = "tuple type" }
@@ -529,8 +531,9 @@ class SignatureType extends @signaturetype, CompositeType {
 
   language[monotonicAggregates]
   override string pp() {
-    result = "func(" + concat(int i, Type tp | tp = getParameterType(i) | tp.pp(), ", " order by i) +
-        ") " + concat(int i, Type tp | tp = getResultType(i) | tp.pp(), ", " order by i)
+    result =
+      "func(" + concat(int i, Type tp | tp = getParameterType(i) | tp.pp(), ", " order by i) + ") " +
+        concat(int i, Type tp | tp = getResultType(i) | tp.pp(), ", " order by i)
   }
 
   override string toString() { result = "signature type" }

ql/src/semmle/go/controlflow/BasicBlocks.qll

@@ -62,6 +62,7 @@ private module Internal {
     exists(BasicBlock predBB | succBB(predBB, bb) | reachableBB(predBB))
   }
 }
+
 private import Internal
 
 /** Holds if `dom` is an immediate dominator of `bb`. */