Merge pull request github#11686 from michaelnebel/csharp/refactorforeach

michaelnebel · web-flow · commit e9d27540c8bf · 2022-12-16T14:59:58.000+01:00
C#: Re-factor and use `ForEach`.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentBlock.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentBlock.cs
@@ -1,5 +1,5 @@
-using Semmle.Extraction.Entities;
 using System.IO;
+using Semmle.Util;
 
 namespace Semmle.Extraction.CSharp.Entities
 {
@@ -11,12 +11,8 @@ private CommentBlock(Context cx, Comments.CommentBlock init)
         public override void Populate(TextWriter trapFile)
         {
             trapFile.commentblock(this);
-            var child = 0;
             trapFile.commentblock_location(this, Context.CreateLocation(Symbol.Location));
-            foreach (var l in Symbol.CommentLines)
-            {
-                trapFile.commentblock_child(this, (CommentLine)l, child++);
-            }
+            Symbol.CommentLines.ForEach((l, child) => trapFile.commentblock_child(this, l, child));
         }
 
         public override bool NeedsPopulation => true;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
@@ -39,45 +39,29 @@ public override void Populate(TextWriter trapFile)
             trapFile.compilation_assembly(this, assembly);
 
             // Arguments
-            var index = 0;
-            foreach (var arg in Compilation.Settings.Args)
-            {
-                trapFile.compilation_args(this, index++, arg);
-            }
+            Compilation.Settings.Args.ForEach((arg, index) => trapFile.compilation_args(this, index, arg));
 
             // Files
-            index = 0;
-            foreach (var file in Context.Compilation.SyntaxTrees.Select(tree => File.Create(Context, tree.FilePath)))
-            {
-                trapFile.compilation_compiling_files(this, index++, file);
-            }
+            Context.Compilation.SyntaxTrees.Select(tree => File.Create(Context, tree.FilePath)).ForEach((file, index) => trapFile.compilation_compiling_files(this, index, file));
 
             // References
-            index = 0;
-            foreach (var file in Context.Compilation.References
+            Context.Compilation.References
                 .OfType<PortableExecutableReference>()
                 .Where(r => r.FilePath is not null)
-                .Select(r => File.Create(Context, r.FilePath!)))
-            {
-                trapFile.compilation_referencing_files(this, index++, file);
-            }
+                .Select(r => File.Create(Context, r.FilePath!))
+                .ForEach((file, index) => trapFile.compilation_referencing_files(this, index, file));
 
             // Diagnostics
-            index = 0;
-            foreach (var diag in Context.Compilation.GetDiagnostics().Select(d => new Diagnostic(Context, d)))
-            {
-                trapFile.diagnostic_for(diag, this, 0, index++);
-            }
+            Context.Compilation
+                .GetDiagnostics()
+                .Select(d => new Diagnostic(Context, d))
+                .ForEach((diag, index) => trapFile.diagnostic_for(diag, this, 0, index));
         }
 
         public void PopulatePerformance(PerformanceMetrics p)
         {
             var trapFile = Context.TrapWriter.Writer;
-            var index = 0;
-            foreach (var metric in p.Metrics)
-            {
-                trapFile.compilation_time(this, -1, index++, metric);
-            }
+            p.Metrics.ForEach((metric, index) => trapFile.compilation_time(this, -1, index, metric));
             trapFile.compilation_finished(this, (float)p.Total.Cpu.TotalSeconds, (float)p.Total.Elapsed.TotalSeconds);
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ArrayCreation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ArrayCreation.cs
@@ -2,6 +2,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Semmle.Extraction.Kinds;
+using Semmle.Util;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -108,11 +109,7 @@ public static Expression CreateGenerated(Context cx, IExpressionParentEntity par
             if (length > 0)
             {
                 var arrayInit = ArrayInitializer.CreateGenerated(cx, arrayCreation, InitializerIndex, location);
-                var child = 0;
-                foreach (var item in items)
-                {
-                    Expression.CreateGenerated(cx, item, arrayInit, child++, location);
-                }
+                items.ForEach((item, child) => Expression.CreateGenerated(cx, item, arrayInit, child, location));
             }
 
             return arrayCreation;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs
@@ -1,8 +1,8 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Semmle.Extraction.Entities;
 using Semmle.Extraction.Kinds;
+using Semmle.Util;
 using System.IO;
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
@@ -146,11 +146,7 @@ protected override void PopulateExpression(TextWriter trapFile)
 
                     var init = (InitializerExpressionSyntax)i;
 
-                    var addChild = 0;
-                    foreach (var arg in init.Expressions)
-                    {
-                        Create(Context, arg, invocation, addChild++);
-                    }
+                    init.Expressions.ForEach((arg, child) => Create(Context, arg, invocation, child));
                 }
                 else
                 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/BinaryPattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/BinaryPattern.cs
@@ -1,7 +1,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Semmle.Extraction.Entities;
 using Semmle.Extraction.Kinds;
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/Pattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/Pattern.cs
@@ -1,7 +1,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp;
-using Semmle.Extraction.Entities;
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/PositionalPattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/PositionalPattern.cs
@@ -1,6 +1,6 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Semmle.Extraction.Kinds;
-using Semmle.Extraction.Entities;
+using Semmle.Util;
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
 {
@@ -9,11 +9,7 @@ internal class PositionalPattern : Expression
         internal PositionalPattern(Context cx, PositionalPatternClauseSyntax posPc, IExpressionParentEntity parent, int child) :
             base(new ExpressionInfo(cx, null, cx.CreateLocation(posPc.GetLocation()), ExprKind.POSITIONAL_PATTERN, parent, child, false, null))
         {
-            child = 0;
-            foreach (var sub in posPc.Subpatterns)
-            {
-                Expressions.Pattern.Create(cx, sub.Pattern, this, child++);
-            }
+            posPc.Subpatterns.ForEach((p, i) => Pattern.Create(cx, p.Pattern, this, i));
         }
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/PropertyPattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/PropertyPattern.cs
@@ -1,8 +1,6 @@
-using System;
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Semmle.Extraction.Kinds;
-using Semmle.Extraction.Entities;
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
 {
@@ -27,7 +25,7 @@ private record AccessStep(string Identifier, Microsoft.CodeAnalysis.Location Loc
 
         private class AccessStepPack
         {
-            public readonly List<AccessStep> Prefix = new List<AccessStep>();
+            public readonly List<AccessStep> Prefix = new();
             public AccessStep Last { get; private set; }
 
             public AccessStepPack Add(string identifier, Microsoft.CodeAnalysis.Location location)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RecursivePattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RecursivePattern.cs
@@ -2,7 +2,6 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp;
 using Semmle.Extraction.Kinds;
-using Semmle.Extraction.Entities;
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RelationalPattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RelationalPattern.cs
@@ -2,7 +2,6 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp;
 using Semmle.Extraction.Kinds;
-using Semmle.Extraction.Entities;
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/UnaryPattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/UnaryPattern.cs
@@ -1,5 +1,4 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Semmle.Extraction.Entities;
 using Semmle.Extraction.Kinds;
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PragmaWarningDirective.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PragmaWarningDirective.cs
@@ -1,6 +1,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Semmle.Util;
 using System.IO;
 
 namespace Semmle.Extraction.CSharp.Entities
@@ -15,12 +16,7 @@ private PragmaWarningDirective(Context cx, PragmaWarningDirectiveTriviaSyntax tr
         protected override void PopulatePreprocessor(TextWriter trapFile)
         {
             trapFile.pragma_warnings(this, Symbol.DisableOrRestoreKeyword.IsKind(SyntaxKind.DisableKeyword) ? 0 : 1);
-
-            var childIndex = 0;
-            foreach (var code in Symbol.ErrorCodes)
-            {
-                trapFile.pragma_warning_error_codes(this, code.ToString(), childIndex++);
-            }
+            Symbol.ErrorCodes.ForEach((code, child) => trapFile.pragma_warning_error_codes(this, code.ToString(), child));
         }
 
         public static PragmaWarningDirective Create(Context cx, PragmaWarningDirectiveTriviaSyntax p) =>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using Semmle.Extraction.Entities;`
`2`	`1`	`using System.IO;`
	`2`	`+using Semmle.Util;`
`3`	`3`
`4`	`4`	`namespace Semmle.Extraction.CSharp.Entities`
`5`	`5`	`{`
`@@ -11,12 +11,8 @@ private CommentBlock(Context cx, Comments.CommentBlock init)`
`11`	`11`	`public override void Populate(TextWriter trapFile)`
`12`	`12`	`{`
`13`	`13`	`trapFile.commentblock(this);`
`14`		`- var child = 0;`
`15`	`14`	`trapFile.commentblock_location(this, Context.CreateLocation(Symbol.Location));`
`16`		`- foreach (var l in Symbol.CommentLines)`
`17`		`- {`
`18`		`- trapFile.commentblock_child(this, (CommentLine)l, child++);`
`19`		`- }`
	`15`	`+ Symbol.CommentLines.ForEach((l, child) => trapFile.commentblock_child(this, l, child));`
`20`	`16`	`}`
`21`	`17`
`22`	`18`	`public override bool NeedsPopulation => true;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using Microsoft.CodeAnalysis;`
`2`	`2`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`3`	`3`	`using Microsoft.CodeAnalysis.CSharp;`
`4`		`-using Semmle.Extraction.Entities;`
`5`	`4`
`6`	`5`	`namespace Semmle.Extraction.CSharp.Entities.Expressions`
`7`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`2`	`2`	`using Semmle.Extraction.Kinds;`
`3`		`-using Semmle.Extraction.Entities;`
	`3`	`+using Semmle.Util;`
`4`	`4`
`5`	`5`	`namespace Semmle.Extraction.CSharp.Entities.Expressions`
`6`	`6`	`{`
`@@ -9,11 +9,7 @@ internal class PositionalPattern : Expression`
`9`	`9`	`internal PositionalPattern(Context cx, PositionalPatternClauseSyntax posPc, IExpressionParentEntity parent, int child) :`
`10`	`10`	`base(new ExpressionInfo(cx, null, cx.CreateLocation(posPc.GetLocation()), ExprKind.POSITIONAL_PATTERN, parent, child, false, null))`
`11`	`11`	`{`
`12`		`- child = 0;`
`13`		`- foreach (var sub in posPc.Subpatterns)`
`14`		`- {`
`15`		`- Expressions.Pattern.Create(cx, sub.Pattern, this, child++);`
`16`		`- }`
	`12`	`+ posPc.Subpatterns.ForEach((p, i) => Pattern.Create(cx, p.Pattern, this, i));`
`17`	`13`	`}`
`18`	`14`	`}`
`19`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`		`-using System;`
`2`	`1`	`using System.Collections.Generic;`
`3`	`2`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`4`	`3`	`using Semmle.Extraction.Kinds;`
`5`		`-using Semmle.Extraction.Entities;`
`6`	`4`
`7`	`5`	`namespace Semmle.Extraction.CSharp.Entities.Expressions`
`8`	`6`	`{`
`@@ -27,7 +25,7 @@ private record AccessStep(string Identifier, Microsoft.CodeAnalysis.Location Loc`
`27`	`25`
`28`	`26`	`private class AccessStepPack`
`29`	`27`	`{`
`30`		`- public readonly List<AccessStep> Prefix = new List<AccessStep>();`
	`28`	`+ public readonly List<AccessStep> Prefix = new();`
`31`	`29`	`public AccessStep Last { get; private set; }`
`32`	`30`
`33`	`31`	`public AccessStepPack Add(string identifier, Microsoft.CodeAnalysis.Location location)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`3`	`3`	`using Microsoft.CodeAnalysis.CSharp;`
`4`	`4`	`using Semmle.Extraction.Kinds;`
`5`		`-using Semmle.Extraction.Entities;`
`6`	`5`
`7`	`6`	`namespace Semmle.Extraction.CSharp.Entities.Expressions`
`8`	`7`	`{`