Javascript: Autoformat qlls

Author: aschackmull

javascript/ql/src/semmle/javascript/AST.qll

@@ -212,7 +212,9 @@ class JavaScriptURL extends @javascript_url, CodeInAttribute { }
 /**
  * A toplevel syntactic entity containing Closure-style externs definitions.
  */
-class Externs extends TopLevel { Externs() { isExterns() } }
+class Externs extends TopLevel {
+  Externs() { isExterns() }
+}
 
 /** A program element that is either an expression or a statement. */
 class ExprOrStmt extends @exprorstmt, ControlFlowNode, ASTNode { }

javascript/ql/src/semmle/javascript/BasicBlocks.qll

@@ -284,13 +284,17 @@ class BasicBlock extends @cfg_node, Locatable {
  * An unreachable basic block, that is, a basic block
  * whose first node is unreachable.
  */
-class UnreachableBlock extends BasicBlock { UnreachableBlock() { getFirstNode().isUnreachable() } }
+class UnreachableBlock extends BasicBlock {
+  UnreachableBlock() { getFirstNode().isUnreachable() }
+}
 
 /**
  * An entry basic block, that is, a basic block
  * whose first node is the entry node of a statement container.
  */
-class EntryBasicBlock extends BasicBlock { EntryBasicBlock() { entryBB(this) } }
+class EntryBasicBlock extends BasicBlock {
+  EntryBasicBlock() { entryBB(this) }
+}
 
 /**
  * A basic block that is reachable from an entry basic block.

javascript/ql/src/semmle/javascript/Classes.qll

@@ -227,9 +227,7 @@ class ClassExpr extends @classexpr, ClassDefinition, Expr {
           result = min(ClassInitializedMember m |
               m = getClassInitializedMember()
             |
-              m
-              order by
-                m.getIndex()
+              m order by m.getIndex()
             )
         else result = this
   }
@@ -287,7 +285,9 @@ class SuperPropAccess extends PropAccess {
  *
  * See also ECMAScript 2015 Language Specification, Chapter 12.3.8.
  */
-class NewTargetExpr extends @newtargetexpr, Expr { override predicate isImpure() { none() } }
+class NewTargetExpr extends @newtargetexpr, Expr {
+  override predicate isImpure() { none() }
+}
 
 /**
  * A scope induced by a named class expression or class expression with type parameters.
@@ -432,12 +432,16 @@ class MemberDeclaration extends @property, Documentable {
 /**
  * A concrete member of a class, that is, a non-abstract, non-ambient field or method with a body.
  */
-class MemberDefinition extends MemberDeclaration { MemberDefinition() { isConcrete() } }
+class MemberDefinition extends MemberDeclaration {
+  MemberDefinition() { isConcrete() }
+}
 
 /**
  * A member signature declared in a class or interface, that is, an abstract or ambient field or method without a function body.
  */
-class MemberSignature extends MemberDeclaration { MemberSignature() { isSignature() } }
+class MemberSignature extends MemberDeclaration {
+  MemberSignature() { isSignature() }
+}
 
 /**
  * A method declaration in a class or interface, either a concrete definition or a signature without a body.

javascript/ql/src/semmle/javascript/Closure.qll

@@ -38,7 +38,9 @@ module Closure {
     Expr getAnArgument() { result = getArgument(_) }
   }
 
-  abstract private class GoogNamespaceRef extends ExprOrStmt { abstract string getNamespaceId(); }
+  abstract private class GoogNamespaceRef extends ExprOrStmt {
+    abstract string getNamespaceId();
+  }
 
   /**
    * A call to `goog.provide`.

javascript/ql/src/semmle/javascript/Constants.qll

@@ -123,4 +123,6 @@ module SyntacticConstants {
 /**
  * An expression that evaluates to a constant string.
  */
-class ConstantString extends ConstantExpr { ConstantString() { exists(getStringValue()) } }
+class ConstantString extends ConstantExpr {
+  ConstantString() { exists(getStringValue()) }
+}

javascript/ql/src/semmle/javascript/DefUse.qll

@@ -193,19 +193,15 @@ class VarDef extends ControlFlowNode {
    * such as `for-in` loops, parameters or destructuring assignments.
    */
   AST::ValueNode getSource() {
-    exists(Expr target |
-      not target instanceof DestructuringPattern and defn(this, target, result)
-    )
+    exists(Expr target | not target instanceof DestructuringPattern and defn(this, target, result))
   }
 
   /**
    * Gets the source that this definition destructs, that is, the
    * right hand side of a destructuring assignment.
    */
   AST::ValueNode getDestructuringSource() {
-    exists(Expr target |
-      target instanceof DestructuringPattern and defn(this, target, result)
-    )
+    exists(Expr target | target instanceof DestructuringPattern and defn(this, target, result))
   }
 
   /**

javascript/ql/src/semmle/javascript/DefensiveProgramming.qll

@@ -199,8 +199,7 @@ module Internal {
     Expr target;
 
     UndefinedNullCrashUse() {
-      exists (Expr thrower |
-        stripNotsAndParens(this, _) = thrower |
+      exists(Expr thrower | stripNotsAndParens(this, _) = thrower |
         thrower.(InvokeExpr).getCallee().getUnderlyingValue() = target
         or
         thrower.(PropAccess).getBase().getUnderlyingValue() = target
@@ -224,7 +223,8 @@ module Internal {
     Expr target;
 
     NonFunctionCallCrashUse() {
-      stripNotsAndParens(this, _).(InvokeExpr).getCallee().getUnderlyingValue() = target }
+      stripNotsAndParens(this, _).(InvokeExpr).getCallee().getUnderlyingValue() = target
+    }
 
     /**
      * Gets the subexpression that will cause an exception to be thrown if it is not a `function`.
@@ -276,9 +276,7 @@ module Internal {
         guardVar = stripNotsAndParens(this.asExpr(), polarity) and
         guardVar.getVariable() = useVar.getVariable()
       |
-        getAGuardedExpr(this.asExpr())
-            .(UndefinedNullCrashUse)
-            .getVulnerableSubexpression() = useVar and
+        getAGuardedExpr(this.asExpr()).(UndefinedNullCrashUse).getVulnerableSubexpression() = useVar and
         // exclude types whose truthiness depend on the value
         not isStringOrNumOrBool(guardVar.analyze().getAType())
       )
@@ -308,9 +306,7 @@ module Internal {
         test.getOperand() = guardVar and
         guardVar.getVariable() = useVar.getVariable()
       |
-        getAGuardedExpr(guard)
-            .(UndefinedNullCrashUse)
-            .getVulnerableSubexpression() = useVar
+        getAGuardedExpr(guard).(UndefinedNullCrashUse).getVulnerableSubexpression() = useVar
       )
     }
 
@@ -376,9 +372,7 @@ module Internal {
         test.getOperand() = guardVar and
         guardVar.getVariable() = useVar.getVariable()
       |
-        getAGuardedExpr(guard)
-            .(NonFunctionCallCrashUse)
-            .getVulnerableSubexpression() = useVar
+        getAGuardedExpr(guard).(NonFunctionCallCrashUse).getVulnerableSubexpression() = useVar
       ) and
       test.getTag() = "function"
     }

javascript/ql/src/semmle/javascript/ES2015Modules.qll

@@ -6,9 +6,7 @@ import javascript
  * An ECMAScript 2015 module.
  */
 class ES2015Module extends Module {
-  ES2015Module() {
-    isES2015Module(this)
-  }
+  ES2015Module() { isES2015Module(this) }
 
   override ModuleScope getScope() { result.getScopeElement() = this }
 

javascript/ql/src/semmle/javascript/Expr.qll

@@ -173,7 +173,9 @@ class Identifier extends @identifier, ExprOrType {
  * A statement or property label, that is, an identifier that
  * does not refer to a variable.
  */
-class Label extends @label, Identifier, Expr { override predicate isImpure() { none() } }
+class Label extends @label, Identifier, Expr {
+  override predicate isImpure() { none() }
+}
 
 /** A literal. */
 class Literal extends @literal, Expr {
@@ -445,7 +447,9 @@ class PropertySetter extends PropertyAccessor, @property_setter { }
  * `{ x: 42, ...others }`. The value of a spread property is always
  * a `SpreadElement`.
  */
-class SpreadProperty extends Property { SpreadProperty() { not exists(getNameExpr()) } }
+class SpreadProperty extends Property {
+  SpreadProperty() { not exists(getNameExpr()) }
+}
 
 /** A function expression. */
 class FunctionExpr extends @functionexpr, Expr, Function {
@@ -744,21 +748,29 @@ class NegExpr extends @negexpr, UnaryExpr {
 }
 
 /** A unary plus expression. */
-class PlusExpr extends @plusexpr, UnaryExpr { override string getOperator() { result = "+" } }
+class PlusExpr extends @plusexpr, UnaryExpr {
+  override string getOperator() { result = "+" }
+}
 
 /** A logical negation expression. */
-class LogNotExpr extends @lognotexpr, UnaryExpr { override string getOperator() { result = "!" } }
+class LogNotExpr extends @lognotexpr, UnaryExpr {
+  override string getOperator() { result = "!" }
+}
 
 /** A bitwise negation expression. */
-class BitNotExpr extends @bitnotexpr, UnaryExpr { override string getOperator() { result = "~" } }
+class BitNotExpr extends @bitnotexpr, UnaryExpr {
+  override string getOperator() { result = "~" }
+}
 
 /** A `typeof` expression. */
 class TypeofExpr extends @typeofexpr, UnaryExpr {
   override string getOperator() { result = "typeof" }
 }
 
 /** A `void` expression. */
-class VoidExpr extends @voidexpr, UnaryExpr { override string getOperator() { result = "void" } }
+class VoidExpr extends @voidexpr, UnaryExpr {
+  override string getOperator() { result = "void" }
+}
 
 /** A `delete` expression. */
 class DeleteExpr extends @deleteexpr, UnaryExpr {
@@ -839,10 +851,14 @@ class EqualityTest extends @equalitytest, Comparison {
 }
 
 /** An equality test using `==`. */
-class EqExpr extends @eqexpr, EqualityTest { override string getOperator() { result = "==" } }
+class EqExpr extends @eqexpr, EqualityTest {
+  override string getOperator() { result = "==" }
+}
 
 /** An inequality test using `!=`. */
-class NEqExpr extends @neqexpr, EqualityTest { override string getOperator() { result = "!=" } }
+class NEqExpr extends @neqexpr, EqualityTest {
+  override string getOperator() { result = "!=" }
+}
 
 /** A strict equality test using `===`. */
 class StrictEqExpr extends @eqqexpr, EqualityTest {
@@ -855,22 +871,34 @@ class StrictNEqExpr extends @neqqexpr, EqualityTest {
 }
 
 /** A less-than expression. */
-class LTExpr extends @ltexpr, Comparison { override string getOperator() { result = "<" } }
+class LTExpr extends @ltexpr, Comparison {
+  override string getOperator() { result = "<" }
+}
 
 /** A less-than-or-equal expression. */
-class LEExpr extends @leexpr, Comparison { override string getOperator() { result = "<=" } }
+class LEExpr extends @leexpr, Comparison {
+  override string getOperator() { result = "<=" }
+}
 
 /** A greater-than expression. */
-class GTExpr extends @gtexpr, Comparison { override string getOperator() { result = ">" } }
+class GTExpr extends @gtexpr, Comparison {
+  override string getOperator() { result = ">" }
+}
 
 /** A greater-than-or-equal expression. */
-class GEExpr extends @geexpr, Comparison { override string getOperator() { result = ">=" } }
+class GEExpr extends @geexpr, Comparison {
+  override string getOperator() { result = ">=" }
+}
 
 /** A left-shift expression using `<<`. */
-class LShiftExpr extends @lshiftexpr, BinaryExpr { override string getOperator() { result = "<<" } }
+class LShiftExpr extends @lshiftexpr, BinaryExpr {
+  override string getOperator() { result = "<<" }
+}
 
 /** A right-shift expression using `>>`. */
-class RShiftExpr extends @rshiftexpr, BinaryExpr { override string getOperator() { result = ">>" } }
+class RShiftExpr extends @rshiftexpr, BinaryExpr {
+  override string getOperator() { result = ">>" }
+}
 
 /** An unsigned right-shift expression using `>>>`. */
 class URShiftExpr extends @urshiftexpr, BinaryExpr {
@@ -887,31 +915,49 @@ class AddExpr extends @addexpr, BinaryExpr {
 }
 
 /** A subtraction expression. */
-class SubExpr extends @subexpr, BinaryExpr { override string getOperator() { result = "-" } }
+class SubExpr extends @subexpr, BinaryExpr {
+  override string getOperator() { result = "-" }
+}
 
 /** A multiplication expression. */
-class MulExpr extends @mulexpr, BinaryExpr { override string getOperator() { result = "*" } }
+class MulExpr extends @mulexpr, BinaryExpr {
+  override string getOperator() { result = "*" }
+}
 
 /** A division expression. */
-class DivExpr extends @divexpr, BinaryExpr { override string getOperator() { result = "/" } }
+class DivExpr extends @divexpr, BinaryExpr {
+  override string getOperator() { result = "/" }
+}
 
 /** A modulo expression. */
-class ModExpr extends @modexpr, BinaryExpr { override string getOperator() { result = "%" } }
+class ModExpr extends @modexpr, BinaryExpr {
+  override string getOperator() { result = "%" }
+}
 
 /** An exponentiation expression. */
-class ExpExpr extends @expexpr, BinaryExpr { override string getOperator() { result = "**" } }
+class ExpExpr extends @expexpr, BinaryExpr {
+  override string getOperator() { result = "**" }
+}
 
 /** A bitwise 'or' expression. */
-class BitOrExpr extends @bitorexpr, BinaryExpr { override string getOperator() { result = "|" } }
+class BitOrExpr extends @bitorexpr, BinaryExpr {
+  override string getOperator() { result = "|" }
+}
 
 /** An exclusive 'or' expression. */
-class XOrExpr extends @xorexpr, BinaryExpr { override string getOperator() { result = "^" } }
+class XOrExpr extends @xorexpr, BinaryExpr {
+  override string getOperator() { result = "^" }
+}
 
 /** A bitwise 'and' expression. */
-class BitAndExpr extends @bitandexpr, BinaryExpr { override string getOperator() { result = "&" } }
+class BitAndExpr extends @bitandexpr, BinaryExpr {
+  override string getOperator() { result = "&" }
+}
 
 /** An `in` expression. */
-class InExpr extends @inexpr, BinaryExpr { override string getOperator() { result = "in" } }
+class InExpr extends @inexpr, BinaryExpr {
+  override string getOperator() { result = "in" }
+}
 
 /** An `instanceof` expression. */
 class InstanceofExpr extends @instanceofexpr, BinaryExpr {
@@ -1359,7 +1405,9 @@ class AwaitExpr extends @awaitexpr, Expr {
  * to the generator by the `next` method that most recently resumed execution
  * of the generator.
  */
-class FunctionSentExpr extends @functionsentexpr, Expr { override predicate isImpure() { none() } }
+class FunctionSentExpr extends @functionsentexpr, Expr {
+  override predicate isImpure() { none() }
+}
 
 /**
  * A decorator applied to a class, property or member definition.
@@ -1468,7 +1516,9 @@ private class LiteralDynamicImportPath extends PathExprInModule, ConstantString
 /**
  * A call or member access that evaluates to `undefined` if its base operand evaluates to `undefined` or `null`.
  */
-class OptionalUse extends Expr, @optionalchainable { OptionalUse() { isOptionalChaining(this) } }
+class OptionalUse extends Expr, @optionalchainable {
+  OptionalUse() { isOptionalChaining(this) }
+}
 
 private class ChainElem extends Expr, @optionalchainable {
   /**