CPP: Autoformat.

Author: geoffw0

cpp/ql/src/Architecture/Refactoring Opportunities/ClassesWithManyFields.ql

@@ -9,42 +9,42 @@
  *       statistical
  *       non-attributable
  */
+
 import cpp
 
 /**
  * Gets a string describing the kind of a `Class`.
  */
-string kindstr(Class c)
-{
+string kindstr(Class c) {
   exists(int kind | usertypes(unresolveElement(c), _, kind) |
-    (kind = 1 and result = "Struct") or
-    (kind = 2 and result = "Class") or
-    (kind = 6 and result = "Template class")
+    kind = 1 and result = "Struct"
+    or
+    kind = 2 and result = "Class"
+    or
+    kind = 6 and result = "Template class"
   )
 }
 
 /**
  * Holds if the arguments correspond to information about a `VariableDeclarationEntry`.
  */
-predicate vdeInfo(VariableDeclarationEntry vde, Class c, File f, int line)
-{
+predicate vdeInfo(VariableDeclarationEntry vde, Class c, File f, int line) {
   c = vde.getVariable().getDeclaringType() and
   f = vde.getLocation().getFile() and
   line = vde.getLocation().getStartLine()
 }
 
 newtype TVariableDeclarationInfo =
-  TVariableDeclarationLine(Class c, File f, int line) {
-  	vdeInfo(_, c, f, line)
-  }
+  TVariableDeclarationLine(Class c, File f, int line) { vdeInfo(_, c, f, line) }
 
 /**
  * A line that contains one or more `VariableDeclarationEntry`s (in the same class).
  */
-class VariableDeclarationLine extends TVariableDeclarationInfo
-{
+class VariableDeclarationLine extends TVariableDeclarationInfo {
   Class c;
+
   File f;
+
   int line;
 
   VariableDeclarationLine() {
@@ -55,48 +55,38 @@ class VariableDeclarationLine extends TVariableDeclarationInfo
   /**
    * Gets the class associated with this `VariableDeclarationLine`.
    */
-  Class getClass() {
-    result = c
-  }
+  Class getClass() { result = c }
 
   /**
    * Gets the line of this `VariableDeclarationLine`.
    */
-  int getLine() {
-    result = line
-  }
+  int getLine() { result = line }
 
   /**
    * Gets a `VariableDeclarationEntry` on this line.
    */
-  VariableDeclarationEntry getAVDE()
-  {
-    vdeInfo(result, c, f, line)
-  }
+  VariableDeclarationEntry getAVDE() { vdeInfo(result, c, f, line) }
 
   /**
    * Gets the start column of the first `VariableDeclarationEntry` on this line.
    */
-  int getStartColumn() {
-    result = min(getAVDE().getLocation().getStartColumn())
-  }
+  int getStartColumn() { result = min(getAVDE().getLocation().getStartColumn()) }
 
   /**
    * Gets the end column of the last `VariableDeclarationEntry` on this line.
    */
-  int getEndColumn() {
-    result = max(getAVDE().getLocation().getEndColumn())
-  }
+  int getEndColumn() { result = max(getAVDE().getLocation().getEndColumn()) }
 
   /**
    * Gets the rank of this `VariableDeclarationLine` in its file and class
    * (that is, the first is 0, the second is 1 and so on).
    */
   private int getRank() {
     line = rank[result](VariableDeclarationLine vdl, int l |
-      vdl = TVariableDeclarationLine(c, f, l) |
-      l
-    )
+        vdl = TVariableDeclarationLine(c, f, l)
+      |
+        l
+      )
   }
 
   /**
@@ -115,23 +105,19 @@ class VariableDeclarationLine extends TVariableDeclarationInfo
     result.getLine() <= this.getLine() + 3
   }
 
-  string toString() {
-    result = "VariableDeclarationLine"
-  }
+  string toString() { result = "VariableDeclarationLine" }
 }
 
 /**
  * A group of `VariableDeclarationEntry`s in the same class that are approximately
  * contiguous.
  */
-class VariableDeclarationGroup extends VariableDeclarationLine
-{
+class VariableDeclarationGroup extends VariableDeclarationLine {
   VariableDeclarationLine end;
 
   VariableDeclarationGroup() {
     // there is no `VariableDeclarationLine` within three lines previously
     not any(VariableDeclarationLine prev).getProximateNext() = this and
-
     // `end` is the last transitively proximate line
     end = getProximateNext*() and
     not exists(end.getProximateNext())
@@ -149,17 +135,19 @@ class VariableDeclarationGroup extends VariableDeclarationLine
    * Gets the number of uniquely named `VariableDeclarationEntry`s in this group.
    */
   int getCount() {
-    result = count(VariableDeclarationLine l | l = getProximateNext*() | l.getAVDE().getVariable().getName())
+    result = count(VariableDeclarationLine l |
+        l = getProximateNext*()
+      |
+        l.getAVDE().getVariable().getName()
+      )
   }
 
   override string toString() {
-    (
-      getCount() = 1 and
-      result = "declaration of " + getAVDE().getVariable().getName()
-    ) or (
-      getCount() > 1 and
-      result = "group of " + getCount() + " fields here"
-    )
+    getCount() = 1 and
+    result = "declaration of " + getAVDE().getVariable().getName()
+    or
+    getCount() > 1 and
+    result = "group of " + getCount() + " fields here"
   }
 }
 
@@ -169,26 +157,32 @@ class ExtClass extends Class {
   }
 
   predicate hasLocationInfo(string path, int startline, int startcol, int endline, int endcol) {
-    if hasOneVariableGroup() then
-      exists(VariableDeclarationGroup vdg | vdg.getClass() = this | vdg.hasLocationInfo(path, startline, startcol, endline, endcol))
-    else
-      getLocation().hasLocationInfo(path, startline, startcol, endline, endcol)
+    if hasOneVariableGroup()
+    then
+      exists(VariableDeclarationGroup vdg | vdg.getClass() = this |
+        vdg.hasLocationInfo(path, startline, startcol, endline, endcol)
+      )
+    else getLocation().hasLocationInfo(path, startline, startcol, endline, endcol)
   }
 }
 
 from ExtClass c, int n, VariableDeclarationGroup vdg, string suffix
-where n = strictcount(string fieldName
-                    | exists(Field f
-                           | f.getDeclaringType() = c and
-                             fieldName = f.getName() and
-                             // IBOutlet's are a way of building GUIs
-                             // automatically out of ObjC properties.
-                             // We don't want to count those for the
-                             // purposes of this query.
-                             not (f.getType().getAnAttribute().hasName("iboutlet")))) and
-      n > 15 and
-      not c.isConstructedFrom(_) and
-      c = vdg.getClass() and
-      if c.hasOneVariableGroup() then suffix = "" else suffix = " - see $@"
-select c, kindstr(c) + " " + c.getName() + " has " + n + " fields; we suggest refactoring to 15 fields or fewer" + suffix + ".",
-       vdg, vdg.toString()
+where
+  n = strictcount(string fieldName |
+      exists(Field f |
+        f.getDeclaringType() = c and
+        fieldName = f.getName() and
+        // IBOutlet's are a way of building GUIs
+        // automatically out of ObjC properties.
+        // We don't want to count those for the
+        // purposes of this query.
+        not f.getType().getAnAttribute().hasName("iboutlet")
+      )
+    ) and
+  n > 15 and
+  not c.isConstructedFrom(_) and
+  c = vdg.getClass() and
+  if c.hasOneVariableGroup() then suffix = "" else suffix = " - see $@"
+select c,
+  kindstr(c) + " " + c.getName() + " has " + n +
+    " fields; we suggest refactoring to 15 fields or fewer" + suffix + ".", vdg, vdg.toString()