Use DiagnosticResult.CompilerError where appropriate

sharwell · sharwell · commit a45080c6ea5b · 2018-09-03T10:19:31.000-05:00
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/ReadabilityRules/SA1139CSharp7UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/ReadabilityRules/SA1139CSharp7UnitTests.cs
@@ -208,7 +208,7 @@ public void Method()
 
             DiagnosticResult[] expectedDiagnosticResult =
             {
-                CompilerError("CS0221")
+                DiagnosticResult.CompilerError("CS0221")
                     .WithMessage($"Constant value '{literalValue}' cannot be converted to a '{type}' (use 'unchecked' syntax to override)")
                     .WithLocation(6, 17),
             };
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1600UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1600UnitTests.cs
@@ -34,7 +34,7 @@ public async Task TestRegressionMethodGlobalNamespaceAsync(string code, int colu
 
             DiagnosticResult[] expected =
             {
-                CompilerError("CS0116").WithMessage("A namespace cannot directly contain members such as fields or methods").WithLocation(4, column),
+                DiagnosticResult.CompilerError("CS0116").WithMessage("A namespace cannot directly contain members such as fields or methods").WithLocation(4, column),
                 Diagnostic().WithLocation(4, column),
             };
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1606UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1606UnitTests.cs
@@ -778,7 +778,7 @@ public string MethodName
 
             DiagnosticResult[] expected =
             {
-                CompilerError("CS1002").WithMessage("; expected").WithLocation(5, 29),
+                DiagnosticResult.CompilerError("CS1002").WithMessage("; expected").WithLocation(5, 29),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1633UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1633UnitTests.cs
@@ -388,14 +388,14 @@ public async Task TestIncompleteMultilineCommentAsync()
 
             DiagnosticResult[] expectedDiagnostics =
             {
-                CompilerError("CS1035").WithMessage("End-of-file found, '*/' expected").WithLocation(1, 1),
+                DiagnosticResult.CompilerError("CS1035").WithMessage("End-of-file found, '*/' expected").WithLocation(1, 1),
                 Diagnostic(FileHeaderAnalyzers.SA1633DescriptorMissing).WithLocation(1, 1),
             };
 
             // The fixed code will still have the incomplete comment, as there is no certainty that the incomplete comment was intended as file header.
             DiagnosticResult[] expectedFixedDiagnostics =
             {
-                CompilerError("CS1035").WithMessage("End-of-file found, '*/' expected").WithLocation(3, 1),
+                DiagnosticResult.CompilerError("CS1035").WithMessage("End-of-file found, '*/' expected").WithLocation(3, 1),
             };
 
             await this.VerifyCSharpFixAsync(testCode, expectedDiagnostics, fixedCode, expectedFixedDiagnostics, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Properties.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Properties.cs
@@ -493,17 +493,17 @@ int Property
             DiagnosticResult accessorError;
             if (LightupHelpers.SupportsCSharp7)
             {
-                accessorError = CompilerError("CS8180").WithMessage("{ or ; or => expected");
+                accessorError = DiagnosticResult.CompilerError("CS8180").WithMessage("{ or ; or => expected");
             }
             else
             {
-                accessorError = CompilerError("CS1043").WithMessage("{ or ; expected");
+                accessorError = DiagnosticResult.CompilerError("CS1043").WithMessage("{ or ; expected");
             }
 
             DiagnosticResult[] expected =
             {
                 accessorError.WithLocation(6, 12),
-                CompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(9, 1),
+                DiagnosticResult.CompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(9, 1),
             };
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
@@ -526,10 +526,10 @@ int Property
 
             DiagnosticResult[] expected =
             {
-                CompilerError("CS0161").WithMessage("'ClassName.Property.get': not all code paths return a value").WithLocation(6, 9),
-                CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),
-                CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),
-                CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),
+                DiagnosticResult.CompilerError("CS0161").WithMessage("'ClassName.Property.get': not all code paths return a value").WithLocation(6, 9),
+                DiagnosticResult.CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),
+                DiagnosticResult.CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),
+                DiagnosticResult.CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),
             };
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1501UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1501UnitTests.cs
@@ -517,16 +517,16 @@ void MethodName()
                 ExpectedDiagnostics =
                 {
                     Diagnostic().WithLocation(7, 12),
-                    CompilerError("CS0103").WithLocation(7, 14).WithMessage("The name 'Bar' does not exist in the current context"),
-                    CompilerError("CS1513").WithLocation(7, 37).WithMessage("} expected"),
-                    CompilerError("CS1513").WithLocation(7, 37).WithMessage("} expected"),
+                    DiagnosticResult.CompilerError("CS0103").WithLocation(7, 14).WithMessage("The name 'Bar' does not exist in the current context"),
+                    DiagnosticResult.CompilerError("CS1513").WithLocation(7, 37).WithMessage("} expected"),
+                    DiagnosticResult.CompilerError("CS1513").WithLocation(7, 37).WithMessage("} expected"),
                 },
                 FixedCode = fixedTestCode,
                 RemainingDiagnostics =
                 {
-                    CompilerError("CS0103").WithLocation(9, 13).WithMessage("The name 'Bar' does not exist in the current context"),
-                    CompilerError("CS1513").WithLocation(11, 23).WithMessage("} expected"),
-                    CompilerError("CS1513").WithLocation(11, 23).WithMessage("} expected"),
+                    DiagnosticResult.CompilerError("CS0103").WithLocation(9, 13).WithMessage("The name 'Bar' does not exist in the current context"),
+                    DiagnosticResult.CompilerError("CS1513").WithLocation(11, 23).WithMessage("} expected"),
+                    DiagnosticResult.CompilerError("CS1513").WithLocation(11, 23).WithMessage("} expected"),
                 },
             }.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1504UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1504UnitTests.cs
@@ -304,7 +304,7 @@ public int Prop
 }";
             DiagnosticResult[] expected =
             {
-                CompilerError("CS0501").WithMessage("'Foo.Prop.get' must declare a body because it is not marked abstract, extern, or partial").WithLocation(6, 9),
+                DiagnosticResult.CompilerError("CS0501").WithMessage("'Foo.Prop.get' must declare a body because it is not marked abstract, extern, or partial").WithLocation(6, 9),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1505UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1505UnitTests.cs
@@ -6,6 +6,7 @@ namespace StyleCop.Analyzers.Test.LayoutRules
     using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.LayoutRules;
     using Xunit;
     using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
@@ -834,7 +835,7 @@ public async Task TestOpeningBraceAtEndOfFileAsync()
 {
 ";
 
-            var expected = CompilerError("CS1513").WithMessage("} expected").WithLocation(2, 2);
+            var expected = DiagnosticResult.CompilerError("CS1513").WithMessage("} expected").WithLocation(2, 2);
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
     }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1508UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1508UnitTests.cs
@@ -819,10 +819,10 @@ public class TestClass /
 
             DiagnosticResult[] expected =
             {
-                CompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(3, 28),
-                CompilerError("CS1513").WithMessage("} expected").WithLocation(3, 28),
-                CompilerError("CS1514").WithMessage("{ expected").WithLocation(3, 28),
-                CompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(6, 1),
+                DiagnosticResult.CompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(3, 28),
+                DiagnosticResult.CompilerError("CS1513").WithMessage("} expected").WithLocation(3, 28),
+                DiagnosticResult.CompilerError("CS1514").WithMessage("{ expected").WithLocation(3, 28),
+                DiagnosticResult.CompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(6, 1),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1404UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1404UnitTests.cs
@@ -397,7 +397,7 @@ public void Bar()
             DiagnosticResult[] expected =
             {
                 Diagnostic().WithLocation(4, 66),
-                CompilerError("CS0029").WithMessage("Cannot implicitly convert type 'int' to 'string'").WithLocation(4, 82),
+                DiagnosticResult.CompilerError("CS0029").WithMessage("Cannot implicitly convert type 'int' to 'string'").WithLocation(4, 82),
             };
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1313UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1313UnitTests.cs
@@ -562,11 +562,11 @@ public override void TestMethod(int p1, X int P2)
 ";
             DiagnosticResult[] expected =
             {
-                CompilerError("CS0534").WithLocation(9, 18).WithMessage("'TestClass' does not implement inherited abstract member 'BaseClass.TestMethod(int, int)'"),
-                CompilerError("CS0115").WithLocation(11, 30).WithMessage("'TestClass.TestMethod(int, X, int)': no suitable method found to override"),
-                CompilerError("CS0246").WithLocation(11, 49).WithMessage("The type or namespace name 'X' could not be found (are you missing a using directive or an assembly reference?)"),
-                CompilerError("CS1001").WithLocation(11, 51).WithMessage("Identifier expected"),
-                CompilerError("CS1003").WithLocation(11, 51).WithMessage("Syntax error, ',' expected"),
+                DiagnosticResult.CompilerError("CS0534").WithLocation(9, 18).WithMessage("'TestClass' does not implement inherited abstract member 'BaseClass.TestMethod(int, int)'"),
+                DiagnosticResult.CompilerError("CS0115").WithLocation(11, 30).WithMessage("'TestClass.TestMethod(int, X, int)': no suitable method found to override"),
+                DiagnosticResult.CompilerError("CS0246").WithLocation(11, 49).WithMessage("The type or namespace name 'X' could not be found (are you missing a using directive or an assembly reference?)"),
+                DiagnosticResult.CompilerError("CS1001").WithLocation(11, 51).WithMessage("Identifier expected"),
+                DiagnosticResult.CompilerError("CS1003").WithLocation(11, 51).WithMessage("Syntax error, ',' expected"),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1202UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1202UnitTests.cs
@@ -879,8 +879,8 @@ public string
             // We don't care about the syntax errors.
             var expected = new[]
             {
-                CompilerError("CS1585").WithMessage("Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
-                CompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
+                DiagnosticResult.CompilerError("CS1585").WithMessage("Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
+                DiagnosticResult.CompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
@@ -904,8 +904,8 @@ public string
             // We don't care about the syntax errors.
             DiagnosticResult[] expected =
             {
-                CompilerError("CS1585").WithMessage("Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
-                CompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
+                DiagnosticResult.CompilerError("CS1585").WithMessage("Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
+                DiagnosticResult.CompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1204UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1204UnitTests.cs
@@ -545,8 +545,8 @@ public static string
             // We don't care about the syntax errors.
             DiagnosticResult[] expected =
             {
-                CompilerError("CS1585").WithMessage("Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
-                CompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
+                DiagnosticResult.CompilerError("CS1585").WithMessage("Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
+                DiagnosticResult.CompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1206CodeFixProviderUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1206CodeFixProviderUnitTests.cs
@@ -292,7 +292,7 @@ public class ExtendedTestClass : TestClass
 
             DiagnosticResult[] expected =
             {
-                CompilerError("CS0267").WithLocation(5, 1).WithMessage("The 'partial' modifier can only appear immediately before 'class', 'struct', 'interface', or 'void'"),
+                DiagnosticResult.CompilerError("CS0267").WithLocation(5, 1).WithMessage("The 'partial' modifier can only appear immediately before 'class', 'struct', 'interface', or 'void'"),
                 Diagnostic().WithLocation(5, 9).WithArguments("public", "partial"),
                 Diagnostic().WithLocation(15, 12).WithArguments("public", "static"),
                 Diagnostic().WithLocation(26, 9).WithArguments("protected", "new"),
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1206UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1206UnitTests.cs
@@ -194,7 +194,7 @@ public async Task TestWithIncompleteMembersAsync()
 
             DiagnosticResult[] expected =
             {
-                CompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(4, 1),
+                DiagnosticResult.CompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(4, 1),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1120UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1120UnitTests.cs
@@ -408,7 +408,7 @@ public async Task VerifyThatUnclosedCommentAtFileEndWillBeHandledProperlyAsync()
 
             DiagnosticResult[] expected =
             {
-                CompilerError("CS1035").WithMessage("End-of-file found, '*/' expected").WithLocation(4, 1),
+                DiagnosticResult.CompilerError("CS1035").WithMessage("End-of-file found, '*/' expected").WithLocation(4, 1),
                 Diagnostic().WithLocation(4, 1),
             };
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1132UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1132UnitTests.cs
@@ -119,7 +119,7 @@ class Foo
 
             DiagnosticResult[] expected =
             {
-                CompilerError(id).WithMessage(message).WithLocation(4, column),
+                DiagnosticResult.CompilerError(id).WithMessage(message).WithLocation(4, column),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1135UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1135UnitTests.cs
@@ -214,7 +214,7 @@ public async Task TestFullyQualifiedAliasWithUnresolvedTypeParameterAsync()
 using Example = System.ValueTuple<System.Collections.List, int>;
 ";
 
-            var expected = CompilerError("CS0234").WithLocation(2, 54).WithMessage("The type or namespace name 'List' does not exist in the namespace 'System.Collections' (are you missing an assembly reference?)");
+            var expected = DiagnosticResult.CompilerError("CS0234").WithLocation(2, 54).WithMessage("The type or namespace name 'List' does not exist in the namespace 'System.Collections' (are you missing an assembly reference?)");
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1136UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1136UnitTests.cs
@@ -150,8 +150,8 @@ public enum TestEnum
 
             DiagnosticResult[] expected =
             {
-                CompilerError("CS1513").WithMessage("} expected").WithLocation(2, 21),
-                CompilerError("CS1514").WithMessage("{ expected").WithLocation(2, 21),
+                DiagnosticResult.CompilerError("CS1513").WithMessage("} expected").WithLocation(2, 21),
+                DiagnosticResult.CompilerError("CS1514").WithMessage("{ expected").WithLocation(2, 21),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1139UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1139UnitTests.cs
@@ -231,7 +231,7 @@ public void Method()
 
             DiagnosticResult[] expectedDiagnosticResult =
             {
-                CompilerError("CS0221")
+                DiagnosticResult.CompilerError("CS0221")
                     .WithMessage($"Constant value '{castedLiteral}' cannot be converted to a '{type}' (use 'unchecked' syntax to override)")
                     .WithLocation(6, 17),
             };
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1000UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1000UnitTests.cs
@@ -897,7 +897,7 @@ void MethodName()
 }
 ";
 
-            var expected = CompilerError("CS0742").WithMessage("A query body must end with a select clause or a group clause").WithLocation(6, 42);
+            var expected = DiagnosticResult.CompilerError("CS0742").WithMessage("A query body must end with a select clause or a group clause").WithLocation(6, 42);
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1001UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1001UnitTests.cs
@@ -271,7 +271,7 @@ void MethodName()
 }
 ";
 
-            DiagnosticResult expected = CompilerError("CS1003").WithMessage("Syntax error, ',' expected").WithLocation(6, 25);
+            DiagnosticResult expected = DiagnosticResult.CompilerError("CS1003").WithMessage("Syntax error, ',' expected").WithLocation(6, 25);
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1002UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1002UnitTests.cs
@@ -380,7 +380,7 @@ int x
 
             DiagnosticResult[] expected =
             {
-                CompilerError("CS1002").WithMessage("; expected").WithLocation(6, 14),
+                DiagnosticResult.CompilerError("CS1002").WithMessage("; expected").WithLocation(6, 14),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1006UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1006UnitTests.cs
@@ -112,7 +112,7 @@ class ClassName
 }
 # ";
 
-            DiagnosticResult expected = CompilerError("CS1024").WithMessage("Preprocessor directive expected").WithLocation(5, 1);
+            DiagnosticResult expected = DiagnosticResult.CompilerError("CS1024").WithMessage("Preprocessor directive expected").WithLocation(5, 1);
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
     }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1007UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1007UnitTests.cs
@@ -74,7 +74,7 @@ public static explicit bool(ClassName x)
 
             DiagnosticResult[] expected =
             {
-                CompilerError("CS1003").WithMessage("Syntax error, 'operator' expected").WithLocation(4, 28),
+                DiagnosticResult.CompilerError("CS1003").WithMessage("Syntax error, 'operator' expected").WithLocation(4, 28),
             };
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1008UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1008UnitTests.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1009UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1009UnitTests.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1011UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1011UnitTests.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1012UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1012UnitTests.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1013UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1013UnitTests.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1015UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1015UnitTests.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1018UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1018UnitTests.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CodeFixVerifier`2.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CodeFixVerifier`2.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CustomDiagnosticVerifier`1.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CustomDiagnosticVerifier`1.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifier`1.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifier`1.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopDiagnosticVerifier`1.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopDiagnosticVerifier`1.cs

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public void Method()`
`208`	`208`
`209`	`209`	`DiagnosticResult[] expectedDiagnosticResult =`
`210`	`210`	`{`
`211`		`- CompilerError("CS0221")`
	`211`	`+ DiagnosticResult.CompilerError("CS0221")`
`212`	`212`	`.WithMessage($"Constant value '{literalValue}' cannot be converted to a '{type}' (use 'unchecked' syntax to override)")`
`213`	`213`	`.WithLocation(6, 17),`
`214`	`214`	`};`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public async Task TestRegressionMethodGlobalNamespaceAsync(string code, int colu`
`34`	`34`
`35`	`35`	`DiagnosticResult[] expected =`
`36`	`36`	`{`
`37`		`- CompilerError("CS0116").WithMessage("A namespace cannot directly contain members such as fields or methods").WithLocation(4, column),`
	`37`	`+ DiagnosticResult.CompilerError("CS0116").WithMessage("A namespace cannot directly contain members such as fields or methods").WithLocation(4, column),`
`38`	`38`	`Diagnostic().WithLocation(4, column),`
`39`	`39`	`};`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -778,7 +778,7 @@ public string MethodName`
`778`	`778`
`779`	`779`	`DiagnosticResult[] expected =`
`780`	`780`	`{`
`781`		`- CompilerError("CS1002").WithMessage("; expected").WithLocation(5, 29),`
	`781`	`+ DiagnosticResult.CompilerError("CS1002").WithMessage("; expected").WithLocation(5, 29),`
`782`	`782`	`};`
`783`	`783`
`784`	`784`	`await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -388,14 +388,14 @@ public async Task TestIncompleteMultilineCommentAsync()`
`388`	`388`
`389`	`389`	`DiagnosticResult[] expectedDiagnostics =`
`390`	`390`	`{`
`391`		`- CompilerError("CS1035").WithMessage("End-of-file found, '*/' expected").WithLocation(1, 1),`
	`391`	`+ DiagnosticResult.CompilerError("CS1035").WithMessage("End-of-file found, '*/' expected").WithLocation(1, 1),`
`392`	`392`	`Diagnostic(FileHeaderAnalyzers.SA1633DescriptorMissing).WithLocation(1, 1),`
`393`	`393`	`};`
`394`	`394`
`395`	`395`	`// The fixed code will still have the incomplete comment, as there is no certainty that the incomplete comment was intended as file header.`
`396`	`396`	`DiagnosticResult[] expectedFixedDiagnostics =`
`397`	`397`	`{`
`398`		`- CompilerError("CS1035").WithMessage("End-of-file found, '*/' expected").WithLocation(3, 1),`
	`398`	`+ DiagnosticResult.CompilerError("CS1035").WithMessage("End-of-file found, '*/' expected").WithLocation(3, 1),`
`399`	`399`	`};`
`400`	`400`
`401`	`401`	`await this.VerifyCSharpFixAsync(testCode, expectedDiagnostics, fixedCode, expectedFixedDiagnostics, CancellationToken.None).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -493,17 +493,17 @@ int Property`
`493`	`493`	`DiagnosticResult accessorError;`
`494`	`494`	`if (LightupHelpers.SupportsCSharp7)`
`495`	`495`	`{`
`496`		`- accessorError = CompilerError("CS8180").WithMessage("{ or ; or => expected");`
	`496`	`+ accessorError = DiagnosticResult.CompilerError("CS8180").WithMessage("{ or ; or => expected");`
`497`	`497`	`}`
`498`	`498`	`else`
`499`	`499`	`{`
`500`		`- accessorError = CompilerError("CS1043").WithMessage("{ or ; expected");`
	`500`	`+ accessorError = DiagnosticResult.CompilerError("CS1043").WithMessage("{ or ; expected");`
`501`	`501`	`}`
`502`	`502`
`503`	`503`	`DiagnosticResult[] expected =`
`504`	`504`	`{`
`505`	`505`	`accessorError.WithLocation(6, 12),`
`506`		`- CompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(9, 1),`
	`506`	`+ DiagnosticResult.CompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(9, 1),`
`507`	`507`	`};`
`508`	`508`	`await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
`509`	`509`	`}`
`@@ -526,10 +526,10 @@ int Property`
`526`	`526`
`527`	`527`	`DiagnosticResult[] expected =`
`528`	`528`	`{`
`529`		`- CompilerError("CS0161").WithMessage("'ClassName.Property.get': not all code paths return a value").WithLocation(6, 9),`
`530`		`- CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),`
`531`		`- CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),`
`532`		`- CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),`
	`529`	`+ DiagnosticResult.CompilerError("CS0161").WithMessage("'ClassName.Property.get': not all code paths return a value").WithLocation(6, 9),`
	`530`	`+ DiagnosticResult.CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),`
	`531`	`+ DiagnosticResult.CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),`
	`532`	`+ DiagnosticResult.CompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),`
`533`	`533`	`};`
`534`	`534`	`await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
`535`	`535`	`}`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ public int Prop`
`304`	`304`	`}";`
`305`	`305`	`DiagnosticResult[] expected =`
`306`	`306`	`{`
`307`		`- CompilerError("CS0501").WithMessage("'Foo.Prop.get' must declare a body because it is not marked abstract, extern, or partial").WithLocation(6, 9),`
	`307`	`+ DiagnosticResult.CompilerError("CS0501").WithMessage("'Foo.Prop.get' must declare a body because it is not marked abstract, extern, or partial").WithLocation(6, 9),`
`308`	`308`	`};`
`309`	`309`
`310`	`310`	`await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace StyleCop.Analyzers.Test.LayoutRules`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using System.Threading;`
`8`	`8`	`using System.Threading.Tasks;`
	`9`	`+ using Microsoft.CodeAnalysis.Testing;`
`9`	`10`	`using StyleCop.Analyzers.LayoutRules;`
`10`	`11`	`using Xunit;`
`11`	`12`	`using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<`
`@@ -834,7 +835,7 @@ public async Task TestOpeningBraceAtEndOfFileAsync()`
`834`	`835`	`{`
`835`	`836`	`";`
`836`	`837`
`837`		`- var expected = CompilerError("CS1513").WithMessage("} expected").WithLocation(2, 2);`
	`838`	`+ var expected = DiagnosticResult.CompilerError("CS1513").WithMessage("} expected").WithLocation(2, 2);`
`838`	`839`	`await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
`839`	`840`	`}`
`840`	`841`	`}`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ public void Bar()`
`397`	`397`	`DiagnosticResult[] expected =`
`398`	`398`	`{`
`399`	`399`	`Diagnostic().WithLocation(4, 66),`
`400`		`- CompilerError("CS0029").WithMessage("Cannot implicitly convert type 'int' to 'string'").WithLocation(4, 82),`
	`400`	`+ DiagnosticResult.CompilerError("CS0029").WithMessage("Cannot implicitly convert type 'int' to 'string'").WithLocation(4, 82),`
`401`	`401`	`};`
`402`	`402`	`await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
`403`	`403`	`}`