Skip to content

Commit

Permalink
Merge pull request #451 from sharwell/trailing-comma
Browse files Browse the repository at this point in the history 
Include a trailing comma in lists
  • Loading branch information
@sharwell
sharwell authored Feb 14, 2020
2 parents 4747d6f + 58d48d3 commit 9ef6464
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 24 deletions.
7 changes: 1 addition & 6 deletions src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/AnalyzerTest`1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,12 +669,7 @@ private static string FormatDiagnostics(ImmutableArray<DiagnosticAnalyzer> analy
builder.Append(")");
}

if (i != diagnostics.Length - 1)
{
builder.Append(',');
}

builder.AppendLine();
builder.AppendLine(",");
}

return builder.ToString();
Expand Down
4 changes: 2 additions & 2 deletions ...nalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.UnitTests/AdditionalFilesTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public async Task TestDiagnosticInNormalFileNotDeclared()
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// Test0.cs(1,23): warning Brace: message" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 23, 1, 24)" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 23, 1, 24)," + Environment.NewLine +
Environment.NewLine;
Assert.Equal(expected, exception.Message);
}
Expand Down Expand Up @@ -100,7 +100,7 @@ public async Task TestDiagnosticInAdditionalFileNotDeclared()
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// File1.txt(1,14): warning Brace: message" + Environment.NewLine +
"new DiagnosticResult().WithSpan(\"File1.txt\", 1, 14, 1, 15)" + Environment.NewLine +
"new DiagnosticResult().WithSpan(\"File1.txt\", 1, 14, 1, 15)," + Environment.NewLine +
Environment.NewLine;
Assert.Equal(expected, exception.Message);
}
Expand Down
8 changes: 4 additions & 4 deletions ...eAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.UnitTests/AutoExclusionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public async Task TestCSharpAnalyzerWithoutExclusionFails()
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// Test0.cs(4,23): warning ThisToBase: message" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(4, 23, 4, 27)" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(4, 23, 4, 27)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand All @@ -75,7 +75,7 @@ public async Task TestCSharpAnalyzerWithoutSuppressionFails()
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// Test0.cs(1,1): warning FirstLine: message" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 1, 1, 1)" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 1, 1, 1)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand Down Expand Up @@ -138,7 +138,7 @@ public async Task TestVisualBasicAnalyzerWithoutExclusionFails()
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// Test0.vb(5,5): warning ThisToBase: message" + Environment.NewLine +
"VerifyVB.Diagnostic().WithSpan(5, 5, 5, 12)" + Environment.NewLine +
"VerifyVB.Diagnostic().WithSpan(5, 5, 5, 12)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand All @@ -160,7 +160,7 @@ public async Task TestVisualBasicAnalyzerWithoutSuppressionFails()
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// Test0.vb(1,1): warning FirstLine: message" + Environment.NewLine +
"VerifyVB.Diagnostic().WithSpan(1, 1, 1, 1)" + Environment.NewLine +
"VerifyVB.Diagnostic().WithSpan(1, 1, 1, 1)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand Down
10 changes: 5 additions & 5 deletions ...eAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.UnitTests/CompilerErrorTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class TestClass {
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// Test0.cs(3,34): error CS1002: ; expected" + Environment.NewLine +
"DiagnosticResult.CompilerError(\"CS1002\").WithSpan(3, 34, 3, 35)" + Environment.NewLine +
"DiagnosticResult.CompilerError(\"CS1002\").WithSpan(3, 34, 3, 35)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand Down Expand Up @@ -153,7 +153,7 @@ class TestClass {
Environment.NewLine +
"Diagnostic:" + Environment.NewLine +
" // Test0.cs(3,7): warning CS0414: The field 'TestClass.value' is assigned but its value is never used" + Environment.NewLine +
"DiagnosticResult.CompilerWarning(\"CS0414\").WithSpan(3, 7, 3, 12).WithArguments(\"TestClass.value\")" + Environment.NewLine +
"DiagnosticResult.CompilerWarning(\"CS0414\").WithSpan(3, 7, 3, 12).WithArguments(\"TestClass.value\")," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand All @@ -177,7 +177,7 @@ class TestClass {
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// Test0.cs(3,7): warning CS0414: The field 'TestClass.value' is assigned but its value is never used" + Environment.NewLine +
"DiagnosticResult.CompilerWarning(\"CS0414\").WithSpan(3, 7, 3, 12).WithArguments(\"TestClass.value\")" + Environment.NewLine +
"DiagnosticResult.CompilerWarning(\"CS0414\").WithSpan(3, 7, 3, 12).WithArguments(\"TestClass.value\")," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand Down Expand Up @@ -231,7 +231,7 @@ class TestClass {
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// Test0.cs(2,1): hidden CS8019: Unnecessary using directive." + Environment.NewLine +
"new DiagnosticResult(\"CS8019\", DiagnosticSeverity.Hidden).WithSpan(2, 1, 2, 14)" + Environment.NewLine +
"new DiagnosticResult(\"CS8019\", DiagnosticSeverity.Hidden).WithSpan(2, 1, 2, 14)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand All @@ -256,7 +256,7 @@ End Class
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// Test0.vb(3) : error BC30205: End of statement expected." + Environment.NewLine +
"DiagnosticResult.CompilerError(\"BC30205\").WithSpan(3, 13, 3, 14)" + Environment.NewLine +
"DiagnosticResult.CompilerError(\"BC30205\").WithSpan(3, 13, 3, 14)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand Down
12 changes: 6 additions & 6 deletions ...ysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.UnitTests/DiagnosticLocationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public async Task TestDiagnosticDoesNotMatchIncorrectSpan()
Environment.NewLine +
"Diagnostic:" + Environment.NewLine +
" // Test0.cs(1,17): warning Brace: message" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 18)" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 18)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand All @@ -88,7 +88,7 @@ public async Task TestDiagnosticDoesNotMatchIncorrectLocation()
Environment.NewLine +
"Diagnostic:" + Environment.NewLine +
" // Test0.cs(1,17): warning Brace: message" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 18)" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 18)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand All @@ -110,7 +110,7 @@ public async Task TestDiagnosticDoesNotMatchMissingLocation()
"A project diagnostic with No location" + Environment.NewLine +
"Actual:" + Environment.NewLine +
"// Test0.cs(1,17): warning Brace: message" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 18)" + Environment.NewLine;
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 18)," + Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}

Expand All @@ -131,7 +131,7 @@ public async Task TestDiagnosticDoesNotMatchNoLocation()
"A project diagnostic with No location" + Environment.NewLine +
"Actual:" + Environment.NewLine +
"// Test0.cs(1,17): warning Brace: message" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 18)" + Environment.NewLine;
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 18)," + Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}

Expand Down Expand Up @@ -169,7 +169,7 @@ public async Task TestZeroWidthDiagnosticDoesNotMatchIncorrectSpan()
Environment.NewLine +
"Diagnostic:" + Environment.NewLine +
" // Test0.cs(1,17): warning Brace: message" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 17)" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 17)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand All @@ -190,7 +190,7 @@ public async Task TestZeroWidthDiagnosticDoesNotMatchIncorrectLocation()
Environment.NewLine +
"Diagnostic:" + Environment.NewLine +
" // Test0.cs(1,17): warning Brace: message" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 17)" + Environment.NewLine +
"VerifyCS.Diagnostic().WithSpan(1, 17, 1, 17)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand Down
2 changes: 1 addition & 1 deletion ...lysis.Testing/Microsoft.CodeAnalysis.CodeFix.Testing.UnitTests/AdditionalFilesFixTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public async Task TestDiagnosticFixedByRemovingAdditionalFileWithUndeclaredCompi
Environment.NewLine +
"Diagnostics:" + Environment.NewLine +
"// Test0.cs(1,24): error CS1513: } expected" + Environment.NewLine +
"DiagnosticResult.CompilerError(\"CS1513\").WithSpan(1, 24, 1, 24)" + Environment.NewLine +
"DiagnosticResult.CompilerError(\"CS1513\").WithSpan(1, 24, 1, 24)," + Environment.NewLine +
Environment.NewLine;
new DefaultVerifier().EqualOrDiff(expected, exception.Message);
}
Expand Down

0 comments on commit 9ef6464

Please sign in to comment.