Merge pull request #4 from hvitved/csharp/whitespaces

C#: Fix whitespaces

csharp/fix-whitespaces.sh

@@ -0,0 +1,23 @@
+BASEDIR=$(dirname "$0")
+
+cat > "$BASEDIR/reformat.vim" <<"EOF"
+:set ff=unix ts=2 et
+:retab!
+:%s/\r//g
+:%s/ \+$//
+:wq
+EOF
+
+find "$BASEDIR" \( -name "*.ql" -or -name "*.qll" -or -name "*.csv" \) -exec vim -u /dev/null -s reformat.vim {} \;
+
+cat > reformat.vim <<"EOF"
+:set ff=unix ts=4 et
+:retab!
+:%s/\r//g
+:%s/ \+$//
+:wq
+EOF
+
+find "$BASEDIR" \( -name "*.cs" \) -exec vim -u /dev/null -s reformat.vim {} \;
+
+rm "$BASEDIR/reformat.vim"

csharp/ql/src/Likely Bugs/NestedLoopsSameVariable.ql

@@ -19,7 +19,7 @@ import semmle.code.csharp.commons.StructuralComparison as SC
 /** A structural comparison configuration for comparing the conditions of nested `for` loops. */
 class NestedForConditions extends SC::StructuralComparisonConfiguration {
   NestedForConditions() { this = "Compare nested for conditions" }
-  
+
   override predicate candidate(Element e1, Element e2) {
     exists(NestedForLoopSameVariable nested |
       e1 = nested.getInnerForStmt().getCondition() and

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

@@ -62,7 +62,7 @@ abstract class UnbracedControlStmt extends Stmt
     getSuccessorStmt() = result
     and getBlockStmt(this) = getBlockStmt(result)
   }
-  
+
   private Location getBodyLocation() {
     result = getBody().getLocation()
   }

csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.cs

@@ -14,4 +14,4 @@ public static void foo(int count)
         }
         timesLeft--;
     }
-}
+}

csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.ql

@@ -15,4 +15,4 @@ import csharp
 from Callable c
 where c.isSourceDeclaration()
 select c, c.getCyclomaticComplexity() as n
-order by n desc
+order by n desc

csharp/ql/src/Metrics/Callables/CLinesOfCode.ql

@@ -14,4 +14,4 @@ import csharp
 from Callable c
 where c.isSourceDeclaration()
 select c, c.getNumberOfLinesOfCode() as n
-order by n desc
+order by n desc

csharp/ql/src/Metrics/Callables/CLinesOfComment.ql

@@ -14,4 +14,4 @@ import csharp
 from Callable c
 where c.isSourceDeclaration()
 select c, c.getNumberOfLinesOfComments() as n
-order by n desc
+order by n desc

csharp/ql/src/Metrics/Callables/CNumberOfStatements.ql

@@ -13,7 +13,7 @@ import csharp
 
 from Callable c, int n
 where c.isSourceDeclaration()
-  and n = count(Stmt s | s.getEnclosingCallable() = c 
+  and n = count(Stmt s | s.getEnclosingCallable() = c
                    and s != c.getAChild()) // we do not count the top-level block
 select c, n
 order by n desc

csharp/ql/src/Metrics/Callables/CPercentageOfComments.ql

@@ -13,4 +13,4 @@ import csharp
 
 from Callable f, int loc
 where f.isSourceDeclaration() and loc = f.getNumberOfLines() and loc > 0
-select f, 100.0 * ((float)f.getNumberOfLinesOfComments() / (float)loc)
+select f, 100.0 * ((float)f.getNumberOfLinesOfComments() / (float)loc)

csharp/ql/src/Metrics/Callables/StatementNestingDepth.cs

@@ -12,4 +12,4 @@ public void printCharacterCodes(string[] strings)
             }
         }
     }
-}
+}

csharp/ql/src/Metrics/Callables/StatementNestingDepthFix.cs

@@ -16,4 +16,4 @@ public static void Main(string[] args)
             PrintAllCharInts(s);
         }
     }
-}
+}

csharp/ql/src/Metrics/Files/FCyclomaticComplexity.cs

@@ -18,4 +18,4 @@ int f(int i, int j) {
     }
     return result;
     // end
-}
+}

csharp/ql/src/Metrics/Files/FLinesOfCommentedCode.ql

@@ -10,14 +10,14 @@
  * @tags maintainability
  *       documentation
  */
- 
+
 import csharp
 
 from SourceFile f, int n
-where n = count(CommentLine line | 
+where n = count(CommentLine line |
-  exists(CommentBlock block | 
+  exists(CommentBlock block |
     block.getLocation().getFile() = f and
     line = block.getAProbableCodeLine())
   )
 select f, n
-order by n desc
+order by n desc

csharp/ql/src/Metrics/Files/FLinesOfDuplicatedCode.ql

@@ -15,10 +15,10 @@ import external.CodeDuplication
 
 from SourceFile f, int n
 where n = count(int line |
-		exists(DuplicateBlock d | d.sourceFile() = f |
+    exists(DuplicateBlock d | d.sourceFile() = f |
-			line in [d.sourceStartLine()..d.sourceEndLine()] and
+      line in [d.sourceStartLine()..d.sourceEndLine()] and
-			not whitelistedLineForDuplication(f, line)
+      not whitelistedLineForDuplication(f, line)
-		)
+    )
-	)
+  )
 select f, n
-order by n desc
+order by n desc

csharp/ql/src/Metrics/Files/FNumberOfTests.ql

@@ -15,4 +15,4 @@ import semmle.code.csharp.frameworks.Test
 from SourceFile f, int n
 where n = strictcount(TestMethod test | test.fromSource() and test.getFile() = f)
 select f, n
-order by n desc
+order by n desc

csharp/ql/src/Metrics/Files/FSelfContainedness.ql

@@ -15,16 +15,16 @@ import semmle.code.csharp.metrics.Coupling
 /* Self-containedness on file level */
 from File f, float selfContaindness, int efferentSourceCoupling, int efferentCoupling
 
-where efferentSourceCoupling = count(File g| 
+where efferentSourceCoupling = count(File g|
-                                     exists(RefType c| c.fromSource() and c.getFile() = g and 
+                                     exists(RefType c| c.fromSource() and c.getFile() = g and
                                                      exists(RefType d| d.fromSource() and d.getFile()= f and depends(d,c))
                                             )
-                                     ) 
+                                     )
-  and efferentCoupling = count(File g| 
+  and efferentCoupling = count(File g|
-                               exists(RefType c| c.getFile() = g and 
+                               exists(RefType c| c.getFile() = g and
                                                exists(RefType d| d.fromSource() and d.getFile() = f and depends(d,c))
                                             )
-                                     ) 
+                                     )
 and if efferentCoupling = 0 then selfContaindness = 100 else
        selfContaindness = 100*(float)efferentSourceCoupling/efferentCoupling
 

csharp/ql/src/Metrics/History/HNumberOfCoCommits.ql

@@ -11,7 +11,7 @@ import csharp
 import external.VCS
 
 int committedFiles(Commit commit) {
-	result = count(commit.getAnAffectedFile())
+  result = count(commit.getAnAffectedFile())
 }
 
 from File f

csharp/ql/src/Metrics/History/HNumberOfReCommits.ql

@@ -11,16 +11,16 @@ import csharp
 import external.VCS
 
 predicate inRange(Commit first, Commit second) {
-	first.getAnAffectedFile() = second.getAnAffectedFile() and
+  first.getAnAffectedFile() = second.getAnAffectedFile() and
-	first != second and
+  first != second and
-	exists(int n | n = first.getDate().daysTo(second.getDate()) and
+  exists(int n | n = first.getDate().daysTo(second.getDate()) and
-		n >= 0 and n < 5)
+    n >= 0 and n < 5)
 }
 
 int recommitsForFile(File f) {
-	result = count(Commit recommit |
+  result = count(Commit recommit |
-	  f = recommit.getAnAffectedFile() and
+    f = recommit.getAnAffectedFile() and
-	  exists(Commit prev | inRange(prev, recommit)))
+    exists(Commit prev | inRange(prev, recommit)))
 }
 
 from File f

csharp/ql/src/Metrics/History/HNumberOfRecentChanges.ql

@@ -13,4 +13,4 @@ import external.VCS
 from File f, int n
 where n = count(Commit e | e.getAnAffectedFile() = f and e.daysToNow() <= 180 and not artificialChange(e))
 select f, n
-order by n desc
+order by n desc

csharp/ql/src/Metrics/RefTypes/TInheritanceDepth.cs

@@ -12,4 +12,4 @@ abstract class ShortRedBook : RedBook { /* ... */ }
 abstract class LongBlueBook : BlueBook { /* ... */ }
 abstract class ShortBlueBook : BlueBook { /* ... */ }
 class ShortBlueNovel : ShortBlueBook { /* ... */ }
-// ...
+// ...

csharp/ql/src/Metrics/RefTypes/TInheritanceDepth.ql

@@ -14,4 +14,4 @@ import csharp
 from ValueOrRefType t
 where t.isSourceDeclaration()
 select t, t.getInheritanceDepth() as n
-order by n desc
+order by n desc

csharp/ql/src/Metrics/RefTypes/TInheritanceDepthFix.cs

@@ -15,4 +15,4 @@ class Book
     {
         // ...
     }
-}
+}

csharp/ql/src/Metrics/RefTypes/TLackOfCohesionCK.cs

@@ -33,4 +33,4 @@ class TLackOfCohesionCK
         var5 = 1;
         Console.WriteLine(var5);
     }
-}
+}

csharp/ql/src/Metrics/RefTypes/TLackOfCohesionHS.cs

@@ -33,4 +33,4 @@ class TLackOfCohesionCK
         var5 = 1;
         Console.WriteLine(var5);
     }
-}
+}

csharp/ql/src/Metrics/RefTypes/TNumberOfEvents.cs

@@ -22,4 +22,4 @@ class HTTPRequest
         HTTPRequestResponseEndEvent(this, new HTTPRequestResponseEndArgs());
         HTTPRequestResponseProcessedEvent(this, new HTTPRequestResponseProcessedArgs());
     }
-}
+}

csharp/ql/src/Metrics/RefTypes/TNumberOfEventsFix.cs

@@ -20,4 +20,4 @@ class HTTPRequest
         HTTPRequestStateChangeEvent(this, new HTTPRequestStateChangeArgs("responseend"));
         HTTPRequestStateChangeEvent(this, new HTTPRequestStateChangeArgs("responseprocessed"));
     }
-}
+}

csharp/ql/src/Metrics/RefTypes/TNumberOfFields.cs

@@ -9,4 +9,4 @@ class Person
     private string town;
     private string postcode;
     // ...
-}
+}

csharp/ql/src/Metrics/RefTypes/TNumberOfFieldsFix.cs

@@ -19,4 +19,4 @@ class Address
     private string town;
     private string postcode;
     // ...
-}
+}

csharp/ql/src/Metrics/RefTypes/TNumberOfNonConstFields.cs

@@ -9,4 +9,4 @@ class Person
     private string town;
     private string postcode;
     // ...
-}
+}

csharp/ql/src/Metrics/RefTypes/TNumberOfNonConstFields.ql

@@ -11,10 +11,10 @@ import csharp
 
 from ValueOrRefType t, int n
 where
-	t.isSourceDeclaration()
+  t.isSourceDeclaration()
-	and n = count(Field f |
+  and n = count(Field f |
-		f.getDeclaringType() = t
+    f.getDeclaringType() = t
-		and not(f instanceof MemberConstant)
+    and not(f instanceof MemberConstant)
-	)
+  )
 select t, n
-order by n desc
+order by n desc

csharp/ql/src/Metrics/RefTypes/TNumberOfNonConstFieldsFix.cs

@@ -19,4 +19,4 @@ class Address
     private string town;
     private string postcode;
     // ...
-}
+}

csharp/ql/src/Metrics/RefTypes/TNumberOfProperties.cs

@@ -44,4 +44,4 @@ class Person
         }
     }
     // more properties...
-}
+}

csharp/ql/src/Metrics/RefTypes/TNumberOfPropertiesFix.cs

@@ -59,4 +59,4 @@ class Name
             _firstName = firstUC + value.Substring(1);
         }
     }
-}
+}

csharp/ql/src/Metrics/RefTypes/TNumberOfStatements.ql

@@ -11,8 +11,8 @@
 import csharp
 
 from ValueOrRefType t, int n
-where t.isSourceDeclaration() 
+where t.isSourceDeclaration()
-  and n = count(Stmt s | s.getEnclosingCallable().getDeclaringType() = t 
+  and n = count(Stmt s | s.getEnclosingCallable().getDeclaringType() = t
                    and s != s.getEnclosingCallable().getAChild()) // we do not count the top-level block
 select t, n
 order by n desc

csharp/ql/src/Metrics/RefTypes/TUnmanagedCode.cs

@@ -6,9 +6,9 @@ public partial class UnmanagedCodeExample : Form
 {
     [DllImport("User32.dll")]
     public static extern int MessageBox(int h, string m, string c, int type); // violation
-    
+
     private void btnSayHello_Click(object sender, EventArgs e)
     {
         MessageBox(0, "Hello World", "Title", 0);
     }
-}
+}

csharp/ql/src/Metrics/RefTypes/TUnmanagedCodeFix.cs

@@ -7,4 +7,4 @@ public partial class ManagedCodeExample : Form
     {
          MessageBox.Show("Hello World", "Title");
     }
-}
+}

csharp/ql/test/query-tests/Likely Bugs/NestedLoopsSameVariable/NestedLoopsSameVariable.cs

@@ -1,15 +1,15 @@
-using System;
+using System;
-
+
-class NestedLoopsSameVariable
+class NestedLoopsSameVariable
-{
+{
-    static void Main(string[] args)
+    static void Main(string[] args)
-    {
+    {
-        for (int i = 0; i < 2; i++)
+        for (int i = 0; i < 2; i++)
-        {
+        {
-            for (int j = 0; j < 2; i++)
+            for (int j = 0; j < 2; i++)
-            {
+            {
-                Console.WriteLine(i + " " + j);
+                Console.WriteLine(i + " " + j);
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

csharp/ql/test/query-tests/Likely Bugs/NestedLoopsSameVariable/Test.cs

@@ -1,100 +1,100 @@
-using System;
+using System;
-
+
-class Test
+class Test
-{
+{
-    void SameCondition()
+    void SameCondition()
-    {
+    {
-        for (int i=0; i<10; ++i)
+        for (int i=0; i<10; ++i)
-        {
+        {
-            // GOOD: Same condition
+            // GOOD: Same condition
-            for (; i<10; ++i)
+            for (; i<10; ++i)
-            {
+            {
-                Console.WriteLine(i);
+                Console.WriteLine(i);
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    void DifferentCondition1()
+    void DifferentCondition1()
-    {
+    {
-        for (int i=0; i<10; ++i)
+        for (int i=0; i<10; ++i)
-        {
+        {
-            // BAD: considered to be a different condition
+            // BAD: considered to be a different condition
-            for (; 10>i; ++i)
+            for (; 10>i; ++i)
-            {
+            {
-                Console.WriteLine(i);
+                Console.WriteLine(i);
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    void DifferentCondition2()
+    void DifferentCondition2()
-    {
+    {
-        for (int i=0; i<10; ++i)
+        for (int i=0; i<10; ++i)
-        {
+        {
-            // BAD: different condition
+            // BAD: different condition
-            for (; i<9; ++i)
+            for (; i<9; ++i)
-            {
+            {
-                Console.WriteLine(i);
+                Console.WriteLine(i);
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    void DifferentConditions3()
+    void DifferentConditions3()
-    {
+    {
-        for (int i=0; i<10; ++i)
+        for (int i=0; i<10; ++i)
-        {
+        {
-            // BAD: different condition
+            // BAD: different condition
-            for (; i<=10; ++i)
+            for (; i<=10; ++i)
-            {
+            {
-                Console.WriteLine(i);
+                Console.WriteLine(i);
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    void UseAfterInnerLoop()
+    void UseAfterInnerLoop()
-    {
+    {
-        for (int i=0; i<10; ++i)
+        for (int i=0; i<10; ++i)
-        {
+        {
-            for (; i<10; ++i)
+            for (; i<10; ++i)
-            {
+            {
-            }
+            }
-
+
-            // BAD: i is not guarded
+            // BAD: i is not guarded
-            Console.WriteLine(i);
+            Console.WriteLine(i);
-        }
+        }
-    }
+    }
-
+
-    void GuardedAfterInnerLoop()
+    void GuardedAfterInnerLoop()
-    {
+    {
-        for (int i=0; i<10; ++i)
+        for (int i=0; i<10; ++i)
-        {
+        {
-
+
-            // GOOD: same condition
+            // GOOD: same condition
-            for (; i<10; ++i)
+            for (; i<10; ++i)
-            {
+            {
-            }
+            }
-
+
-            if (10 > i)
+            if (10 > i)
-            {
+            {
-                // GOOD: i is guarded
+                // GOOD: i is guarded
-                Console.WriteLine(i);
+                Console.WriteLine(i);
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    void GuardedByContinue()
+    void GuardedByContinue()
-    {
+    {
-        for (int i=0; i<10; ++i)
+        for (int i=0; i<10; ++i)
-        {
+        {
-
+
-            // GOOD: same condition
+            // GOOD: same condition
-            for (; i<10; ++i)
+            for (; i<10; ++i)
-            {
+            {
-            }
+            }
-
+
-            if (10 <= i) continue;
+            if (10 <= i) continue;
-
+
-            // GOOD: i is guarded
+            // GOOD: i is guarded
-            Console.WriteLine(i);
+            Console.WriteLine(i);
-        }
+        }
-    }
+    }
-}
+}