Merge pull request #1651 from NikolayIT/master

sharwell · sharwell · commit c946ae53bef5 · 2015-10-23T17:07:18.000-05:00
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/DocumentationRules/SA1615SA1616CodeFixProvider.cs b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/DocumentationRules/SA1615SA1616CodeFixProvider.cs
@@ -94,7 +94,7 @@ private static async Task<Document> GetTransformedDocumentAsync(Document documen
                 isAsynchronousTestMethod = false;
             }
 
-            XmlNodeSyntax returnsElement = documentationComment.Content.GetFirstXmlElement(XmlCommentHelper.ReturnsXmlTag) as XmlNodeSyntax;
+            XmlNodeSyntax returnsElement = documentationComment.Content.GetFirstXmlElement(XmlCommentHelper.ReturnsXmlTag);
             if (returnsElement != null && !isTask)
             {
                 // This code fix doesn't know how to do anything more than document Task-returning methods.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/Helpers/CustomBatchFixAllProvider.cs b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/Helpers/CustomBatchFixAllProvider.cs
@@ -180,7 +180,7 @@ public virtual string GetFixAllTitle(FixAllContext fixAllContext)
         {
             var diagnosticIds = fixAllContext.DiagnosticIds;
             string diagnosticId;
-            if (diagnosticIds.Count() == 1)
+            if (diagnosticIds.Count == 1)
             {
                 diagnosticId = diagnosticIds.Single();
             }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1120CodeFixProvider.cs b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1120CodeFixProvider.cs
@@ -80,10 +80,7 @@ private static async Task<Document> GetTransformedDocumentAsync(Document documen
             }
 
             // Replace all roots with an empty node
-            var newRoot = root.ReplaceTrivia(triviaToRemove, (original, rewritten) =>
-            {
-                return default(SyntaxTrivia);
-            });
+            var newRoot = root.ReplaceTrivia(triviaToRemove, (original, rewritten) => default(SyntaxTrivia));
 
             Document updatedDocument = document.WithSyntaxRoot(newRoot);
             return updatedDocument;
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Events.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Events.cs
@@ -92,7 +92,7 @@ public event EventHandler Bar
         }
 
         /// <summary>
-        /// Verifies that an event with its block defined on a mutiple lines will pass without diagnostic.
+        /// Verifies that an event with its block defined on a multiple lines will pass without diagnostic.
         /// </summary>
         /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
         [Fact]
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Indexers.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Indexers.cs
@@ -74,7 +74,7 @@ public bool this[int index]
         }
 
         /// <summary>
-        /// Verifies that an indexer with its block defined on a mutiple lines will pass without diagnostic.
+        /// Verifies that an indexer with its block defined on a multiple lines will pass without diagnostic.
         /// </summary>
         /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
         [Fact]
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Namespaces.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1502/SA1502UnitTests.Namespaces.cs
@@ -69,7 +69,7 @@ public async Task TestNamespaceWithBlockOnSingleLineAsync()
         }
 
         /// <summary>
-        /// Verifies that a namespace with its block defined on a mutiple lines will pass without diagnostic.
+        /// Verifies that a namespace with its block defined on a multiple lines will pass without diagnostic.
         /// </summary>
         /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
         [Fact]
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1119UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1119UnitTests.cs
@@ -1169,7 +1169,7 @@ public void Bar()
         public async Task TestElementAccessExpressionAroundConditionalMemberAccessExpressionAsync()
         {
             // In this case removing the parenthesis is an syntactical(because char is a value type) change to the code.
-            // If (myObject?.Foo)[0] would be a refrrence type removing parenthesis would be a semantic change
+            // If (myObject?.Foo)[0] would be a reference type removing parenthesis would be a semantic change
             // because (myObject?.Foo)[0] crashes if myObject is null, but myObject?.Foo[0] evaluates to null.
             string testCode = @"class Foo
 {
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1122UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1122UnitTests.cs
@@ -49,7 +49,7 @@ public void Bar()
         [Fact]
         public async Task TestCodeFixMultipleNodesAsync()
         {
-            // Tests if the code fix works if the SourceSpan of the diagnostic has more then one SynatxNode associated with it
+            // Tests if the code fix works if the SourceSpan of the diagnostic has more then one SyntaxNode associated with it
             // In this case it is a InterpolatedStringInsert and the StringLiteralExpression
             string oldSource = @"public class Foo
 {
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/NumberSignSpacingTestBase.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/NumberSignSpacingTestBase.cs
@@ -80,9 +80,7 @@ void Foo()
 }
 ";
 
-            string test;
-
-            test = string.Format(testFormat, this.Sign + "3");
+            string test = string.Format(testFormat, this.Sign + "3");
             await this.VerifyCSharpDiagnosticAsync(test, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(test, fixedTest, cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
@@ -123,9 +121,7 @@ void Foo()
 }
 ";
 
-            string test;
-
-            test = string.Format(testFormat, this.Sign + "3");
+            string test = string.Format(testFormat, this.Sign + "3");
             await this.VerifyCSharpDiagnosticAsync(test, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(test, fixedTest, cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
@@ -164,9 +160,7 @@ void Foo()
 }
 ";
 
-            string test;
-
-            test = string.Format(testFormat, " " + this.Sign + "3");
+            string test = string.Format(testFormat, " " + this.Sign + "3");
             await this.VerifyCSharpDiagnosticAsync(test, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(test, fixedTest, cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
@@ -229,9 +223,7 @@ void Foo()
 }
 ";
 
-            string test;
-
-            test = string.Format(testFormat, this.Sign + "3");
+            string test = string.Format(testFormat, this.Sign + "3");
             await this.VerifyCSharpDiagnosticAsync(test, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(test, fixedTest, cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
@@ -270,9 +262,7 @@ void Foo()
 }
 ";
 
-            string test;
-
-            test = string.Format(testFormat, this.Sign + "3");
+            string test = string.Format(testFormat, this.Sign + "3");
             await this.VerifyCSharpDiagnosticAsync(test, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(test, fixedTest, cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
@@ -332,9 +322,7 @@ void Foo()
 }
 ";
 
-            string test;
-
-            test = string.Format(testFormat, this.Sign + "3");
+            string test = string.Format(testFormat, this.Sign + "3");
             await this.VerifyCSharpDiagnosticAsync(test, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(test, fixedTest, cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
@@ -394,9 +382,7 @@ void Foo()
 }
 ";
 
-            string test;
-
-            test = string.Format(testFormat, this.Sign + "0");
+            string test = string.Format(testFormat, this.Sign + "0");
             await this.VerifyCSharpDiagnosticAsync(test, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(test, fixedTest, cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifier.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifier.cs
@@ -129,7 +129,7 @@ protected Task VerifyCSharpDiagnosticAsync(string[] sources, DiagnosticResult[]
         /// diagnostics for the sources.</param>
         private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResults, ImmutableArray<DiagnosticAnalyzer> analyzers, DiagnosticResult[] expectedResults)
         {
-            int expectedCount = expectedResults.Count();
+            int expectedCount = expectedResults.Length;
             int actualCount = actualResults.Count();
 
             if (expectedCount != actualCount)
@@ -284,7 +284,7 @@ private static string FormatDiagnostics(ImmutableArray<DiagnosticAnalyzer> analy
             {
                 var diagnosticsId = diagnostics[i].Id;
 
-                builder.AppendLine("// " + diagnostics[i].ToString());
+                builder.Append("// ").AppendLine(diagnostics[i].ToString());
 
                 var applicableAnalyzer = analyzers.FirstOrDefault(a => a.SupportedDiagnostics.Any(dd => dd.Id == diagnosticsId));
                 if (applicableAnalyzer != null)
@@ -300,7 +300,7 @@ private static string FormatDiagnostics(ImmutableArray<DiagnosticAnalyzer> analy
                     {
                         Assert.True(
                             location.IsInSource,
-                            string.Format("Test base does not currently handle diagnostics in metadata locations. Diagnostic in metadata:\r\n", diagnostics[i]));
+                            string.Format("Test base does not currently handle diagnostics in metadata locations. Diagnostic in metadata:\r\n{0}", diagnostics[i]));
 
                         string resultMethodName = diagnostics[i].Location.SourceTree.FilePath.EndsWith(".cs") ? "GetCSharpResultAt" : "GetBasicResultAt";
                         var linePosition = diagnostics[i].Location.GetLineSpan().StartLinePosition;
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1650ElementDocumentationMustBeSpelledCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1650ElementDocumentationMustBeSpelledCorrectly.cs
@@ -37,7 +37,7 @@ namespace StyleCop.Analyzers.DocumentationRules
     /// Joinsnames to a CustomDictionary.xml file.</para>
     ///
     /// <list type="bullet">
-    /// <item>CustomDictionary.xml files can contain words that the spelling checker does not normally recognise.</item>
+    /// <item>CustomDictionary.xml files can contain words that the spelling checker does not normally recognize.</item>
     /// <item>The CustomDictionary.xml file should be placed in the same folder as the StyleCop.dll and the Rules. That
     /// folder (and all subfolders) are checked for the dictionary files.</item>
     /// <item>StyleCop loads CustomDictionary.xml, CustomDictionary.en-GB.xml and then CustomDictionary.en.xml (where
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/NameSyntaxHelpers.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/NameSyntaxHelpers.cs
@@ -61,7 +61,7 @@ private static void BuildName(NameSyntax nameSyntax, StringBuilder builder, bool
             else if (nameSyntax.IsKind(SyntaxKind.GenericName))
             {
                 var genericNameSyntax = (GenericNameSyntax)nameSyntax;
-                builder.AppendFormat("{0}{1}", genericNameSyntax.Identifier.ValueText, genericNameSyntax.TypeArgumentList.ToString());
+                builder.AppendFormat("{0}{1}", genericNameSyntax.Identifier.ValueText, genericNameSyntax.TypeArgumentList);
             }
             else if (nameSyntax.IsKind(SyntaxKind.AliasQualifiedName))
             {
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/ObjectPools/ObjectPool`1.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/ObjectPools/ObjectPool`1.cs
@@ -60,7 +60,7 @@ internal ObjectPool(Func<T> factory, int size)
         /// Note that Free will try to store recycled objects close to the start thus statistically
         /// reducing how far we will typically search.
         /// </remarks>
-        /// <returns>A (poosibly) cached instance of type <typeparamref name="T"/>.</returns>
+        /// <returns>A (possibly) cached instance of type <typeparamref name="T"/>.</returns>
         internal T Allocate()
         {
             // PERF: Examine the first element. If that fails, AllocateSlow will look at the remaining elements.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1025CodeMustNotContainMultipleWhitespaceInARow.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1025CodeMustNotContainMultipleWhitespaceInARow.cs
@@ -13,7 +13,7 @@ namespace StyleCop.Analyzers.SpacingRules
     /// </summary>
     /// <remarks>
     /// <para>A violation of this rule occurs whenever the code contains multiple whitespace characters in a row, unless
-    /// the characters come at the beginning or end of a line of code, following a comma or semicolon or preceeding a
+    /// the characters come at the beginning or end of a line of code, following a comma or semicolon or preceding a
     /// symbol.</para>
     /// </remarks>
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
diff --git a/StyleCop.Analyzers/StyleCopTester/Program.cs b/StyleCop.Analyzers/StyleCopTester/Program.cs
@@ -150,7 +150,7 @@ private static async Task TestFixAllAsync(Stopwatch stopwatch, Solution solution
                 try
                 {
                     stopwatch.Restart();
-                    Console.WriteLine($"Calculating fix for {fix.CodeFixEquivalenceKey} using {fix.FixAllProvider.ToString()} for {fix.NumberOfDiagnostics} instances.");
+                    Console.WriteLine($"Calculating fix for {fix.CodeFixEquivalenceKey} using {fix.FixAllProvider} for {fix.NumberOfDiagnostics} instances.");
                     await fix.GetOperationsAsync(cancellationToken).ConfigureAwait(true);
                     WriteLine($"Calculating changes completed in {stopwatch.ElapsedMilliseconds}ms. This is {fix.NumberOfDiagnostics / stopwatch.Elapsed.TotalSeconds:0.000} instances/second.", ConsoleColor.Yellow);
                 }

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private static async Task<Document> GetTransformedDocumentAsync(Document documen`
`94`	`94`	`isAsynchronousTestMethod = false;`
`95`	`95`	`}`
`96`	`96`
`97`		`- XmlNodeSyntax returnsElement = documentationComment.Content.GetFirstXmlElement(XmlCommentHelper.ReturnsXmlTag) as XmlNodeSyntax;`
	`97`	`+ XmlNodeSyntax returnsElement = documentationComment.Content.GetFirstXmlElement(XmlCommentHelper.ReturnsXmlTag);`
`98`	`98`	`if (returnsElement != null && !isTask)`
`99`	`99`	`{`
`100`	`100`	`// This code fix doesn't know how to do anything more than document Task-returning methods.`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public virtual string GetFixAllTitle(FixAllContext fixAllContext)`
`180`	`180`	`{`
`181`	`181`	`var diagnosticIds = fixAllContext.DiagnosticIds;`
`182`	`182`	`string diagnosticId;`
`183`		`- if (diagnosticIds.Count() == 1)`
	`183`	`+ if (diagnosticIds.Count == 1)`
`184`	`184`	`{`
`185`	`185`	`diagnosticId = diagnosticIds.Single();`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public event EventHandler Bar`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/// <summary>`
`95`		`- /// Verifies that an event with its block defined on a mutiple lines will pass without diagnostic.`
	`95`	`+ /// Verifies that an event with its block defined on a multiple lines will pass without diagnostic.`
`96`	`96`	`/// </summary>`
`97`	`97`	`/// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>`
`98`	`98`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public bool this[int index]`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`/// <summary>`
`77`		`- /// Verifies that an indexer with its block defined on a mutiple lines will pass without diagnostic.`
	`77`	`+ /// Verifies that an indexer with its block defined on a multiple lines will pass without diagnostic.`
`78`	`78`	`/// </summary>`
`79`	`79`	`/// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>`
`80`	`80`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public async Task TestNamespaceWithBlockOnSingleLineAsync()`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/// <summary>`
`72`		`- /// Verifies that a namespace with its block defined on a mutiple lines will pass without diagnostic.`
	`72`	`+ /// Verifies that a namespace with its block defined on a multiple lines will pass without diagnostic.`
`73`	`73`	`/// </summary>`
`74`	`74`	`/// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>`
`75`	`75`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -1169,7 +1169,7 @@ public void Bar()`
`1169`	`1169`	`public async Task TestElementAccessExpressionAroundConditionalMemberAccessExpressionAsync()`
`1170`	`1170`	`{`
`1171`	`1171`	`// In this case removing the parenthesis is an syntactical(because char is a value type) change to the code.`
`1172`		`- // If (myObject?.Foo)[0] would be a refrrence type removing parenthesis would be a semantic change`
	`1172`	`+ // If (myObject?.Foo)[0] would be a reference type removing parenthesis would be a semantic change`
`1173`	`1173`	`// because (myObject?.Foo)[0] crashes if myObject is null, but myObject?.Foo[0] evaluates to null.`
`1174`	`1174`	`string testCode = @"class Foo`
`1175`	`1175`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void Bar()`
`49`	`49`	`[Fact]`
`50`	`50`	`public async Task TestCodeFixMultipleNodesAsync()`
`51`	`51`	`{`
`52`		`- // Tests if the code fix works if the SourceSpan of the diagnostic has more then one SynatxNode associated with it`
	`52`	`+ // Tests if the code fix works if the SourceSpan of the diagnostic has more then one SyntaxNode associated with it`
`53`	`53`	`// In this case it is a InterpolatedStringInsert and the StringLiteralExpression`
`54`	`54`	`string oldSource = @"public class Foo`
`55`	`55`	`{`