Merge pull request #931 from aschackmull/java/autoformat

Approved by esben-semmle, hvitved, yh-semmle

Author: semmle-qlci

csharp/ql/src/API Abuse/Dispose.qll

@@ -15,7 +15,9 @@ class WebControl extends RefType {
   WebControl() { this.getBaseClass*() instanceof SystemWebUIControlClass }
 }
 
-class WebPage extends RefType { WebPage() { this.getBaseClass*() instanceof SystemWebUIPageClass } }
+class WebPage extends RefType {
+  WebPage() { this.getBaseClass*() instanceof SystemWebUIPageClass }
+}
 
 /**
  * Holds if `f` is an auto-disposed web control.

csharp/ql/src/Concurrency/ThreadCreation.qll

@@ -31,7 +31,9 @@ abstract class ConcurrentEntryPoint extends Callable { }
 /**
  * Methods annotated with the `async` keyword are concurrent entry points.
  */
-class AsyncMethod extends ConcurrentEntryPoint { AsyncMethod() { this.(Modifiable).isAsync() } }
+class AsyncMethod extends ConcurrentEntryPoint {
+  AsyncMethod() { this.(Modifiable).isAsync() }
+}
 
 /**
  * Lambdas or methods passed into the thread or task creation library functions

csharp/ql/src/Documentation/Documentation.qll

@@ -1,6 +1,8 @@
 import csharp
 
-class SourceDeclaration extends Declaration { SourceDeclaration() { this.isSourceDeclaration() } }
+class SourceDeclaration extends Declaration {
+  SourceDeclaration() { this.isSourceDeclaration() }
+}
 
 /** A parameter that has come from source code. */
 class SourceParameter extends SourceDeclaration, Parameter { }

csharp/ql/src/Language Abuse/UselessUpcast.ql

@@ -13,7 +13,9 @@
 import csharp
 
 /** A static callable. */
-class StaticCallable extends Callable { StaticCallable() { this.(Modifiable).isStatic() } }
+class StaticCallable extends Callable {
+  StaticCallable() { this.(Modifiable).isStatic() }
+}
 
 /** An instance callable, that is, a non-static callable. */
 class InstanceCallable extends Callable {

csharp/ql/src/Likely Bugs/Collections/ContainerSizeCmpZero.ql

@@ -37,7 +37,9 @@ private predicate containerSizeAccess(PropertyAccess pa, string containerKind) {
   )
 }
 
-class ZeroLiteral extends Expr { ZeroLiteral() { getValue() = "0" } }
+class ZeroLiteral extends Expr {
+  ZeroLiteral() { getValue() = "0" }
+}
 
 /**
  * Whether `smaller` is checked to be no greater than `greater` by `e` being `trueOrFalse`

csharp/ql/src/Likely Bugs/Statements/UseBraces.ql

@@ -25,9 +25,13 @@ Stmt getASuccessorStmt(Stmt s) {
   result = findSuccessorStmt(s.getAControlFlowNode().getASuccessor())
 }
 
-class IfThenStmt extends IfStmt { IfThenStmt() { not exists(Stmt s | getElse() = s) } }
+class IfThenStmt extends IfStmt {
+  IfThenStmt() { not exists(Stmt s | getElse() = s) }
+}
 
-class IfThenElseStmt extends IfStmt { IfThenElseStmt() { exists(Stmt s | getElse() = s) } }
+class IfThenElseStmt extends IfStmt {
+  IfThenElseStmt() { exists(Stmt s | getElse() = s) }
+}
 
 Stmt getTrailingBody(Stmt s) {
   result = s.(ForStmt).getBody() or

csharp/ql/src/Performance/StringConcatenationInLoop.ql

@@ -12,7 +12,9 @@
 import csharp
 
 // any use of + that has string type
-class StringCat extends AddExpr { StringCat() { this.getType() instanceof StringType } }
+class StringCat extends AddExpr {
+  StringCat() { this.getType() instanceof StringType }
+}
 
 /**
  * Holds if `e` is an assignment of the form

csharp/ql/src/Stubs/Stubs.qll

@@ -110,9 +110,7 @@ abstract private class GeneratedType extends ValueOrRefType, GeneratedElement {
               t = this.getAnInterestingBaseType() and
               (if t instanceof Class then i = 0 else i = 1)
             |
-              stubClassName(t), ", "
-              order by
-                i
+              stubClassName(t), ", " order by i
             )
       else result = ""
   }
@@ -265,7 +263,10 @@ private string stubAccessibility(Member m) {
       else
         if m.isPrivate()
         then result = "private "
-        else if m.isInternal() then result = "internal " else result = "unknown-accessibility"
+        else
+          if m.isInternal()
+          then result = "internal "
+          else result = "unknown-accessibility"
 }
 
 private string stubModifiers(Member m) {
@@ -285,7 +286,10 @@ private string stubOverride(Member m) {
     else
       if m.(Virtualizable).isAbstract()
       then result = "abstract "
-      else if m.(Virtualizable).isOverride() then result = "override " else result = ""
+      else
+        if m.(Virtualizable).isOverride()
+        then result = "override "
+        else result = ""
 }
 
 private string stubQualifiedNamePrefix(ValueOrRefType t) {
@@ -338,9 +342,7 @@ private string stubClassName(Type t) {
                               concat(int i, Type element |
                                 element = t.(TupleType).getElementType(i)
                               |
-                                stubClassName(element), ","
-                                order by
-                                  i
+                                stubClassName(element), "," order by i
                               ) + ")"
                         else
                           if t instanceof ValueOrRefType
@@ -358,9 +360,7 @@ private string stubGenericArguments(ValueOrRefType t) {
         concat(int n |
           exists(t.(UnboundGenericType).getTypeParameter(n))
         |
-          t.(UnboundGenericType).getTypeParameter(n).getName(), ","
-          order by
-            n
+          t.(UnboundGenericType).getTypeParameter(n).getName(), "," order by n
         ) + ">"
   else
     if t instanceof ConstructedType
@@ -369,9 +369,7 @@ private string stubGenericArguments(ValueOrRefType t) {
           concat(int n |
             exists(t.(ConstructedType).getTypeArgument(n))
           |
-            stubClassName(t.(ConstructedType).getTypeArgument(n)), ","
-            order by
-              n
+            stubClassName(t.(ConstructedType).getTypeArgument(n)), "," order by n
           ) + ">"
     else result = ""
 }
@@ -383,9 +381,7 @@ private string stubGenericMethodParams(Method m) {
         concat(int n, TypeParameter param |
           param = m.(UnboundGenericMethod).getTypeParameter(n)
         |
-          param.getName(), ","
-          order by
-            n
+          param.getName(), "," order by n
         ) + ">"
   else result = ""
 }
@@ -419,7 +415,10 @@ private string stubParameterModifiers(Parameter p) {
       else
         if p.isIn()
         then result = "" // Only C# 7.1 so ignore
-        else if p.hasExtensionMethodModifier() then result = "this " else result = ""
+        else
+          if p.hasExtensionMethodModifier()
+          then result = "this "
+          else result = ""
 }
 
 private string stubDefaultValue(Parameter p) {

csharp/ql/src/semmle/code/asp/AspNet.qll

@@ -165,7 +165,9 @@ class AspQuotedString extends AspAttribute, @asp_quoted_string {
 }
 
 /** Arbitrary text. It will be inserted into the document as is. */
-class AspText extends AspElement, @asp_text { override string toString() { result = getBody() } }
+class AspText extends AspElement, @asp_text {
+  override string toString() { result = getBody() }
+}
 
 /** An XML directive, such as a `DOCTYPE` declaration. */
 class AspXmlDirective extends AspElement, @asp_xml_directive {

csharp/ql/src/semmle/code/asp/WebConfig.qll

@@ -7,7 +7,9 @@ import csharp
 /**
  * A `Web.config` file.
  */
-class WebConfigXML extends XMLFile { WebConfigXML() { getName().matches("%Web.config") } }
+class WebConfigXML extends XMLFile {
+  WebConfigXML() { getName().matches("%Web.config") }
+}
 
 /** A `<configuration>` tag in an ASP.NET configuration file. */
 class ConfigurationXMLElement extends XMLElement {