format cs files

tonerdo · tonerdo · commit 13c069cde013 · 2019-03-03T11:07:07.000+01:00
diff --git a/src/coverlet.console/ConsoleTables/ConsoleTable.cs b/src/coverlet.console/ConsoleTables/ConsoleTable.cs
@@ -41,8 +41,8 @@ public class ConsoleTable
         public ConsoleTableOptions Options { get; protected set; }
 
         public ConsoleTable(params string[] columns)
-            :this(new ConsoleTableOptions { Columns = new List<string>(columns) })
-        {          
+            : this(new ConsoleTableOptions { Columns = new List<string>(columns) })
+        {
         }
 
         public ConsoleTable(ConsoleTableOptions options)
@@ -80,10 +80,10 @@ public static ConsoleTable From<T>(IEnumerable<T> values)
             var table = new ConsoleTable();
 
             var columns = GetColumns<T>();
-                
+
             table.AddColumn(columns);
 
-            foreach (var propertyValues in values.Select(value => columns.Select(column => GetColumnValue<T>(value, column) )))
+            foreach (var propertyValues in values.Select(value => columns.Select(column => GetColumnValue<T>(value, column))))
                 table.AddRow(propertyValues.ToArray());
 
             return table;
@@ -207,7 +207,7 @@ private string Format(List<int> columnLengths, char delimiter = '|')
         {
             var delimiterStr = delimiter == char.MinValue ? string.Empty : delimiter.ToString();
             var format = (Enumerable.Range(0, Columns.Count)
-                .Select(i => " "+ delimiterStr + " {" + i + ",-" + columnLengths[i] + "}")
+                .Select(i => " " + delimiterStr + " {" + i + ",-" + columnLengths[i] + "}")
                 .Aggregate((s, a) => s + a) + " " + delimiterStr).Trim();
             return format;
         }
@@ -245,7 +245,7 @@ public void Write(Format format = ConsoleTables.Format.Default)
         }
 
         private static IEnumerable<string> GetColumns<T>()
-        {  
+        {
             return typeof(T).GetProperties().Select(x => x.Name).ToArray();
         }
 
diff --git a/src/coverlet.console/Program.cs b/src/coverlet.console/Program.cs
@@ -61,7 +61,7 @@ static int Main(string[] args)
                 process.StartInfo.RedirectStandardError = true;
                 process.OutputDataReceived += (sender, eventArgs) =>
                 {
-                    if(!string.IsNullOrEmpty(eventArgs.Data))
+                    if (!string.IsNullOrEmpty(eventArgs.Data))
                         logger.LogInformation(eventArgs.Data);
                 };
 
diff --git a/src/coverlet.core/Instrumentation/Instrumenter.cs b/src/coverlet.core/Instrumentation/Instrumenter.cs
@@ -383,7 +383,7 @@ private Instruction AddInstrumentationCode(MethodDefinition method, ILProcessor
 
             var key = (branchPoint.StartLine, (int)branchPoint.Ordinal);
             if (!document.Branches.ContainsKey(key))
-            { 
+            {
                 document.Branches.Add(key,
                     new Branch
                     {
@@ -519,9 +519,9 @@ private bool IsExcludeAttribute(CustomAttribute customAttribute)
                 excludeAttributeNames = _excludedAttributes.Union(excludeAttributeNames);
             }
 
-			return excludeAttributeNames.Any(a =>
-                customAttribute.AttributeType.Name.Equals(a.EndsWith("Attribute")? a : $"{a}Attribute"));
-		}
+            return excludeAttributeNames.Any(a =>
+                customAttribute.AttributeType.Name.Equals(a.EndsWith("Attribute") ? a : $"{a}Attribute"));
+        }
 
         private static Mono.Cecil.Cil.MethodBody GetMethodBody(MethodDefinition method)
         {
diff --git a/src/coverlet.core/Properties/AssemblyInfo.cs b/src/coverlet.core/Properties/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 [assembly: System.Reflection.AssemblyKeyFileAttribute("coverlet.core.snk")]
-[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Coverlet.Core.Tests,PublicKey=" +
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Coverlet.Core.Tests,PublicKey=" +
 "0024000004800000940000000602000000240000525341310004000001000100757cf9291d78a8" +
 "2e5bb58a827a3c46c2f959318327ad30d1b52e918321ffbd847fb21565b8576d2a3a24562a93e8" +
 "6c77a298b564a0f1b98f63d7a1441a3a8bcc206da3ed09d5dacc76e122a109a9d3ac608e21a054" +
diff --git a/src/coverlet.core/Reporters/CoberturaReporter.cs b/src/coverlet.core/Reporters/CoberturaReporter.cs
@@ -81,7 +81,7 @@ public string Report(CoverageResult result)
                                 {
                                     var branches = meth.Value.Branches.Where(b => b.Line == ln.Key).ToList();
                                     var branchInfoCoverage = summary.CalculateBranchCoverage(branches);
-                                    line.Add(new XAttribute("condition-coverage", $"{branchInfoCoverage.Percent*100}% ({branchInfoCoverage.Covered}/{branchInfoCoverage.Total})"));
+                                    line.Add(new XAttribute("condition-coverage", $"{branchInfoCoverage.Percent * 100}% ({branchInfoCoverage.Covered}/{branchInfoCoverage.Total})"));
                                     XElement conditions = new XElement("conditions");
                                     var byOffset = branches.GroupBy(b => b.Offset).ToDictionary(b => b.Key, b => b.ToList());
                                     foreach (var entry in byOffset)
diff --git a/src/coverlet.core/Reporters/JsonReporter.cs b/src/coverlet.core/Reporters/JsonReporter.cs
@@ -5,7 +5,7 @@ namespace Coverlet.Core.Reporters
     public class JsonReporter : IReporter
     {
         public ReporterOutputType OutputType => ReporterOutputType.File;
-        
+
         public string Format => "json";
 
         public string Extension => "json";
diff --git a/src/coverlet.core/Reporters/LcovReporter.cs b/src/coverlet.core/Reporters/LcovReporter.cs
@@ -7,7 +7,7 @@ namespace Coverlet.Core.Reporters
     public class LcovReporter : IReporter
     {
         public ReporterOutputType OutputType => ReporterOutputType.File;
-        
+
         public string Format => "lcov";
 
         public string Extension => "info";
diff --git a/src/coverlet.core/Reporters/OpenCoverReporter.cs b/src/coverlet.core/Reporters/OpenCoverReporter.cs
@@ -11,7 +11,7 @@ namespace Coverlet.Core.Reporters
     public class OpenCoverReporter : IReporter
     {
         public ReporterOutputType OutputType => ReporterOutputType.File;
-        
+
         public string Format => "opencover";
 
         public string Extension => "opencover.xml";
@@ -72,7 +72,7 @@ public string Report(CoverageResult result)
                             var methLineCoverage = summary.CalculateLineCoverage(meth.Value.Lines);
                             var methBranchCoverage = summary.CalculateBranchCoverage(meth.Value.Branches);
                             var methCyclomaticComplexity = summary.CalculateCyclomaticComplexity(meth.Value.Branches);
-                            
+
                             XElement method = new XElement("Method");
 
                             method.Add(new XAttribute("cyclomaticComplexity", methCyclomaticComplexity.ToString()));
diff --git a/src/coverlet.core/Symbols/CecilSymbolHelper.cs b/src/coverlet.core/Symbols/CecilSymbolHelper.cs
@@ -23,12 +23,12 @@ public static class CecilSymbolHelper
         public static List<BranchPoint> GetBranchPoints(MethodDefinition methodDefinition)
         {
             var list = new List<BranchPoint>();
-            if (methodDefinition == null) 
+            if (methodDefinition == null)
                 return list;
 
             UInt32 ordinal = 0;
             var instructions = methodDefinition.Body.Instructions;
-            
+
             // if method is a generated MoveNext skip first branch (could be a switch or a branch)
             var skipFirstBranch = IsMovenext.IsMatch(methodDefinition.FullName);
 
@@ -45,7 +45,7 @@ public static List<BranchPoint> GetBranchPoints(MethodDefinition methodDefinitio
                     if (BranchIsInGeneratedExceptionFilter(instruction, methodDefinition))
                         continue;
 
-                    if (BranchIsInGeneratedFinallyBlock(instruction, methodDefinition)) 
+                    if (BranchIsInGeneratedFinallyBlock(instruction, methodDefinition))
                         continue;
 
                     var pathCounter = 0;
@@ -59,7 +59,7 @@ public static List<BranchPoint> GetBranchPoints(MethodDefinition methodDefinitio
                     if (instruction.Next == null)
                         return list;
 
-                    if (!BuildPointsForConditionalBranch(list, instruction, branchingInstructionLine, document, branchOffset, pathCounter, instructions, ref ordinal, methodDefinition)) 
+                    if (!BuildPointsForConditionalBranch(list, instruction, branchingInstructionLine, document, branchOffset, pathCounter, instructions, ref ordinal, methodDefinition))
                         return list;
                 }
                 catch (Exception)
@@ -71,7 +71,7 @@ public static List<BranchPoint> GetBranchPoints(MethodDefinition methodDefinitio
         }
 
         private static bool BuildPointsForConditionalBranch(List<BranchPoint> list, Instruction instruction,
-            int branchingInstructionLine, string document, int branchOffset, int pathCounter, 
+            int branchingInstructionLine, string document, int branchOffset, int pathCounter,
             Collection<Instruction> instructions, ref uint ordinal, MethodDefinition methodDefinition)
         {
             // Add Default branch (Path=0)
@@ -215,12 +215,12 @@ private static bool BranchIsInGeneratedExceptionFilter(Instruction branchInstruc
                 Instruction startFilter = exceptionHandler.FilterStart;
                 Instruction endFilter = startFilter;
 
-                while(endFilter.OpCode != OpCodes.Endfilter && endFilter != null)
+                while (endFilter.OpCode != OpCodes.Endfilter && endFilter != null)
                 {
                     endFilter = endFilter.Next;
                 }
 
-                if(branchInstruction.Offset >= startFilter.Offset && branchInstruction.Offset <= endFilter.Offset)
+                if (branchInstruction.Offset >= startFilter.Offset && branchInstruction.Offset <= endFilter.Offset)
                 {
                     return true;
                 }
@@ -231,17 +231,17 @@ private static bool BranchIsInGeneratedExceptionFilter(Instruction branchInstruc
 
         private static bool BranchIsInGeneratedFinallyBlock(Instruction branchInstruction, MethodDefinition methodDefinition)
         {
-            if (!methodDefinition.Body.HasExceptionHandlers) 
+            if (!methodDefinition.Body.HasExceptionHandlers)
                 return false;
-            
+
             // a generated finally block will have no sequence points in its range
             var handlers = methodDefinition.Body.ExceptionHandlers
                 .Where(e => e.HandlerType == ExceptionHandlerType.Finally)
                 .ToList();
 
             return handlers
                 .Where(e => branchInstruction.Offset >= e.HandlerStart.Offset)
-                .Where( e =>branchInstruction.Offset < e.HandlerEnd.Maybe(h => h.Offset, GetOffsetOfNextEndfinally(methodDefinition.Body, e.HandlerStart.Offset)))
+                .Where(e => branchInstruction.Offset < e.HandlerEnd.Maybe(h => h.Offset, GetOffsetOfNextEndfinally(methodDefinition.Body, e.HandlerStart.Offset)))
                 .OrderByDescending(h => h.HandlerStart.Offset) // we need to work inside out
                 .Any(eh => !(methodDefinition.DebugInformation.GetSequencePointMapping()
                     .Where(i => i.Value.StartLine != StepOverLineCode)
@@ -262,7 +262,7 @@ private static List<int> GetBranchPath(Instruction instruction)
             {
                 var point = instruction;
                 offsetList.Add(point.Offset);
-                while ( point.OpCode == OpCodes.Br || point.OpCode == OpCodes.Br_S )
+                while (point.OpCode == OpCodes.Br || point.OpCode == OpCodes.Br_S)
                 {
                     var nextPoint = point.Operand as Instruction;
                     if (nextPoint != null)
@@ -283,7 +283,7 @@ private static List<int> GetBranchPath(Instruction instruction)
         private static Instruction FindClosestInstructionWithSequencePoint(MethodBody methodBody, Instruction instruction)
         {
             var sequencePointsInMethod = methodBody.Instructions.Where(i => HasValidSequencePoint(i, methodBody.Method)).ToList();
-            if (!sequencePointsInMethod.Any()) 
+            if (!sequencePointsInMethod.Any())
                 return null;
             var idx = sequencePointsInMethod.BinarySearch(instruction, new InstructionByOffsetComparer());
             Instruction prev;
diff --git a/src/coverlet.msbuild.tasks/MSBuildLogger.cs b/src/coverlet.msbuild.tasks/MSBuildLogger.cs
@@ -16,12 +16,12 @@ class MSBuildLogger : ILogger
         public void LogVerbose(string message) => _log.LogMessage(MessageImportance.Low, $"{LogPrefix}{message}");
 
         // We use `MessageImportance.High` because with `MessageImportance.Normal` doesn't show anything
-        public void LogInformation(string message)=> _log.LogMessage(MessageImportance.High, $"{LogPrefix}{message}");
+        public void LogInformation(string message) => _log.LogMessage(MessageImportance.High, $"{LogPrefix}{message}");
 
         public void LogWarning(string message) => _log.LogWarning($"{LogPrefix}{message}");
 
         public void LogError(string message) => _log.LogError($"{LogPrefix}{message}");
-      
+
         public void LogError(Exception exception) => _log.LogErrorFromException(exception, true);
     }
 }
diff --git a/test/coverlet.core.tests/CoverageSummaryTests.cs b/test/coverlet.core.tests/CoverageSummaryTests.cs
@@ -46,7 +46,7 @@ public void TestCalculateLineCoverage()
             var document = module.Value.First();
             var @class = document.Value.First();
             var method = @class.Value.First();
-            
+
             Assert.Equal(0.5, summary.CalculateLineCoverage(module.Value).Percent);
             Assert.Equal(0.5, summary.CalculateLineCoverage(document.Value).Percent);
             Assert.Equal(0.5, summary.CalculateLineCoverage(@class.Value).Percent);
diff --git a/test/coverlet.core.tests/Helpers/InstrumentationHelperTests.cs b/test/coverlet.core.tests/Helpers/InstrumentationHelperTests.cs
@@ -235,16 +235,16 @@ public void TestIncludeDirectories()
             string module = typeof(InstrumentationHelperTests).Assembly.Location;
 
             var currentDirModules = InstrumentationHelper.GetCoverableModules(module,
-                new[] {Environment.CurrentDirectory});
-            
+                new[] { Environment.CurrentDirectory });
+
             var parentDirWildcardModules = InstrumentationHelper.GetCoverableModules(module,
-                new[] {Path.Combine(Directory.GetParent(Environment.CurrentDirectory).FullName, "*")});
+                new[] { Path.Combine(Directory.GetParent(Environment.CurrentDirectory).FullName, "*") });
 
             // There are at least as many modules found when searching the parent directory's subdirectories
             Assert.True(parentDirWildcardModules.Length >= currentDirModules.Length);
 
             var relativePathModules = InstrumentationHelper.GetCoverableModules(module,
-                new[] {"."});
+                new[] { "." });
 
             // Same number of modules found when using a relative path
             Assert.Equal(currentDirModules.Length, relativePathModules.Length);
diff --git a/test/coverlet.core.tests/Helpers/RetryHelperTests.cs b/test/coverlet.core.tests/Helpers/RetryHelperTests.cs
@@ -11,7 +11,8 @@ public class RetryHelperTests
         [Fact]
         public void TestRetryWithFixedRetryBackoff()
         {
-            Func<TimeSpan> retryStrategy = () => {
+            Func<TimeSpan> retryStrategy = () =>
+            {
                 return TimeSpan.FromMilliseconds(1);
             };
 
@@ -30,14 +31,15 @@ public void TestRetryWithFixedRetryBackoff()
         public void TestRetryWithExponentialRetryBackoff()
         {
             var currentSleep = 6;
-            Func<TimeSpan> retryStrategy = () => {
+            Func<TimeSpan> retryStrategy = () =>
+            {
                 var sleep = TimeSpan.FromMilliseconds(currentSleep);
                 currentSleep *= 2;
                 return sleep;
             };
 
             var target = new RetryTarget();
-            try 
+            try
             {
                 RetryHelper.Retry(() => target.TargetActionThrows(), retryStrategy, 3);
             }
@@ -51,7 +53,8 @@ public void TestRetryWithExponentialRetryBackoff()
         [Fact]
         public void TestRetryFinishesIfSuccessful()
         {
-            Func<TimeSpan> retryStrategy = () => {
+            Func<TimeSpan> retryStrategy = () =>
+            {
                 return TimeSpan.FromMilliseconds(1);
             };
 
@@ -65,12 +68,12 @@ public void TestRetryFinishesIfSuccessful()
     public class RetryTarget
     {
         public int Calls { get; set; }
-        public void TargetActionThrows() 
+        public void TargetActionThrows()
         {
             Calls++;
             throw new Exception("Simulating Failure");
         }
-        public void TargetActionThrows5Times() 
+        public void TargetActionThrows5Times()
         {
             Calls++;
             if (Calls < 6) throw new Exception("Simulating Failure");
diff --git a/test/coverlet.core.tests/Instrumentation/ModuleTrackerTemplateTests.cs b/test/coverlet.core.tests/Instrumentation/ModuleTrackerTemplateTests.cs
@@ -52,7 +52,7 @@ public void HitsFileWithDifferentNumberOfEntriesCausesExceptionOnUnload()
             Assert.Throws<InvalidOperationException>(() => ModuleTrackerTemplate.UnloadModule(null, null));
         }
 
-        [Fact(Skip="Failed CI Job: https://ci.appveyor.com/project/tonerdo/coverlet/builds/21145989/job/9gx5jnjs502vy1fv")]
+        [Fact(Skip = "Failed CI Job: https://ci.appveyor.com/project/tonerdo/coverlet/builds/21145989/job/9gx5jnjs502vy1fv")]
         public void HitsOnMultipleThreadsCorrectlyCounted()
         {
             ModuleTrackerTemplate.HitsArray = new[] { 0, 0, 0, 0 };
@@ -88,7 +88,7 @@ public void MultipleSequentialUnloadsHaveCorrectTotalData()
             var expectedHitsArray = new[] { 0, 4, 4, 4 };
             Assert.Equal(expectedHitsArray, ReadHitsFile());
         }
- 
+
         [Fact]
         public async void MutexBlocksMultipleWriters()
         {
diff --git a/test/coverlet.core.tests/Reporters/JsonReporterTests.cs b/test/coverlet.core.tests/Reporters/JsonReporterTests.cs
@@ -25,7 +25,7 @@ public void TestReport()
 
             Documents documents = new Documents();
             documents.Add("doc.cs", classes);
-            
+
             result.Modules = new Modules();
             result.Modules.Add("module", documents);
 
diff --git a/test/coverlet.core.tests/Reporters/TeamCityReporter.cs b/test/coverlet.core.tests/Reporters/TeamCityReporter.cs
diff --git a/test/coverlet.core.tests/Samples/Samples.cs b/test/coverlet.core.tests/Samples/Samples.cs
diff --git a/test/coverlet.core.tests/Symbols/CecilSymbolHelperTests.cs b/test/coverlet.core.tests/Symbols/CecilSymbolHelperTests.cs
diff --git a/test/coverlet.testsubject/BigClass.cs b/test/coverlet.testsubject/BigClass.cs

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ static int Main(string[] args)`
`61`	`61`	`process.StartInfo.RedirectStandardError = true;`
`62`	`62`	`process.OutputDataReceived += (sender, eventArgs) =>`
`63`	`63`	`{`
`64`		`- if(!string.IsNullOrEmpty(eventArgs.Data))`
	`64`	`+ if (!string.IsNullOrEmpty(eventArgs.Data))`
`65`	`65`	`logger.LogInformation(eventArgs.Data);`
`66`	`66`	`};`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ private Instruction AddInstrumentationCode(MethodDefinition method, ILProcessor`
`383`	`383`
`384`	`384`	`var key = (branchPoint.StartLine, (int)branchPoint.Ordinal);`
`385`	`385`	`if (!document.Branches.ContainsKey(key))`
`386`		`- {`
	`386`	`+ {`
`387`	`387`	`document.Branches.Add(key,`
`388`	`388`	`new Branch`
`389`	`389`	`{`
`@@ -519,9 +519,9 @@ private bool IsExcludeAttribute(CustomAttribute customAttribute)`
`519`	`519`	`excludeAttributeNames = _excludedAttributes.Union(excludeAttributeNames);`
`520`	`520`	`}`
`521`	`521`
`522`		`- return excludeAttributeNames.Any(a =>`
`523`		`- customAttribute.AttributeType.Name.Equals(a.EndsWith("Attribute")? a : $"{a}Attribute"));`
`524`		`- }`
	`522`	`+ return excludeAttributeNames.Any(a =>`
	`523`	`+ customAttribute.AttributeType.Name.Equals(a.EndsWith("Attribute") ? a : $"{a}Attribute"));`
	`524`	`+ }`
`525`	`525`
`526`	`526`	`private static Mono.Cecil.Cil.MethodBody GetMethodBody(MethodDefinition method)`
`527`	`527`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public string Report(CoverageResult result)`
`81`	`81`	`{`
`82`	`82`	`var branches = meth.Value.Branches.Where(b => b.Line == ln.Key).ToList();`
`83`	`83`	`var branchInfoCoverage = summary.CalculateBranchCoverage(branches);`
`84`		`- line.Add(new XAttribute("condition-coverage", $"{branchInfoCoverage.Percent*100}% ({branchInfoCoverage.Covered}/{branchInfoCoverage.Total})"));`
	`84`	`+ line.Add(new XAttribute("condition-coverage", $"{branchInfoCoverage.Percent * 100}% ({branchInfoCoverage.Covered}/{branchInfoCoverage.Total})"));`
`85`	`85`	`XElement conditions = new XElement("conditions");`
`86`	`86`	`var byOffset = branches.GroupBy(b => b.Offset).ToDictionary(b => b.Key, b => b.ToList());`
`87`	`87`	`foreach (var entry in byOffset)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Coverlet.Core.Reporters`
`5`	`5`	`public class JsonReporter : IReporter`
`6`	`6`	`{`
`7`	`7`	`public ReporterOutputType OutputType => ReporterOutputType.File;`
`8`		`-`
	`8`	`+`
`9`	`9`	`public string Format => "json";`
`10`	`10`
`11`	`11`	`public string Extension => "json";`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Coverlet.Core.Reporters`
`7`	`7`	`public class LcovReporter : IReporter`
`8`	`8`	`{`
`9`	`9`	`public ReporterOutputType OutputType => ReporterOutputType.File;`
`10`		`-`
	`10`	`+`
`11`	`11`	`public string Format => "lcov";`
`12`	`12`
`13`	`13`	`public string Extension => "info";`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ class MSBuildLogger : ILogger`
`16`	`16`	`public void LogVerbose(string message) => _log.LogMessage(MessageImportance.Low, $"{LogPrefix}{message}");`
`17`	`17`
`18`	`18`	// We use `MessageImportance.High` because with `MessageImportance.Normal` doesn't show anything
`19`		`- public void LogInformation(string message)=> _log.LogMessage(MessageImportance.High, $"{LogPrefix}{message}");`
	`19`	`+ public void LogInformation(string message) => _log.LogMessage(MessageImportance.High, $"{LogPrefix}{message}");`
`20`	`20`
`21`	`21`	`public void LogWarning(string message) => _log.LogWarning($"{LogPrefix}{message}");`
`22`	`22`
`23`	`23`	`public void LogError(string message) => _log.LogError($"{LogPrefix}{message}");`
`24`		`-`
	`24`	`+`
`25`	`25`	`public void LogError(Exception exception) => _log.LogErrorFromException(exception, true);`
`26`	`26`	`}`
`27`	`27`	`}`