Simplify code using 'foreach' instead of 'for'

dotnet · Aug 29, 2024 · cba08e2 · cba08e2
1 parent 515a3a5
commit cba08e2
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/AnalyzerTest`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/AnalyzerTest`1.cs
@@ -844,18 +844,17 @@ private void VerifyLinePosition(ImmutableArray<DiagnosticAnalyzer> analyzers, Di
         private static string FormatDiagnostics(ImmutableArray<DiagnosticAnalyzer> analyzers, string defaultFilePath, params Diagnostic[] diagnostics)
         {
             var builder = new StringBuilder();
-            for (var i = 0; i < diagnostics.Length; ++i)
+            foreach (var diagnostic in diagnostics)
             {
-                var diagnosticsId = diagnostics[i].Id;
-                var location = diagnostics[i].Location;
+                var location = diagnostic.Location;
 
-                builder.Append("// ").AppendLine(diagnostics[i].ToString());
+                builder.Append("// ").AppendLine(diagnostic.ToString());
 
-                var applicableAnalyzer = analyzers.FirstOrDefault(a => a.SupportedDiagnostics.Any(dd => dd.Id == diagnosticsId));
+                var applicableAnalyzer = analyzers.FirstOrDefault(a => a.SupportedDiagnostics.Any(dd => dd.Id == diagnostic.Id));
                 if (applicableAnalyzer != null)
                 {
                     var analyzerType = applicableAnalyzer.GetType();
-                    var rule = location != Location.None && location.IsInSource && applicableAnalyzer.SupportedDiagnostics.Length == 1 ? string.Empty : $"{analyzerType.Name}.{diagnosticsId}";
+                    var rule = location != Location.None && location.IsInSource && applicableAnalyzer.SupportedDiagnostics.Length == 1 ? string.Empty : $"{analyzerType.Name}.{diagnostic.Id}";
 
                     if (location == Location.None || !location.IsInSource)
                     {
@@ -870,11 +869,11 @@ private static string FormatDiagnostics(ImmutableArray<DiagnosticAnalyzer> analy
                 else
                 {
                     builder.Append(
-                        diagnostics[i].Severity switch
+                        diagnostic.Severity switch
                         {
-                            DiagnosticSeverity.Error => $"{nameof(DiagnosticResult)}.{nameof(DiagnosticResult.CompilerError)}(\"{diagnostics[i].Id}\")",
-                            DiagnosticSeverity.Warning => $"{nameof(DiagnosticResult)}.{nameof(DiagnosticResult.CompilerWarning)}(\"{diagnostics[i].Id}\")",
-                            var severity => $"new {nameof(DiagnosticResult)}(\"{diagnostics[i].Id}\", {nameof(DiagnosticSeverity)}.{severity})",
+                            DiagnosticSeverity.Error => $"{nameof(DiagnosticResult)}.{nameof(DiagnosticResult.CompilerError)}(\"{diagnostic.Id}\")",
+                            DiagnosticSeverity.Warning => $"{nameof(DiagnosticResult)}.{nameof(DiagnosticResult.CompilerWarning)}(\"{diagnostic.Id}\")",
+                            var severity => $"new {nameof(DiagnosticResult)}(\"{diagnostic.Id}\", {nameof(DiagnosticSeverity)}.{severity})",
                         });
                 }
 
@@ -885,10 +884,10 @@ private static string FormatDiagnostics(ImmutableArray<DiagnosticAnalyzer> analy
                 else
                 {
                     // The unnecessary code designator is ignored for the primary diagnostic location.
-                    AppendLocation(diagnostics[i].Location, isUnnecessary: false);
+                    AppendLocation(diagnostic.Location, isUnnecessary: false);
 
                     int[] unnecessaryIndices = { };
-                    if (diagnostics[i].Properties.TryGetValue(WellKnownDiagnosticTags.Unnecessary, out var encodedUnnecessaryLocations))
+                    if (diagnostic.Properties.TryGetValue(WellKnownDiagnosticTags.Unnecessary, out var encodedUnnecessaryLocations))
                     {
                         var match = EncodedIndicesSyntax.Match(encodedUnnecessaryLocations);
                         if (match.Success)
@@ -897,22 +896,22 @@ private static string FormatDiagnostics(ImmutableArray<DiagnosticAnalyzer> analy
                         }
                     }
 
-                    for (var j = 0; j < diagnostics[i].AdditionalLocations.Count; j++)
+                    for (var i = 0; i < diagnostic.AdditionalLocations.Count; i++)
                     {
-                        var additionalLocation = diagnostics[i].AdditionalLocations[j];
-                        AppendLocation(additionalLocation, isUnnecessary: unnecessaryIndices.Contains(j));
+                        var additionalLocation = diagnostic.AdditionalLocations[i];
+                        AppendLocation(additionalLocation, isUnnecessary: unnecessaryIndices.Contains(i));
                     }
                 }
 
-                var arguments = diagnostics[i].Arguments();
+                var arguments = diagnostic.Arguments();
                 if (arguments.Count > 0)
                 {
                     builder.Append($".{nameof(DiagnosticResult.WithArguments)}(");
                     builder.Append(string.Join(", ", arguments.Select(a => "\"" + a?.ToString() + "\"")));
                     builder.Append(")");
                 }
 
-                if (diagnostics[i].IsSuppressed())
+                if (diagnostic.IsSuppressed())
                 {
                     builder.Append($".{nameof(DiagnosticResult.WithIsSuppressed)}(true)");
                 }