Javascript: Autoformat.

Author: aschackmull

javascript/ql/src/AngularJS/IncompatibleService.ql

@@ -67,31 +67,25 @@ predicate isCompatibleRequestedService(InjectableFunctionServiceRequest request,
   isWildcardKind(kind)
   or
   (
-    (
-      isServiceDirectiveOrFilterFunction(request) or
-      isRunMethod(request) or
-      isControllerFunction(request)
-    ) and
-    (
-      kind = "value" or
-      kind = "service" or
-      kind = "factory" or
-      kind = "constant" or
-      kind = "provider-value"
-    )
-  )
-  or
+    isServiceDirectiveOrFilterFunction(request) or
+    isRunMethod(request) or
+    isControllerFunction(request)
+  ) and
   (
-    isControllerFunction(request) and
-    kind = "controller-only"
+    kind = "value" or
+    kind = "service" or
+    kind = "factory" or
+    kind = "constant" or
+    kind = "provider-value"
   )
   or
+  isControllerFunction(request) and
+  kind = "controller-only"
+  or
+  isConfigMethod(request) and
   (
-    isConfigMethod(request) and
-    (
-      kind = "constant" or
-      kind = "provider"
-    )
+    kind = "constant" or
+    kind = "provider"
   )
 }
 
@@ -105,19 +99,19 @@ string getServiceKind(InjectableFunctionServiceRequest request, string serviceNa
     exists(CustomServiceDefinition custom |
       id = custom.getServiceReference() and
       (
-        (custom instanceof ValueRecipeDefinition and result = "value")
+        custom instanceof ValueRecipeDefinition and result = "value"
         or
-        (custom instanceof ServiceRecipeDefinition and result = "service")
+        custom instanceof ServiceRecipeDefinition and result = "service"
         or
-        (custom instanceof FactoryRecipeDefinition and result = "factory")
+        custom instanceof FactoryRecipeDefinition and result = "factory"
         or
-        (custom instanceof DecoratorRecipeDefinition and result = "decorator")
+        custom instanceof DecoratorRecipeDefinition and result = "decorator"
         or
-        (custom instanceof ConstantRecipeDefinition and result = "constant")
+        custom instanceof ConstantRecipeDefinition and result = "constant"
         or
         (
           custom instanceof ProviderRecipeDefinition and
-          if (serviceName.matches("%Provider"))
+          if serviceName.matches("%Provider")
           then result = "provider"
           else result = "provider-value"
         )
@@ -145,25 +139,17 @@ where
         compatibleKind
     ).regexpReplaceAll(",(?=[^,]+$)", " or") and
   (
-    (
-      isServiceDirectiveOrFilterFunction(request) and
-      componentDescriptionString = "Components such as services, directives, filters, and animations"
-    )
+    isServiceDirectiveOrFilterFunction(request) and
+    componentDescriptionString = "Components such as services, directives, filters, and animations"
     or
-    (
-      isControllerFunction(request) and
-      componentDescriptionString = "Controllers"
-    )
+    isControllerFunction(request) and
+    componentDescriptionString = "Controllers"
     or
-    (
-      isRunMethod(request) and
-      componentDescriptionString = "Run methods"
-    )
+    isRunMethod(request) and
+    componentDescriptionString = "Run methods"
     or
-    (
-      isConfigMethod(request) and
-      componentDescriptionString = "Config methods"
-    )
+    isConfigMethod(request) and
+    componentDescriptionString = "Config methods"
   )
 select request,
   "'" + name + "' is a dependency of kind '" + kind + "', and cannot be injected here. " +

javascript/ql/src/Comments/CommentedOut.qll

@@ -6,30 +6,34 @@ import semmle.javascript.Comments
 private string getALineOfCommentedOutCode(Comment c) {
   result = c.getLine(_) and
   // line ends with ';', '{', or '}', optionally followed by a comma,
-  ((result.regexpMatch(".*[;{}],?\\s*") and
+  (
+    result.regexpMatch(".*[;{}],?\\s*") and
     // but it doesn't look like a JSDoc-like annotation
     not result.regexpMatch(".*@\\w+\\s*\\{.*\\}\\s*") and
     // and it does not contain three consecutive words (which is uncommon in code)
-    not result.regexpMatch("[^'\\\"]*\\w\\s++\\w++\\s++\\w[^'\\\"]*")) or
-  // line is part of a block comment and ends with something that looks
-  // like a line comment; character before '//' must not be ':' to
-  // avoid matching URLs
-  (not c instanceof SlashSlashComment and
-   result.regexpMatch("(.*[^:]|^)//.*[^/].*")) or
-  // similar, but don't be fooled by '//// this kind of comment' and
-  // '//// this kind of comment ////'
-  (c instanceof SlashSlashComment and
-   result.regexpMatch("/*([^/].*[^:]|[^:/])//.*[^/].*") and
-   // exclude externalization comments
-   not result.regexpMatch(".*\\$NON-NLS-\\d+\\$.*")))
+    not result.regexpMatch("[^'\\\"]*\\w\\s++\\w++\\s++\\w[^'\\\"]*")
+    or
+    // line is part of a block comment and ends with something that looks
+    // like a line comment; character before '//' must not be ':' to
+    // avoid matching URLs
+    not c instanceof SlashSlashComment and
+    result.regexpMatch("(.*[^:]|^)//.*[^/].*")
+    or
+    // similar, but don't be fooled by '//// this kind of comment' and
+    // '//// this kind of comment ////'
+    c instanceof SlashSlashComment and
+    result.regexpMatch("/*([^/].*[^:]|[^:/])//.*[^/].*") and
+    // exclude externalization comments
+    not result.regexpMatch(".*\\$NON-NLS-\\d+\\$.*")
+  )
 }
 
 /**
  * Holds if `c` is a comment containing code examples, and hence should be
  * disregarded when looking for commented-out code.
  */
 private predicate containsCodeExample(Comment c) {
-  exists (string text | text = c.getText() |
+  exists(string text | text = c.getText() |
     text.matches("%<pre>%</pre>%") or
     text.matches("%<code>%</code>%") or
     text.matches("%@example%") or
@@ -43,19 +47,19 @@ private predicate containsCodeExample(Comment c) {
  * preceding it, if any, does not.
  */
 private Comment getCommentInRun(File f, Comment c) {
-  exists (int n |
+  exists(int n |
     c.onLines(f, n, _) and
     countCommentedOutLines(c) > 0 and
-    not exists (Comment d | d.onLines(f, _, n-1) |
-      countCommentedOutLines(d) > 0
-    )
+    not exists(Comment d | d.onLines(f, _, n - 1) | countCommentedOutLines(d) > 0)
   ) and
-  (result = c or
-   exists (Comment prev, int n |
-     prev = getCommentInRun(f, c) and
-     prev.onLines(f, _, n) and
-     result.onLines(f, n+1, _)
-   )
+  (
+    result = c
+    or
+    exists(Comment prev, int n |
+      prev = getCommentInRun(f, c) and
+      prev.onLines(f, _, n) and
+      result.onLines(f, n + 1, _)
+    )
   )
 }
 
@@ -68,9 +72,7 @@ private Comment getRelevantCommentInRun(Comment c) {
 }
 
 /** Gets the number of lines in comment `c` that look like commented-out code. */
-private int countCommentedOutLines(Comment c) {
-  result = count(getALineOfCommentedOutCode(c))
-}
+private int countCommentedOutLines(Comment c) { result = count(getALineOfCommentedOutCode(c)) }
 
 /** Gets the number of non-blank lines in comment `c`. */
 private int countNonBlankLines(Comment c) {
@@ -98,31 +100,27 @@ private int countNonBlankLinesInRun(Comment c) {
  * `hasLocationInfo` implementation that assigns it the entire run as its location.
  */
 class CommentedOutCode extends Comment {
-  CommentedOutCode(){
+  CommentedOutCode() {
     exists(int codeLines, int nonBlankLines |
       countCommentedOutLines(this) > 0 and
       not exists(Comment prev | this = getCommentInRun(_, prev) and this != prev) and
       nonBlankLines = countNonBlankLinesInRun(this) and
       codeLines = countCommentedOutLinesInRun(this) and
       nonBlankLines > 0 and
-      2*codeLines > nonBlankLines
+      2 * codeLines > nonBlankLines
     )
   }
 
   /**
    * Gets the number of lines in this run of comments
    * that look like they contain commented-out code.
    */
-  int getNumCodeLines() {
-    result = countCommentedOutLinesInRun(this)
-  }
+  int getNumCodeLines() { result = countCommentedOutLinesInRun(this) }
 
   /**
    * Gets the number of non-blank lines in this run of comments.
    */
-  int getNumNonBlankLines() {
-    result = countNonBlankLinesInRun(this)
-  }
+  int getNumNonBlankLines() { result = countNonBlankLinesInRun(this) }
 
   /**
    * Holds if this element is at the specified location.
@@ -131,18 +129,20 @@ class CommentedOutCode extends Comment {
    * For more information, see
    * [LGTM locations](https://lgtm.com/help/ql/locations).
    */
-  predicate hasLocationInfo(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
-    exists (Location loc, File f | loc = getLocation() and f = loc.getFile() |
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    exists(Location loc, File f | loc = getLocation() and f = loc.getFile() |
       filepath = f.getAbsolutePath() and
       startline = loc.getStartLine() and
       startcolumn = loc.getStartColumn() and
       exists(Location last |
         last = getCommentInRun(f, this).getLocation() and
-        last.getEndLine() = max(getCommentInRun(f, this).getLocation().getEndLine()) |
+        last.getEndLine() = max(getCommentInRun(f, this).getLocation().getEndLine())
+      |
         endline = last.getEndLine() and
         endcolumn = last.getEndColumn()
       )
     )
   }
 }
-

javascript/ql/src/Comments/CommentedOutCode.ql

@@ -23,4 +23,4 @@ predicate isFlowAnnotation(SlashStarComment c) {
 
 from CommentedOutCode c
 where not isFlowAnnotation(c)
-select c, "This comment appears to contain commented-out code."
+select c, "This comment appears to contain commented-out code."

javascript/ql/src/Comments/FCommentedOutCode.ql

@@ -13,6 +13,4 @@
 import CommentedOut
 
 from File f
-select f, sum(CommentedOutCode comment |
-              comment.getFile() = f |
-              comment.getNumCodeLines())
+select f, sum(CommentedOutCode comment | comment.getFile() = f | comment.getNumCodeLines())

javascript/ql/src/Comments/TodoComments.ql

@@ -14,4 +14,4 @@ import javascript
 
 from Comment c
 where c.getText().regexpMatch("(?s).*FIXME.*|.*TODO.*|.*(?<!=)\\s*XXX.*")
-select c, "TODO comments should be addressed."
+select c, "TODO comments should be addressed."

javascript/ql/src/Declarations/DeadStoreOfProperty.ql

@@ -57,7 +57,7 @@ predicate postDominatedPropWrite(
  */
 bindingset[name]
 predicate maybeAccessesProperty(Expr e, string name) {
-  (e.(PropAccess).getPropertyName() = name and e instanceof RValue)
+  e.(PropAccess).getPropertyName() = name and e instanceof RValue
   or
   // conservatively reject all side-effects
   e.isImpure()

javascript/ql/src/Expressions/BadParityCheck.ql

@@ -92,18 +92,14 @@ where
   me.getRightOperand().getIntValue() = 2 and
   maybeNegative(me.getLeftOperand()) and
   (
-    (
-      (cmp instanceof EqExpr or cmp instanceof StrictEqExpr) and
-      num = 1 and
-      parity = "oddness"
-    )
+    (cmp instanceof EqExpr or cmp instanceof StrictEqExpr) and
+    num = 1 and
+    parity = "oddness"
     or
-    (
-      (cmp instanceof NEqExpr or cmp instanceof StrictNEqExpr) and
-      num = 1 and
-      parity = "evenness"
-    )
+    (cmp instanceof NEqExpr or cmp instanceof StrictNEqExpr) and
+    num = 1 and
+    parity = "evenness"
     or
-    (cmp instanceof GTExpr and num = 0 and parity = "oddness")
+    cmp instanceof GTExpr and num = 0 and parity = "oddness"
   )
 select cmp, "Test for " + parity + " does not take negative numbers into account."

javascript/ql/src/Expressions/ComparisonWithNaN.ql

@@ -15,5 +15,5 @@
 import javascript
 
 from Comparison cmp
-where (cmp.getAnOperand().(GlobalVarAccess)).getName() = "NaN"
+where cmp.getAnOperand().(GlobalVarAccess).getName() = "NaN"
 select cmp, "Useless comparison with NaN."

javascript/ql/src/Expressions/ExprHasNoEffect.ql

@@ -30,7 +30,7 @@ predicate inVoidContext(Expr e) {
       or
       // if the toplevel in its entirety is of the form `({ ... })`,
       // it is probably a configuration object (e.g., a require.js build configuration)
-      (tl.getNumChildStmt() = 1 and e.stripParens() instanceof ObjectExpr)
+      tl.getNumChildStmt() = 1 and e.stripParens() instanceof ObjectExpr
     )
   )
   or

javascript/ql/src/Expressions/HapaxLegomenon.ql

@@ -36,7 +36,7 @@ abstract class Hapax extends @expr {
   abstract string getName();
 
   /** Gets a textual representation of this element. */
-  string toString() { result = (this.(Expr)).toString() }
+  string toString() { result = this.(Expr).toString() }
 }
 
 /**