Merge pull request github#2956 from asger-semmle/js/autoformat-again

erik-krogh · web-flow · commit 46a645c47b2f · 2020-03-02T21:16:07.000+01:00
JS: Really autoformat everything
diff --git a/javascript/ql/examples/queries/dataflow/StoredXss/StoredXss.ql b/javascript/ql/examples/queries/dataflow/StoredXss/StoredXss.ql
@@ -22,7 +22,8 @@ import DataFlow::PathGraph
  */
 class MysqlSource extends StoredXss::Source {
   MysqlSource() {
-    this = moduleImport("mysql")
+    this =
+      moduleImport("mysql")
           .getAMemberCall("createConnection")
           .getAMethodCall("query")
           .getCallback(1)
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll b/javascript/ql/src/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
@@ -368,7 +368,7 @@ module TaintedPath {
    *   // pathname is safe
    * }
    * ```
-   * 
+   *
    * or
    * ```
    * var relative = path.resolve(pathname); // or path.normalize
@@ -402,9 +402,13 @@ module TaintedPath {
     }
 
     override predicate blocks(boolean outcome, Expr e) {
-      member = "relative" and e = pathCall.getArgument(1).asExpr() and outcome = startsWith.getPolarity().booleanNot()
+      member = "relative" and
+      e = pathCall.getArgument(1).asExpr() and
+      outcome = startsWith.getPolarity().booleanNot()
       or
-      not member = "relative" and e = pathCall.getArgument(0).asExpr() and outcome = startsWith.getPolarity()
+      not member = "relative" and
+      e = pathCall.getArgument(0).asExpr() and
+      outcome = startsWith.getPolarity()
     }
   }
 
diff --git a/javascript/ql/test/library-tests/CallGraphs/AnnotatedTest/Test.ql b/javascript/ql/test/library-tests/CallGraphs/AnnotatedTest/Test.ql
@@ -34,9 +34,7 @@ class AnnotatedCall extends InvokeExpr {
 
   AnnotatedFunction getAnExpectedCallee() { result.getCalleeName() = getCallTargetName() }
 
-  int getBoundArgs() {
-    result = getAnnotation(this, "boundArgs").toInt()
-  }
+  int getBoundArgs() { result = getAnnotation(this, "boundArgs").toInt() }
 
   int getBoundArgsOrMinusOne() {
     result = getBoundArgs()
diff --git a/javascript/ql/test/library-tests/Classes/tests.ql b/javascript/ql/test/library-tests/Classes/tests.ql
@@ -17,4 +17,4 @@ import ConstructorDefinitions
 import ClassNodeConstructor
 import ClassNodeInstanceMethod
 import PrivateField
-import ClassFlow
+import ClassFlow
diff --git a/javascript/ql/test/library-tests/CustomLoadStoreSteps/test.ql b/javascript/ql/test/library-tests/CustomLoadStoreSteps/test.ql
@@ -13,7 +13,7 @@ class Configuration extends TaintTracking::Configuration {
 
   // When the source code states that "foo" is being read, "bar" is additionally being read.
   override predicate isAdditionalLoadStep(DataFlow::Node pred, DataFlow::Node succ, string prop) {
-    exists(DataFlow::PropRead read | read = succ | 
+    exists(DataFlow::PropRead read | read = succ |
       read.getBase() = pred and
       read.getPropertyName() = "foo"
     ) and
diff --git a/javascript/ql/test/library-tests/DependencyModuleImports/Test.ql b/javascript/ql/test/library-tests/DependencyModuleImports/Test.ql
@@ -32,9 +32,8 @@ class SampleVersionSink extends DataFlow::Node {
       functionName = "m1" and
       argNumber = 0
     |
-      this = DataFlow::dependencyModuleImport(dep)
-            .getAMemberCall(functionName)
-            .getArgument(argNumber) and
+      this =
+        DataFlow::dependencyModuleImport(dep).getAMemberCall(functionName).getArgument(argNumber) and
       dep.info(dependencyName, vDep) and
       vDep.maybeBetween(vFrom, vTo)
     )
diff --git a/javascript/ql/test/library-tests/PartialInvokeNode/test.ql b/javascript/ql/test/library-tests/PartialInvokeNode/test.ql
@@ -1,21 +1,21 @@
 import javascript
 
-query
-DataFlow::Node getBoundFunction(DataFlow::PartialInvokeNode invoke, DataFlow::Node callback, int boundArgs) {
+query DataFlow::Node getBoundFunction(
+  DataFlow::PartialInvokeNode invoke, DataFlow::Node callback, int boundArgs
+) {
   result = invoke.getBoundFunction(callback, boundArgs)
 }
 
-query
-predicate isPartialArgument(DataFlow::PartialInvokeNode invoke, DataFlow::Node callback, DataFlow::Node argument, int index) {
+query predicate isPartialArgument(
+  DataFlow::PartialInvokeNode invoke, DataFlow::Node callback, DataFlow::Node argument, int index
+) {
   invoke.isPartialArgument(callback, argument, index)
 }
 
-query
-DataFlow::Node getBoundReceiver(DataFlow::PartialInvokeNode invoke) {
+query DataFlow::Node getBoundReceiver(DataFlow::PartialInvokeNode invoke) {
   result = invoke.getBoundReceiver()
 }
 
-query
-DataFlow::Node clickEvent() {
+query DataFlow::Node clickEvent() {
   result = DataFlow::globalVarRef("addEventListener").getACall().getABoundCallbackParameter(1, 0)
 }
diff --git a/javascript/ql/test/library-tests/Promises/tests.ql b/javascript/ql/test/library-tests/Promises/tests.ql
@@ -7,4 +7,4 @@ import PromiseDefinition_getAResolveHandler
 import PromiseDefinition_getRejectParameter
 import PromiseDefinition_getResolveParameter
 import PromiseDefinition_getACatchHandler
-import flow
+import flow
diff --git a/javascript/ql/test/library-tests/RangeAnalysis/DeadBranch.ql b/javascript/ql/test/library-tests/RangeAnalysis/DeadBranch.ql
@@ -22,8 +22,8 @@ class AssertionComment extends LineComment {
     isOK = true and
     exists(ConditionGuardNode guard | guard = getAGuardNode() |
       RangeAnalysis::isContradictoryGuardNode(guard) and
-      result = "Error: analysis claims " + getTestExpr() + " is always " +
-          guard.getOutcome().booleanNot()
+      result =
+        "Error: analysis claims " + getTestExpr() + " is always " + guard.getOutcome().booleanNot()
     )
     or
     isOK = false and
diff --git a/javascript/ql/test/library-tests/RegExp/EscapeInString/EscapeInString.ql b/javascript/ql/test/library-tests/RegExp/EscapeInString/EscapeInString.ql
@@ -1,6 +1,7 @@
 import javascript
 
 from StringLiteral literal, RegExpDot dot, int pos
-where dot.getParent*() = literal
-  and pos = dot.getLocation().getStartColumn() - literal.getLocation().getStartColumn()
+where
+  dot.getParent*() = literal and
+  pos = dot.getLocation().getStartColumn() - literal.getLocation().getStartColumn()
 select dot, literal.getRawValue().charAt(pos)
diff --git a/javascript/ql/test/library-tests/RegExp/MissingUnicodeFlag/MissingUnicodeFlag.ql b/javascript/ql/test/library-tests/RegExp/MissingUnicodeFlag/MissingUnicodeFlag.ql
@@ -1,7 +1,8 @@
 import javascript
 
 from RegExpLiteral literal, RegExpConstant wideConstant
-where wideConstant.getLiteral() = literal and
+where
+  wideConstant.getLiteral() = literal and
   not literal.getFlags().matches("%u%") and
   wideConstant.getValue().length() > 1 and
   (
diff --git a/javascript/ql/test/library-tests/RegExp/predecessors_and_successors/getPredecessor.ql b/javascript/ql/test/library-tests/RegExp/predecessors_and_successors/getPredecessor.ql
@@ -2,4 +2,4 @@ import javascript
 
 from RegExpTerm pred, RegExpTerm succ
 where pred = succ.getPredecessor()
-select pred, succ
+select pred, succ
diff --git a/javascript/ql/test/library-tests/RegExp/predecessors_and_successors/getSuccessor.ql b/javascript/ql/test/library-tests/RegExp/predecessors_and_successors/getSuccessor.ql
@@ -2,4 +2,4 @@ import javascript
 
 from RegExpTerm pred, RegExpTerm succ
 where succ = pred.getSuccessor()
-select pred, succ
+select pred, succ
diff --git a/javascript/ql/test/library-tests/TorrentLibraries/ParsedTorrent.ql b/javascript/ql/test/library-tests/TorrentLibraries/ParsedTorrent.ql
@@ -1,3 +1,3 @@
 import javascript
 
-select any(ParseTorrent::ParsedTorrent t)
+select any(ParseTorrent::ParsedTorrent t)
diff --git a/javascript/ql/test/library-tests/TorrentLibraries/UserControlledTorrentInfo.ql b/javascript/ql/test/library-tests/TorrentLibraries/UserControlledTorrentInfo.ql
@@ -1,3 +1,3 @@
 import javascript
 
-select any(ParseTorrent::UserControlledTorrentInfo i)
+select any(ParseTorrent::UserControlledTorrentInfo i)
diff --git a/javascript/ql/test/library-tests/TorrentLibraries/parsedTorrentRef.ql b/javascript/ql/test/library-tests/TorrentLibraries/parsedTorrentRef.ql
@@ -1,3 +1,3 @@
 import javascript
 
-select ParseTorrent::parsedTorrentRef()
+select ParseTorrent::parsedTorrentRef()
diff --git a/javascript/ql/test/library-tests/TypeScript/CallSignatureTypes/test.ql b/javascript/ql/test/library-tests/TypeScript/CallSignatureTypes/test.ql
@@ -13,17 +13,17 @@ query predicate test_ExprSignature(Expr expr, string type) {
   type = getASignatureOrElseType(expr.getType())
 }
 
-query predicate test_TypeReferenceSig(TypeReference type, SignatureKind kind, int n, CallSignatureType sig) {
+query predicate test_TypeReferenceSig(
+  TypeReference type, SignatureKind kind, int n, CallSignatureType sig
+) {
   sig = type.getSignature(kind, n)
 }
 
 query predicate test_FunctionCallSig(Function f, CallSignatureType sig) {
   sig = f.getCallSignature()
 }
 
-query Type test_getRestParameterType(CallSignatureType sig) {
-  result = sig.getRestParameterType()
-}
+query Type test_getRestParameterType(CallSignatureType sig) { result = sig.getRestParameterType() }
 
 query Type test_getRestParameterArray(CallSignatureType sig) {
   result = sig.getRestParameterArrayType()
diff --git a/javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql b/javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql
@@ -1,12 +1,16 @@
 import javascript
 
-query predicate test_CallSignature(CallSignature call, string declType, ASTNode body, string abstractness) {
+query predicate test_CallSignature(
+  CallSignature call, string declType, ASTNode body, string abstractness
+) {
   (if call.isAbstract() then abstractness = "abstract" else abstractness = "not abstract") and
   declType = call.getDeclaringType().describe() and
   body = call.getBody()
 }
 
-query predicate test_IndexSignature(IndexSignature sig, string declType, ASTNode body, string abstractness) {
+query predicate test_IndexSignature(
+  IndexSignature sig, string declType, ASTNode body, string abstractness
+) {
   (if sig.isAbstract() then abstractness = "abstract" else abstractness = "not abstract") and
   declType = sig.getDeclaringType().describe() and
   body = sig.getBody()
@@ -21,12 +25,16 @@ query predicate test_MethodOverload(MethodDeclaration method, int index, boolean
   if method.isOverloaded() then overloaded = true else overloaded = false
 }
 
-query predicate test_FunctionCallSigOverload(FunctionCallSignature sig, int index, boolean overloaded) {
+query predicate test_FunctionCallSigOverload(
+  FunctionCallSignature sig, int index, boolean overloaded
+) {
   index = sig.getOverloadIndex() and
   if sig.isOverloaded() then overloaded = true else overloaded = false
 }
 
-query predicate test_ConstructorCallSigOverload(ConstructorCallSignature sig, int index, boolean overloaded) {
+query predicate test_ConstructorCallSigOverload(
+  ConstructorCallSignature sig, int index, boolean overloaded
+) {
   index = sig.getOverloadIndex() and
   if sig.isOverloaded() then overloaded = true else overloaded = false
-}
+}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportMeta/test.ql b/javascript/ql/test/library-tests/TypeScript/ImportMeta/test.ql
@@ -2,4 +2,4 @@ import javascript
 
 from Expr prop
 where prop instanceof ImportMetaExpr
-select prop
+select prop
diff --git a/javascript/ql/test/library-tests/TypeScript/Namespaces/CheckBindings.ql b/javascript/ql/test/library-tests/TypeScript/Namespaces/CheckBindings.ql
@@ -20,8 +20,8 @@ string getNamespaceName(NamespaceDeclaration decl) {
   result = decl.getStmt(0).(ExprStmt).getExpr().getStringValue()
   or
   not decl.getStmt(0).(ExprStmt).getExpr() instanceof ConstantString and
-  result = "Namespace " + decl.getId() + " on line " +
-      decl.getFirstToken().getLocation().getStartLine()
+  result =
+    "Namespace " + decl.getId() + " on line " + decl.getFirstToken().getLocation().getStartLine()
 }
 
 from ResolveCall resolve
diff --git a/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql b/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql
@@ -1,8 +1,6 @@
 import javascript
 
-query predicate symbols(ASTNode astNode, CanonicalName symbol) {
-    ast_node_symbol(astNode, symbol)
-}
+query predicate symbols(ASTNode astNode, CanonicalName symbol) { ast_node_symbol(astNode, symbol) }
 
 from Import imprt
 select imprt, imprt.getImportedModule()
diff --git a/javascript/ql/test/library-tests/TypeScript/PrivateFields/test.ql b/javascript/ql/test/library-tests/TypeScript/PrivateFields/test.ql
@@ -1,9 +1,5 @@
 import javascript
 
-query PropAccess propAccess(string name) {
-    result.getPropertyName() = name
-}
+query PropAccess propAccess(string name) { result.getPropertyName() = name }
 
-query FieldDeclaration fieldDecl(string name) {
-    result.getName() = name
-}
+query FieldDeclaration fieldDecl(string name) { result.getName() = name }
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ImportSelf/test.ql b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ImportSelf/test.ql
@@ -1,5 +1,5 @@
 import javascript
 
 // We're mainly testing extraction succeeds, so just test that some types are extracted.
-
-from Expr e select e, e.getType()
+from Expr e
+select e, e.getType()
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/TraceResolution/test.ql b/javascript/ql/test/library-tests/TypeScript/RegressionTests/TraceResolution/test.ql
@@ -1,3 +1,4 @@
 import javascript
 
-from Expr e select e, e.getType()
+from Expr e
+select e, e.getType()
diff --git a/javascript/ql/test/library-tests/TypeScript/Tokens/PrettyPrintTokens.ql b/javascript/ql/test/library-tests/TypeScript/Tokens/PrettyPrintTokens.ql
@@ -7,7 +7,8 @@ Token getATokenAtLine(File file, int line) {
 
 bindingset[line]
 string getTokenStringAtLine(File file, int line) {
-  result = concat(Token tok |
+  result =
+    concat(Token tok |
       tok = getATokenAtLine(file, line)
     |
       tok.toString().replaceAll(" ", "~") + " " order by tok.getLocation().getStartColumn()
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAliases/TypeAliases.ql b/javascript/ql/test/library-tests/TypeScript/TypeAliases/TypeAliases.ql
@@ -3,18 +3,10 @@ import javascript
 from TypeAliasDeclaration decl
 select decl, decl.getIdentifier(), decl.getNumTypeParameter(), decl.getDefinition()
 
-query Type rightHandSide(TypeAliasDeclaration decl) {
-  result = decl.getDefinition().getType()
-}
+query Type rightHandSide(TypeAliasDeclaration decl) { result = decl.getDefinition().getType() }
 
-query Type getAliasedType(TypeAliasReference ref) {
-  result = ref.getAliasedType()
-}
+query Type getAliasedType(TypeAliasReference ref) { result = ref.getAliasedType() }
 
-query Type getTypeArgument(TypeAliasReference ref, int n) {
-  result = ref.getTypeArgument(n)
-}
+query Type getTypeArgument(TypeAliasReference ref, int n) { result = ref.getTypeArgument(n) }
 
-query Type unfold(TypeAliasReference t) {
-  result = t.unfold()
-}
+query Type unfold(TypeAliasReference t) { result = t.unfold() }
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/test.ql b/javascript/ql/test/library-tests/TypeScript/TypeOnlyImportExport/test.ql
@@ -1,22 +1,14 @@
 import javascript
 
-query VarRef getAVarReference(Variable v) {
-    result = v.getAReference()
-}
+query VarRef getAVarReference(Variable v) { result = v.getAReference() }
 
-query VarRef getAnExportAccess(LocalTypeName t) {
-    result = t.getAnExportAccess()
-}
+query VarRef getAnExportAccess(LocalTypeName t) { result = t.getAnExportAccess() }
 
-query TypeDecl getATypeDecl(LocalTypeName t) {
-    result = t.getADeclaration()
-}
+query TypeDecl getATypeDecl(LocalTypeName t) { result = t.getADeclaration() }
 
-query Function calls(DataFlow::InvokeNode invoke) {
-    result = invoke.getACallee()
-}
+query Function calls(DataFlow::InvokeNode invoke) { result = invoke.getACallee() }
 
 query predicate exportsAs(ExportDeclaration exprt, LexicalName v, string name, string kind) {
-    exprt.exportsAs(v, name) and
-    kind = v.getDeclarationSpace()
+  exprt.exportsAs(v, name) and
+  kind = v.getDeclarationSpace()
 }
diff --git a/javascript/ql/test/library-tests/frameworks/EventEmitter/test.ql b/javascript/ql/test/library-tests/frameworks/EventEmitter/test.ql
@@ -1,8 +1,5 @@
 import javascript
 
 query predicate taintSteps(DataFlow::Node pred, DataFlow::Node succ) {
-  exists(DataFlow::AdditionalFlowStep step | 
-    step.step(pred, succ)
-  )
+  exists(DataFlow::AdditionalFlowStep step | step.step(pred, succ))
 }
-
diff --git a/javascript/ql/test/library-tests/frameworks/LazyCache/LazyCache.ql b/javascript/ql/test/library-tests/frameworks/LazyCache/LazyCache.ql
@@ -1,5 +1,3 @@
 import javascript
 
-query DataFlow::Node moduleImport(string name) {
-    result = DataFlow::moduleImport(name)
-}
+query DataFlow::Node moduleImport(string name) { result = DataFlow::moduleImport(name) }
diff --git a/javascript/ql/test/library-tests/frameworks/WebSocket/test.ql b/javascript/ql/test/library-tests/frameworks/WebSocket/test.ql
@@ -14,4 +14,4 @@ query ServerWebSocket::ReceiveNode serverReceive() { any() }
 
 query predicate taintStep(DataFlow::Node pred, DataFlow::Node succ) {
   any(DataFlow::AdditionalFlowStep s).step(pred, succ)
-}
+}
diff --git a/javascript/ql/test/library-tests/frameworks/typeahead/test.ql b/javascript/ql/test/library-tests/frameworks/typeahead/test.ql
@@ -1,13 +1,9 @@
 import javascript
 
-query DataFlow::Node url() {
-   result = any(ClientRequest r).getUrl()	
-}
+query DataFlow::Node url() { result = any(ClientRequest r).getUrl() }
 
 query DataFlow::Node response(string responseType, boolean promise) {
-   result = any(ClientRequest r).getAResponseDataNode(responseType, promise)	
+  result = any(ClientRequest r).getAResponseDataNode(responseType, promise)
 }
 
-query DataFlow::Node suggestionFunction() {
-  result = any(Typeahead::TypeaheadSuggestionFunction t)	
-}
+query DataFlow::Node suggestionFunction() { result = any(Typeahead::TypeaheadSuggestionFunction t) }
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape.ql b/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssWithAdditionalSources.ql b/javascript/ql/test/query-tests/Security/CWE-079/XssWithAdditionalSources.ql

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,8 @@ class SampleVersionSink extends DataFlow::Node {`
`32`	`32`	`functionName = "m1" and`
`33`	`33`	`argNumber = 0`
`34`	`34`	`\|`
`35`		`- this = DataFlow::dependencyModuleImport(dep)`
`36`		`- .getAMemberCall(functionName)`
`37`		`- .getArgument(argNumber) and`
	`35`	`+ this =`
	`36`	`+ DataFlow::dependencyModuleImport(dep).getAMemberCall(functionName).getArgument(argNumber) and`
`38`	`37`	`dep.info(dependencyName, vDep) and`
`39`	`38`	`vDep.maybeBetween(vFrom, vTo)`
`40`	`39`	`)`