Skip to content

Commit e84799c

Browse files
committed
Fix project warnings
1 parent df8d5c5 commit e84799c

13 files changed

Lines changed: 31 additions & 16 deletions

Roslyn.Testing/Analyzer/DiagnosticVerifier.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,16 +241,18 @@ private static Project CreateProject(string[] sources, string language, IEnumera
241241
/// the code
242242
/// </param>
243243
public static VerifyDiagnosticAnalyzerResult VerifyDiagnosticResults(this DiagnosticAnalyzer analyzer,
244-
IEnumerable<Diagnostic> actualResults,
244+
IReadOnlyCollection<Diagnostic> actualResults,
245245
DiagnosticResult[] expectedResults)
246246
{
247247
var expectedCount = expectedResults.Length;
248-
var actualCount = actualResults.Count();
248+
var diagnostics = actualResults.ToArray();
249+
var actualCount = diagnostics.Count();
249250

250251
if (expectedCount != actualCount)
251252
{
252-
var diagnosticsOutput = actualResults.Any()
253-
? FormatDiagnostics(analyzer, actualResults.ToArray())
253+
254+
var diagnosticsOutput = diagnostics.Any()
255+
? FormatDiagnostics(analyzer, diagnostics)
254256
: " NONE.";
255257

256258
var msg = GetMismatchNumberOfDiagnosticsMessage(expectedCount, actualCount, diagnosticsOutput);
@@ -263,7 +265,11 @@ public static VerifyDiagnosticAnalyzerResult VerifyDiagnosticResults(this Diagno
263265
var actual = actualResults.ElementAt(i);
264266
var expected = expectedResults[i];
265267

266-
if (expected.Line == -1 && expected.Column == -1)
268+
if (expected is
269+
{
270+
Line: -1,
271+
Column: -1
272+
})
267273
{
268274
if (actual.Location != Location.None)
269275
{

Roslyn.Testing/CodeFix/CSharpCodeFixProviderTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public abstract class CSharpCodeFixProviderTest<TDiagnosticAnalyzer, TCodeFixPro
2121
/// <inheritdoc />
2222
public override string PathToTestData => "./TestData/CodeFix/";
2323

24-
protected virtual IEnumerable<MetadataReference> GetAdditionalReferences() => [];
24+
protected virtual IReadOnlyCollection<MetadataReference> GetAdditionalReferences() => [];
2525

2626
#endregion
2727

Roslyn.Testing/CodeFix/CodeFixProviderTestExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static VerifyCodeFixProviderResult VerifyFix(this CodeFixProvider codeFix
7777
string newSource,
7878
int? codeFixIndex,
7979
bool allowNewCompilerDiagnostics,
80-
IEnumerable<MetadataReference> additionalReferences = null)
80+
IReadOnlyCollection<MetadataReference> additionalReferences = null)
8181
{
8282
var document = DiagnosticAnalyzerTestExtensions.CreateDocument(oldSource, language, additionalReferences);
8383

@@ -155,7 +155,7 @@ private static string GetNewCompilerDiagnosticsIntroducedMessage(Document docume
155155
/// on
156156
/// </param>
157157
/// <returns> The compiler diagnostics that were found in the code </returns>
158-
private static IEnumerable<Diagnostic> GetCompilerDiagnostics(this Document document) => document.GetSemanticModelAsync()
158+
private static IReadOnlyCollection<Diagnostic> GetCompilerDiagnostics(this Document document) => document.GetSemanticModelAsync()
159159
.GetAwaiter()
160160
.GetResult()
161161
.GetDiagnostics();

System.IO.Abstractions.Analyzers.Tests/Analyzers/PathAnalyzerTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public class PathAnalyzerTests : CSharpDiagnosticAnalyzerTest<PathAnalyzer>
1414
[InlineData("UsingStaticFalsePositive.txt")]
1515
[InlineData("UsingStaticLinqFalsePositive.txt")]
1616
[InlineData("NonRelatedFieldFalsePositive.txt")]
17+
[InlineData("DtoFalsePositive.txt")]
1718
public void Analyzer_is_not_triggered(string filename)
1819
{
1920
var source = ReadFile(filename);

System.IO.Abstractions.Analyzers.Tests/CodeFixes/DirectoryCodeFixTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void CodeFix(string sourceBefore, string sourceAfter)
1919
VerifyFix(sourceBeforeFix, sourceAfterFix, 0, true);
2020
}
2121

22-
protected override IEnumerable<MetadataReference> GetAdditionalReferences() =>
22+
protected override IReadOnlyCollection<MetadataReference> GetAdditionalReferences() =>
2323
[
2424
MetadataReference.CreateFromFile(typeof(IFileSystem).Assembly.Location)
2525
];

System.IO.Abstractions.Analyzers.Tests/CodeFixes/DirectoryInfoCodeFixTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void CodeFix(string sourceBefore, string sourceAfter)
1919
VerifyFix(sourceBeforeFix, sourceAfterFix, 0, true);
2020
}
2121

22-
protected override IEnumerable<MetadataReference> GetAdditionalReferences() =>
22+
protected override IReadOnlyCollection<MetadataReference> GetAdditionalReferences() =>
2323
[
2424
MetadataReference.CreateFromFile(typeof(IFileSystem).Assembly.Location)
2525
];

System.IO.Abstractions.Analyzers.Tests/CodeFixes/FileCodeFixTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void CodeFix(string sourceBefore, string sourceAfter)
1919
VerifyFix(sourceBeforeFix, sourceAfterFix, 0, true);
2020
}
2121

22-
protected override IEnumerable<MetadataReference> GetAdditionalReferences() =>
22+
protected override IReadOnlyCollection<MetadataReference> GetAdditionalReferences() =>
2323
[
2424
MetadataReference.CreateFromFile(typeof(IFileSystem).Assembly.Location)
2525
];

System.IO.Abstractions.Analyzers.Tests/CodeFixes/FileInfoCodeFixTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void CodeFix(string sourceBefore, string sourceAfter)
1919
VerifyFix(sourceBeforeFix, sourceAfterFix, 0, true);
2020
}
2121

22-
protected override IEnumerable<MetadataReference> GetAdditionalReferences() =>
22+
protected override IReadOnlyCollection<MetadataReference> GetAdditionalReferences() =>
2323
[
2424
MetadataReference.CreateFromFile(typeof(IFileSystem).Assembly.Location)
2525
];

System.IO.Abstractions.Analyzers.Tests/CodeFixes/FileServiceConstructorInitialCodeFixTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void CodeFix(string sourceBefore, string sourceAfter)
2020
VerifyFix(sourceBeforeFix, sourceAfterFix, 0, true);
2121
}
2222

23-
protected override IEnumerable<MetadataReference> GetAdditionalReferences() =>
23+
protected override IReadOnlyCollection<MetadataReference> GetAdditionalReferences() =>
2424
[
2525
MetadataReference.CreateFromFile(typeof(IFileSystem).Assembly.Location)
2626
];

System.IO.Abstractions.Analyzers.Tests/CodeFixes/FileServiceInterfaceInjectionCodeFixTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void CodeFix(string sourceBefore, string sourceAfter)
2424
VerifyFix(sourceBeforeFix, sourceAfterFix, 0, true);
2525
}
2626

27-
protected override IEnumerable<MetadataReference> GetAdditionalReferences() =>
27+
protected override IReadOnlyCollection<MetadataReference> GetAdditionalReferences() =>
2828
[
2929
MetadataReference.CreateFromFile(typeof(IFileSystem).Assembly.Location)
3030
];

0 commit comments

Comments
 (0)