Java: Autoformat.

java/ql/src/DeadCode/DeadClass.ql

@@ -9,20 +9,23 @@
  *       useless-code
  *       external/cwe/cwe-561
  */
+
 import semmle.code.java.deadcode.DeadCode
 
 from DeadClass c, Element origin, string reason
 where
-  if exists(DeadRoot root | root = c.getADeadRoot() | not root = c.getACallable()) then (
-      // Report a list of the dead roots.
-      origin = c.getADeadRoot() and
-      not origin = c.getACallable() and
-      // There are uses of this class from outside the class.
-      reason = " is only used from dead code originating at $@."
+  if exists(DeadRoot root | root = c.getADeadRoot() | not root = c.getACallable())
+  then (
+    // Report a list of the dead roots.
+    origin = c.getADeadRoot() and
+    not origin = c.getACallable() and
+    // There are uses of this class from outside the class.
+    reason = " is only used from dead code originating at $@."
   ) else (
     // There are no dead roots outside this class.
     origin = c and
-    if c.isUnusedOutsideClass() then
+    if c.isUnusedOutsideClass()
+    then
       // Never accessed outside this class, so it's entirely unused.
       reason = " is entirely unused."
     else

java/ql/src/DeadCode/FLinesOfDeadCode.ql

@@ -9,6 +9,7 @@
  * @tags maintainability
  *       external/cwe/cwe-561
  */
+
 import java
 import semmle.code.java.deadcode.DeadCode
 
@@ -16,31 +17,42 @@ from File f, int n
 where
   n =
     // Lines of code contributed by dead classes.
-    sum(DeadClass deadClass | deadClass.getFile() = f |
-      deadClass.getNumberOfLinesOfCode() -
-      // Remove inner and local classes, as they are reported as separate dead classes. Do not
-      // remove anonymous classes, because they aren't reported separately.
-      sum(NestedClass innerClass | innerClass.getEnclosingType() = deadClass and not innerClass.isAnonymous() |
-        innerClass.getNumberOfLinesOfCode()
+    sum(DeadClass deadClass |
+        deadClass.getFile() = f
+      |
+        deadClass.getNumberOfLinesOfCode() -
+            // Remove inner and local classes, as they are reported as separate dead classes. Do not
+            // remove anonymous classes, because they aren't reported separately.
+            sum(NestedClass innerClass |
+              innerClass.getEnclosingType() = deadClass and not innerClass.isAnonymous()
+            |
+              innerClass.getNumberOfLinesOfCode()
+            )
+      ) +
+      // Lines of code contributed by dead methods, not in dead classes.
+      sum(DeadMethod deadMethod |
+        deadMethod.getFile() = f and not deadMethod.isInDeadScope()
+      |
+        deadMethod.getNumberOfLinesOfCode() -
+            // Remove local classes defined in the dead method - they are reported separately as a dead
+            // class. We keep anonymous class counts, because anonymous classes are not reported
+            // separately.
+            sum(LocalClass localClass |
+              localClass.getLocalClassDeclStmt().getEnclosingCallable() = deadMethod
+            |
+              localClass.getNumberOfLinesOfCode()
+            )
+      ) +
+      // Lines of code contributed by dead fields, not in dead classes.
+      sum(DeadField deadField |
+        deadField.getFile() = f and not deadField.isInDeadScope()
+      |
+        deadField.getNumberOfLinesOfCode()
+      ) +
+      // Lines of code contributed by unused enum constants.
+      sum(UnusedEnumConstant deadEnumConstant |
+        deadEnumConstant.getFile() = f
+      |
+        deadEnumConstant.getNumberOfLinesOfCode()
       )
-    ) +
-    // Lines of code contributed by dead methods, not in dead classes.
-    sum(DeadMethod deadMethod | deadMethod.getFile() = f and not deadMethod.isInDeadScope() |
-      deadMethod.getNumberOfLinesOfCode() -
-      // Remove local classes defined in the dead method - they are reported separately as a dead
-      // class. We keep anonymous class counts, because anonymous classes are not reported
-      // separately.
-      sum(LocalClass localClass | localClass.getLocalClassDeclStmt().getEnclosingCallable() = deadMethod |
-        localClass.getNumberOfLinesOfCode()
-      )
-    ) +
-    // Lines of code contributed by dead fields, not in dead classes.
-    sum(DeadField deadField | deadField.getFile() = f and not deadField.isInDeadScope() |
-      deadField.getNumberOfLinesOfCode()
-    ) +
-    // Lines of code contributed by unused enum constants.
-    sum(UnusedEnumConstant deadEnumConstant | deadEnumConstant.getFile() = f |
-      deadEnumConstant.getNumberOfLinesOfCode()
-    )
-select f, n
-order by n desc
+select f, n order by n desc