diff --git a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs b/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs index 1a44498c0f..fac56d764a 100644 --- a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs +++ b/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs @@ -232,7 +232,7 @@ namespace Microsoft.Blazor.Build.Core.RazorCompilation.Engine if (TryGetComponentTypeNameFromTagName(tagNameOriginalCase, out var componentTypeName)) { codeWriter - .WriteStartMethodInvocation($"{builderVarName}.{nameof(RenderTreeBuilder.AddComponentElement)}<{componentTypeName}>") + .WriteStartMethodInvocation($"{builderVarName}.{nameof(RenderTreeBuilder.OpenComponentElement)}<{componentTypeName}>") .Write((_sourceSequence++).ToString()) .WriteEndMethodInvocation(); } diff --git a/src/Microsoft.Blazor/RenderTree/RenderTreeBuilder.cs b/src/Microsoft.Blazor/RenderTree/RenderTreeBuilder.cs index 0c094249bd..2b2692be28 100644 --- a/src/Microsoft.Blazor/RenderTree/RenderTreeBuilder.cs +++ b/src/Microsoft.Blazor/RenderTree/RenderTreeBuilder.cs @@ -130,7 +130,7 @@ namespace Microsoft.Blazor.RenderTree /// /// The type of the child component. /// An integer that represents the position of the instruction in the source code. - public void AddComponentElement(int sequence) where TComponent : IComponent + public void OpenComponentElement(int sequence) where TComponent : IComponent { // Currently, child components can't have further grandchildren of their own, so it would // technically be possible to skip their CloseElement calls and not track them in _openElementIndices. diff --git a/test/Microsoft.Blazor.Test/RenderTreeBuilderTest.cs b/test/Microsoft.Blazor.Test/RenderTreeBuilderTest.cs index a2bac87d8f..fa6346425c 100644 --- a/test/Microsoft.Blazor.Test/RenderTreeBuilderTest.cs +++ b/test/Microsoft.Blazor.Test/RenderTreeBuilderTest.cs @@ -253,13 +253,13 @@ namespace Microsoft.Blazor.Test // Act builder.OpenElement(10, "parent"); // 0: - builder.AddComponentElement(11); // 1: (11); // 1: - builder.CloseElement(); - builder.AddComponentElement(14); // 4: - builder.CloseElement(); + builder.AddAttribute(13, "child1attribute2", "B"); // 3: child1attribute2="B"> + builder.CloseElement(); // + builder.OpenComponentElement(14); // 4: + builder.CloseElement(); // builder.CloseElement(); // // Assert diff --git a/test/Microsoft.Blazor.Test/RenderTreeDiffComputerTest.cs b/test/Microsoft.Blazor.Test/RenderTreeDiffComputerTest.cs index 19c7014896..4ba06a000f 100644 --- a/test/Microsoft.Blazor.Test/RenderTreeDiffComputerTest.cs +++ b/test/Microsoft.Blazor.Test/RenderTreeDiffComputerTest.cs @@ -43,7 +43,7 @@ namespace Microsoft.Blazor.Test builder.AddAttribute(1, "My attribute", "My value"); builder.CloseElement(); }, - builder => builder.AddComponentElement(0) + builder => builder.OpenComponentElement(0) }.Select(x => new object[] { x }); [Fact] @@ -350,8 +350,8 @@ namespace Microsoft.Blazor.Test var oldTree = new RenderTreeBuilder(renderer); var newTree = new RenderTreeBuilder(renderer); var diff = new RenderTreeDiffComputer(renderer); - oldTree.AddComponentElement(123); - newTree.AddComponentElement(123); + oldTree.OpenComponentElement(123); + newTree.OpenComponentElement(123); // Act var result = diff.ApplyNewRenderTreeVersion(oldTree.GetNodes(), newTree.GetNodes()); @@ -641,9 +641,9 @@ namespace Microsoft.Blazor.Test oldTree.CloseElement(); // newTree.AddText(10, "text1"); // 0: text1 newTree.OpenElement(11, "container"); // 1: - newTree.AddComponentElement(12); // 2: + newTree.OpenComponentElement(12); // 2: newTree.CloseElement(); // - newTree.AddComponentElement(13); // 3: + newTree.OpenComponentElement(13); // 3: newTree.CloseElement(); // newTree.CloseElement(); // @@ -684,16 +684,16 @@ namespace Microsoft.Blazor.Test var diff = new RenderTreeDiffComputer(renderer); oldTree.AddText(10, "text1"); // 0: text1 oldTree.OpenElement(11, "container"); // 1: - oldTree.AddComponentElement(12); // 2: + oldTree.OpenComponentElement(12); // 2: oldTree.CloseElement(); // - oldTree.AddComponentElement(13); // 3: + oldTree.OpenComponentElement(13); // 3: oldTree.CloseElement(); // oldTree.CloseElement(); // - newTree.AddComponentElement(12); // 2: + newTree.OpenComponentElement(12); // 2: newTree.CloseElement(); // - newTree.AddComponentElement(13); // 3: + newTree.OpenComponentElement(13); // 3: newTree.CloseElement(); // newTree.CloseElement(); // { builder.AddText(0, "Hello"); - builder.AddComponentElement(1); + builder.OpenComponentElement(1); builder.CloseElement(); }); @@ -95,7 +95,7 @@ namespace Microsoft.Blazor.Test var renderer = new TestRenderer(); var parentComponent = new TestComponent(builder => { - builder.AddComponentElement(0); + builder.OpenComponentElement(0); builder.CloseElement(); }); var parentComponentId = renderer.AssignComponentId(parentComponent); @@ -154,7 +154,7 @@ namespace Microsoft.Blazor.Test var renderer = new TestRenderer(); var parentComponent = new TestComponent(builder => { - builder.AddComponentElement(0); + builder.OpenComponentElement(0); builder.CloseElement(); }); var parentComponentId = renderer.AssignComponentId(parentComponent); @@ -310,7 +310,7 @@ namespace Microsoft.Blazor.Test var component = new TestComponent(builder => { builder.AddText(0, message); - builder.AddComponentElement(1); + builder.OpenComponentElement(1); builder.CloseElement(); });