Clean up MethodDeclarationIntermediateNode

DustinCampbell · DustinCampbell · commit 477ec6f2d437 · 2025-07-08T12:57:33.000-07:00
- Enable nullability
- Add constructors
- Make `IsPrimaryMethod` property read-only
- Remove unnecessary argument null check
- Lazily create `Children` collection
- Change `Modifiers` property to return an `ImmutableArray&lt;string&gt;` rather than an `IList&lt;string&gt;` (backed by a `List&lt;string&gt;`).
- Change `Parmeters` property to return an `ImmutableArray&lt;MethodParameter&gt;` rather than an `IList&lt;MethodParameter&gt;` (backed by a `List&lt;MethodParameter&gt;`).
- General clean up
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs
@@ -186,6 +186,6 @@ public void MvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()
 
         Assert.Equal("ExecuteAsync", methodNode.MethodName);
         Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);
-        Assert.Equal(["public", "async", "override"], methodNode.Modifiers);
+        Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);
     }
 }
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs
@@ -185,6 +185,6 @@ public void MvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()
 
         Assert.Equal("ExecuteAsync", methodNode.MethodName);
         Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);
-        Assert.Equal(["public", "async", "override"], methodNode.Modifiers);
+        Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);
     }
 }
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
@@ -295,7 +295,7 @@ public void RazorPageDocumentClassifierPass_SetsUpExecuteAsyncMethod()
 
         Assert.Equal("ExecuteAsync", methodNode.MethodName);
         Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);
-        Assert.Equal(["public", "async", "override"], methodNode.Modifiers);
+        Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);
     }
 
     [Fact]
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ConsolidatedMvcViewDocumentClassifierPassTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ConsolidatedMvcViewDocumentClassifierPassTest.cs
@@ -117,6 +117,6 @@ public void ConsolidatedMvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()
 
         Assert.Equal("ExecuteAsync", methodNode.MethodName);
         Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);
-        Assert.Equal(["public", "async", "override"], methodNode.Modifiers);
+        Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);
     }
 }
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs
@@ -185,6 +185,6 @@ public void MvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()
 
         Assert.Equal("ExecuteAsync", methodNode.MethodName);
         Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);
-        Assert.Equal(["public", "async", "override"], methodNode.Modifiers);
+        Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);
     }
 }
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
@@ -294,7 +294,7 @@ public void RazorPageDocumentClassifierPass_SetsUpExecuteAsyncMethod()
 
         Assert.Equal("ExecuteAsync", methodNode.MethodName);
         Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);
-        Assert.Equal(["public", "async", "override"], methodNode.Modifiers);
+        Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);
     }
 
     [Fact]
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultDocumentWriterTest.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultDocumentWriterTest.cs
@@ -306,31 +306,25 @@ public void WriteDocument_WritesMethod()
         var builder = IntermediateNodeBuilder.Create(document);
         builder.Add(new MethodDeclarationIntermediateNode()
         {
-            Modifiers =
-                {
-                    "internal",
-                    "virtual",
-                    "async",
-                },
+            Modifiers = ["internal", "virtual", "async"],
             MethodName = "TestMethod",
-            Parameters =
+            Parameters = [
+                new MethodParameter()
                 {
-                    new MethodParameter()
+                    Modifiers =
                     {
-                        Modifiers =
-                        {
-                            "readonly",
-                            "ref",
-                        },
-                        ParameterName = "a",
-                        TypeName = "int",
+                        "readonly",
+                        "ref",
                     },
-                    new MethodParameter()
-                    {
-                        ParameterName = "b",
-                        TypeName = "string",
-                    }
+                    ParameterName = "a",
+                    TypeName = "int",
                 },
+                new MethodParameter()
+                {
+                    ParameterName = "b",
+                    TypeName = "string",
+                }
+            ],
             ReturnType = "string",
         });
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
@@ -148,6 +148,6 @@ public void ComponentDocumentClassifierPass_SetsUpMainMethod()
 
         Assert.Equal(ComponentsApi.ComponentBase.BuildRenderTree, methodNode.MethodName);
         Assert.Equal("void", methodNode.ReturnType);
-        Assert.Equal(["protected", "override"], methodNode.Modifiers);
+        Assert.Equal<string>(["protected", "override"], methodNode.Modifiers);
     }
 }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs
@@ -29,10 +29,7 @@ public void FindPrimaryMethod_FindsMethodWithAnnotation()
     {
         // Arrange
         var document = new DocumentIntermediateNode();
-        var method = new MethodDeclarationIntermediateNode
-        {
-            IsPrimaryMethod = true
-        };
+        var method = new MethodDeclarationIntermediateNode(isPrimaryMethod: true);
 
         var builder = IntermediateNodeBuilder.Create(document);
         builder.Add(method);
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/CodeGeneration/DefaultDocumentWriter.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/CodeGeneration/DefaultDocumentWriter.cs
@@ -153,20 +153,18 @@ public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode no
 
             codeWriter.WriteLine("#pragma warning disable 1998");
 
-            for (var i = 0; i < node.Modifiers.Count; i++)
+            foreach (var modifier in node.Modifiers)
             {
-                codeWriter.Write($"{node.Modifiers[i]} ");
+                codeWriter.Write($"{modifier} ");
             }
 
             codeWriter.Write($"{node.ReturnType} ");
             codeWriter.Write($"{node.MethodName}(");
 
             var isFirst = true;
 
-            for (var i = 0; i < node.Parameters.Count; i++)
+            foreach (var parameter in node.Parameters)
             {
-                var parameter = node.Parameters[i];
-
                 if (isFirst)
                 {
                     isFirst = false;
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDocumentClassifierPass.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDocumentClassifierPass.cs
@@ -101,10 +101,8 @@ protected override void OnDocumentStructureCreated(
 
             method.ReturnType = "void";
             method.MethodName = "Execute";
-            method.Modifiers.Clear();
-            method.Modifiers.Add("protected");
-
-            method.Parameters.Clear();
+            method.UpdateModifiers("protected");
+            method.UpdateParameters([]);
         }
         else
         {
@@ -141,12 +139,9 @@ protected override void OnDocumentStructureCreated(
 
             method.ReturnType = "void";
             method.MethodName = ComponentsApi.ComponentBase.BuildRenderTree;
-            method.Modifiers.Clear();
-            method.Modifiers.Add("protected");
-            method.Modifiers.Add("override");
+            method.UpdateModifiers("protected", "override");
 
-            method.Parameters.Clear();
-            method.Parameters.Add(new MethodParameter()
+            method.UpdateParameters(new MethodParameter()
             {
                 ParameterName = ComponentsApi.RenderTreeBuilder.BuilderParameter,
                 TypeName = $"global::{ComponentsApi.RenderTreeBuilder.FullTypeName}",
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DocumentClassifierPassBase.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DocumentClassifierPassBase.cs
@@ -55,11 +55,7 @@ private void Rewrite(RazorCodeDocument codeDocument, DocumentIntermediateNode do
 
         var @namespace = new NamespaceDeclarationIntermediateNode(isPrimaryNamespace: true);
         var @class = new ClassDeclarationIntermediateNode(isPrimaryClass: true);
-
-        var method = new MethodDeclarationIntermediateNode
-        {
-            IsPrimaryMethod = true
-        };
+        var method = new MethodDeclarationIntermediateNode(isPrimaryMethod: true);
 
         var documentBuilder = IntermediateNodeBuilder.Create(documentNode);
 
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/MethodDeclarationIntermediateNode.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/MethodDeclarationIntermediateNode.cs
@@ -1,38 +1,47 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
-using System;
-using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
-using System.Text;
+using Microsoft.AspNetCore.Razor.PooledObjects;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate;
 
-public sealed class MethodDeclarationIntermediateNode : MemberDeclarationIntermediateNode
+public sealed class MethodDeclarationIntermediateNode(bool isPrimaryMethod = false) : MemberDeclarationIntermediateNode
 {
-    public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+    private IntermediateNodeCollection? _children;
+    private ImmutableArray<string> _modifiers = [];
+    private ImmutableArray<MethodParameter> _parameters = [];
 
-    public IList<string> Modifiers { get; } = new List<string>();
+    public bool IsPrimaryMethod { get; } = isPrimaryMethod;
 
-    public string MethodName { get; set; }
+    public ImmutableArray<string> Modifiers
+    {
+        get => _modifiers;
+        init => _modifiers = value.NullToEmpty();
+    }
 
-    public IList<MethodParameter> Parameters { get; } = new List<MethodParameter>();
+    public string? MethodName { get; set; }
 
-    public string ReturnType { get; set; }
+    public ImmutableArray<MethodParameter> Parameters
+    {
+        get => _parameters;
+        init => _parameters = value.NullToEmpty();
+    }
 
-    public bool IsPrimaryMethod { get; set; }
+    public string? ReturnType { get; set; }
 
-    public override void Accept(IntermediateNodeVisitor visitor)
-    {
-        if (visitor == null)
-        {
-            throw new ArgumentNullException(nameof(visitor));
-        }
+    public override IntermediateNodeCollection Children
+        => _children ??= [];
 
-        visitor.VisitMethodDeclaration(this);
-    }
+    public void UpdateModifiers(params ImmutableArray<string> modifiers)
+        => _modifiers = modifiers.NullToEmpty();
+
+    public void UpdateParameters(params ImmutableArray<MethodParameter> parameters)
+        => _parameters = parameters.NullToEmpty();
+
+    public override void Accept(IntermediateNodeVisitor visitor)
+        => visitor.VisitMethodDeclaration(this);
 
     public override void FormatNode(IntermediateNodeFormatter formatter)
     {
@@ -46,10 +55,11 @@ public override void FormatNode(IntermediateNodeFormatter formatter)
 
     private static string FormatMethodParameter(MethodParameter parameter)
     {
-        var builder = new StringBuilder();
-        for (var i = 0; i < parameter.Modifiers.Count; i++)
+        using var _ = StringBuilderPool.GetPooledObject(out var builder);
+
+        foreach (var modifier in parameter.Modifiers)
         {
-            builder.Append(parameter.Modifiers[i]);
+            builder.Append(modifier);
             builder.Append(' ');
         }
 
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorProjectEngine.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorProjectEngine.cs
@@ -400,9 +400,7 @@ private static void AddDefaultFeatures(ImmutableArray<IRazorFeature>.Builder fea
             method.MethodName = "ExecuteAsync";
             method.ReturnType = $"global::{typeof(Task).FullName}";
 
-            method.Modifiers.Add("public");
-            method.Modifiers.Add("async");
-            method.Modifiers.Add("override");
+            method.UpdateModifiers("public", "async", "override");
         });
     }
 
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version1_X/MvcViewDocumentClassifierPass.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version1_X/MvcViewDocumentClassifierPass.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X;
@@ -44,10 +43,7 @@ protected override void OnDocumentStructureCreated(
         @class.UpdateModifiers("public");
 
         method.MethodName = "ExecuteAsync";
-        method.Modifiers.Clear();
-        method.Modifiers.Add("public");
-        method.Modifiers.Add("async");
-        method.Modifiers.Add("override");
+        method.UpdateModifiers("public", "async", "override");
         method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
     }
 }
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/MvcViewDocumentClassifierPass.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/MvcViewDocumentClassifierPass.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X;
@@ -44,10 +43,7 @@ protected override void OnDocumentStructureCreated(
         @class.UpdateModifiers("public");
 
         method.MethodName = "ExecuteAsync";
-        method.Modifiers.Clear();
-        method.Modifiers.Add("public");
-        method.Modifiers.Add("async");
-        method.Modifiers.Add("override");
+        method.UpdateModifiers("public", "async", "override");
         method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
     }
 }
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/RazorPageDocumentClassifierPass.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/RazorPageDocumentClassifierPass.cs
@@ -73,10 +73,7 @@ protected override void OnDocumentStructureCreated(
         @class.UpdateModifiers("public");
 
         method.MethodName = "ExecuteAsync";
-        method.Modifiers.Clear();
-        method.Modifiers.Add("public");
-        method.Modifiers.Add("async");
-        method.Modifiers.Add("override");
+        method.UpdateModifiers("public", "async", "override");
         method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
 
         var document = codeDocument.GetRequiredDocumentNode();
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/MvcViewDocumentClassifierPass.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/MvcViewDocumentClassifierPass.cs
@@ -67,10 +67,7 @@ protected override void OnDocumentStructureCreated(
         @class.NullableContext = true;
 
         method.MethodName = "ExecuteAsync";
-        method.Modifiers.Clear();
-        method.Modifiers.Add("public");
-        method.Modifiers.Add("async");
-        method.Modifiers.Add("override");
+        method.UpdateModifiers("public", "async", "override");
         method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
     }
 }
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/RazorPageDocumentClassifierPass.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/RazorPageDocumentClassifierPass.cs
@@ -97,10 +97,7 @@ protected override void OnDocumentStructureCreated(
         @class.NullableContext = true;
 
         method.MethodName = "ExecuteAsync";
-        method.Modifiers.Clear();
-        method.Modifiers.Add("public");
-        method.Modifiers.Add("async");
-        method.Modifiers.Add("override");
+        method.UpdateModifiers("public", "async", "override");
         method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
 
         var document = codeDocument.GetRequiredDocumentNode();
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineBuilderExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineBuilderExtensions.cs
@@ -73,9 +73,7 @@ public static RazorProjectEngineBuilder ConfigureDocumentClassifier(this RazorPr
 
         feature.ConfigureMethod.Add((codeDocument, node) =>
         {
-            node.Modifiers.Clear();
-            node.Modifiers.Add("public");
-            node.Modifiers.Add("async");
+            node.UpdateModifiers("public", "async");
             node.MethodName = "ExecuteAsync";
             node.ReturnType = typeof(Task).FullName;
         });

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,6 @@ public void MvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()`
`186`	`186`
`187`	`187`	`Assert.Equal("ExecuteAsync", methodNode.MethodName);`
`188`	`188`	`Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);`
`189`		`- Assert.Equal(["public", "async", "override"], methodNode.Modifiers);`
	`189`	`+ Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);`
`190`	`190`	`}`
`191`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,6 @@ public void MvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()`
`185`	`185`
`186`	`186`	`Assert.Equal("ExecuteAsync", methodNode.MethodName);`
`187`	`187`	`Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);`
`188`		`- Assert.Equal(["public", "async", "override"], methodNode.Modifiers);`
	`188`	`+ Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);`
`189`	`189`	`}`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public void RazorPageDocumentClassifierPass_SetsUpExecuteAsyncMethod()`
`295`	`295`
`296`	`296`	`Assert.Equal("ExecuteAsync", methodNode.MethodName);`
`297`	`297`	`Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);`
`298`		`- Assert.Equal(["public", "async", "override"], methodNode.Modifiers);`
	`298`	`+ Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,6 @@ public void ConsolidatedMvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()`
`117`	`117`
`118`	`118`	`Assert.Equal("ExecuteAsync", methodNode.MethodName);`
`119`	`119`	`Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);`
`120`		`- Assert.Equal(["public", "async", "override"], methodNode.Modifiers);`
	`120`	`+ Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ public void RazorPageDocumentClassifierPass_SetsUpExecuteAsyncMethod()`
`294`	`294`
`295`	`295`	`Assert.Equal("ExecuteAsync", methodNode.MethodName);`
`296`	`296`	`Assert.Equal("global::System.Threading.Tasks.Task", methodNode.ReturnType);`
`297`		`- Assert.Equal(["public", "async", "override"], methodNode.Modifiers);`
	`297`	`+ Assert.Equal<string>(["public", "async", "override"], methodNode.Modifiers);`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,6 @@ public void ComponentDocumentClassifierPass_SetsUpMainMethod()`
`148`	`148`
`149`	`149`	`Assert.Equal(ComponentsApi.ComponentBase.BuildRenderTree, methodNode.MethodName);`
`150`	`150`	`Assert.Equal("void", methodNode.ReturnType);`
`151`		`- Assert.Equal(["protected", "override"], methodNode.Modifiers);`
	`151`	`+ Assert.Equal<string>(["protected", "override"], methodNode.Modifiers);`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,20 +153,18 @@ public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode no`
`153`	`153`
`154`	`154`	`codeWriter.WriteLine("#pragma warning disable 1998");`
`155`	`155`
`156`		`- for (var i = 0; i < node.Modifiers.Count; i++)`
	`156`	`+ foreach (var modifier in node.Modifiers)`
`157`	`157`	`{`
`158`		`- codeWriter.Write($"{node.Modifiers[i]} ");`
	`158`	`+ codeWriter.Write($"{modifier} ");`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`codeWriter.Write($"{node.ReturnType} ");`
`162`	`162`	`codeWriter.Write($"{node.MethodName}(");`
`163`	`163`
`164`	`164`	`var isFirst = true;`
`165`	`165`
`166`		`- for (var i = 0; i < node.Parameters.Count; i++)`
	`166`	`+ foreach (var parameter in node.Parameters)`
`167`	`167`	`{`
`168`		`- var parameter = node.Parameters[i];`
`169`		`-`
`170`	`168`	`if (isFirst)`
`171`	`169`	`{`
`172`	`170`	`isFirst = false;`