huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename OpenComponentElement -> OpenComponent for consistency

This commit is contained in:
Steve Sanderson 2018-02-05 00:19:44 +00:00
parent 1fda744770
commit 93f17219ea
5 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs
View File

@ -228,7 +228,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation.Engine
if (TryGetComponentTypeNameFromTagName(tagNameOriginalCase, out var componentTypeName)) if (TryGetComponentTypeNameFromTagName(tagNameOriginalCase, out var componentTypeName))
{ {
codeWriter codeWriter
.WriteStartMethodInvocation($"{builderVarName}.{nameof(RenderTreeBuilder.OpenComponentElement)}<{componentTypeName}>") .WriteStartMethodInvocation($"{builderVarName}.{nameof(RenderTreeBuilder.OpenComponent)}<{componentTypeName}>")
.Write((_sourceSequence++).ToString()) .Write((_sourceSequence++).ToString())
.WriteEndMethodInvocation(); .WriteEndMethodInvocation();
isComponent = true; isComponent = true;

4
src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeBuilder.cs
View File

@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Blazor.RenderTree
/// <summary> /// <summary>
/// Marks a previously appended component frame as closed. Calls to this method /// Marks a previously appended component frame as closed. Calls to this method
/// must be balanced with calls to <see cref="OpenComponentElement{TComponent}"/>. /// must be balanced with calls to <see cref="OpenComponent{TComponent}"/>.
/// </summary> /// </summary>
public void CloseComponent() public void CloseComponent()
{ {
@ -153,7 +153,7 @@ namespace Microsoft.AspNetCore.Blazor.RenderTree
/// </summary> /// </summary>
/// <typeparam name="TComponent">The type of the child component.</typeparam> /// <typeparam name="TComponent">The type of the child component.</typeparam>
/// <param name="sequence">An integer that represents the position of the instruction in the source code.</param> /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
public void OpenComponentElement<TComponent>(int sequence) where TComponent : IComponent public void OpenComponent<TComponent>(int sequence) where TComponent : IComponent
{ {
// Currently, child components can't have further grandchildren of their own, so it would // 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. // technically be possible to skip their CloseElement calls and not track them in _openElementIndices.

4
test/Microsoft.AspNetCore.Blazor.Test/RenderTreeBuilderTest.cs
View File

@ -253,11 +253,11 @@ namespace Microsoft.AspNetCore.Blazor.Test
// Act // Act
builder.OpenElement(10, "parent"); // 0: <parent> builder.OpenElement(10, "parent"); // 0: <parent>
builder.OpenComponentElement<TestComponent>(11); // 1: <testcomponent builder.OpenComponent<TestComponent>(11); // 1: <testcomponent
builder.AddAttribute(12, "child1attribute1", "A"); // 2: child1attribute1="A" builder.AddAttribute(12, "child1attribute1", "A"); // 2: child1attribute1="A"
builder.AddAttribute(13, "child1attribute2", "B"); // 3: child1attribute2="B"> builder.AddAttribute(13, "child1attribute2", "B"); // 3: child1attribute2="B">
builder.CloseComponent(); // </testcomponent> builder.CloseComponent(); // </testcomponent>
builder.OpenComponentElement<TestComponent>(14); // 4: <testcomponent builder.OpenComponent<TestComponent>(14); // 4: <testcomponent
builder.AddAttribute(15, "child2attribute", "C"); // 5: child2attribute="C"> builder.AddAttribute(15, "child2attribute", "C"); // 5: child2attribute="C">
builder.CloseComponent(); // </testcomponent> builder.CloseComponent(); // </testcomponent>
builder.CloseElement(); // </parent> builder.CloseElement(); // </parent>

52
test/Microsoft.AspNetCore.Blazor.Test/RenderTreeDiffComputerTest.cs
View File

@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
builder.AddAttribute(1, "My attribute", "My value"); builder.AddAttribute(1, "My attribute", "My value");
builder.CloseElement(); builder.CloseElement();
}, },
builder => builder.OpenComponentElement<FakeComponent>(0) builder => builder.OpenComponent<FakeComponent>(0)
}.Select(x => new object[] { x }); }.Select(x => new object[] { x });
[Fact] [Fact]
@ -312,8 +312,8 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesComponentTypeChangesAtSameSequenceNumber() public void RecognizesComponentTypeChangesAtSameSequenceNumber()
{ {
// Arrange // Arrange
oldTree.OpenComponentElement<FakeComponent>(123); oldTree.OpenComponent<FakeComponent>(123);
newTree.OpenComponentElement<FakeComponent2>(123); newTree.OpenComponent<FakeComponent2>(123);
// Act // Act
var renderBatch = GetRenderedBatch(); var renderBatch = GetRenderedBatch();
@ -585,9 +585,9 @@ namespace Microsoft.AspNetCore.Blazor.Test
oldTree.CloseElement(); // </container> oldTree.CloseElement(); // </container>
newTree.AddText(10, "text1"); // 0: text1 newTree.AddText(10, "text1"); // 0: text1
newTree.OpenElement(11, "container"); // 1: <container> newTree.OpenElement(11, "container"); // 1: <container>
newTree.OpenComponentElement<FakeComponent>(12); // 2: <FakeComponent> newTree.OpenComponent<FakeComponent>(12); // 2: <FakeComponent>
newTree.CloseComponent(); // </FakeComponent> newTree.CloseComponent(); // </FakeComponent>
newTree.OpenComponentElement<FakeComponent2>(13); // 3: <FakeComponent2> newTree.OpenComponent<FakeComponent2>(13); // 3: <FakeComponent2>
newTree.CloseComponent(); // </FakeComponent2> newTree.CloseComponent(); // </FakeComponent2>
newTree.CloseElement(); // </container> newTree.CloseElement(); // </container>
@ -641,7 +641,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
{ {
// Arrange // Arrange
var testObject = new object(); var testObject = new object();
newTree.OpenComponentElement<FakeComponent>(0); newTree.OpenComponent<FakeComponent>(0);
newTree.AddAttribute(1, nameof(FakeComponent.IntProperty), 123); newTree.AddAttribute(1, nameof(FakeComponent.IntProperty), 123);
newTree.AddAttribute(2, nameof(FakeComponent.StringProperty), "some string"); newTree.AddAttribute(2, nameof(FakeComponent.StringProperty), "some string");
newTree.AddAttribute(3, nameof(FakeComponent.ObjectProperty), testObject); newTree.AddAttribute(3, nameof(FakeComponent.ObjectProperty), testObject);
@ -667,7 +667,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
{ {
// Arrange // Arrange
var testObject = new object(); var testObject = new object();
newTree.OpenComponentElement<FakeComponent>(0); newTree.OpenComponent<FakeComponent>(0);
newTree.AddAttribute(1, "SomeUnknownProperty", 123); newTree.AddAttribute(1, "SomeUnknownProperty", 123);
newTree.CloseComponent(); newTree.CloseComponent();
@ -684,7 +684,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
{ {
// Arrange // Arrange
var testObject = new object(); var testObject = new object();
newTree.OpenComponentElement<FakeComponent>(0); newTree.OpenComponent<FakeComponent>(0);
newTree.AddAttribute(1, nameof(FakeComponent.ReadonlyProperty), 123); newTree.AddAttribute(1, nameof(FakeComponent.ReadonlyProperty), 123);
newTree.CloseComponent(); newTree.CloseComponent();
@ -703,16 +703,16 @@ namespace Microsoft.AspNetCore.Blazor.Test
// Arrange // Arrange
oldTree.AddText(10, "text1"); // 0: text1 oldTree.AddText(10, "text1"); // 0: text1
oldTree.OpenElement(11, "container"); // 1: <container> oldTree.OpenElement(11, "container"); // 1: <container>
oldTree.OpenComponentElement<FakeComponent>(12); // 2: <FakeComponent> oldTree.OpenComponent<FakeComponent>(12); // 2: <FakeComponent>
oldTree.CloseComponent(); // </FakeComponent> oldTree.CloseComponent(); // </FakeComponent>
oldTree.OpenComponentElement<FakeComponent2>(13); // 3: <FakeComponent2> oldTree.OpenComponent<FakeComponent2>(13); // 3: <FakeComponent2>
oldTree.CloseComponent(); // </FakeComponent2> oldTree.CloseComponent(); // </FakeComponent2>
oldTree.CloseElement(); // </container> oldTree.CloseElement(); // </container>
newTree.AddText(10, "text1"); // 0: text1 newTree.AddText(10, "text1"); // 0: text1
newTree.OpenElement(11, "container"); // 1: <container> newTree.OpenElement(11, "container"); // 1: <container>
newTree.OpenComponentElement<FakeComponent>(12); // 2: <FakeComponent> newTree.OpenComponent<FakeComponent>(12); // 2: <FakeComponent>
newTree.CloseComponent(); // </FakeComponent> newTree.CloseComponent(); // </FakeComponent>
newTree.OpenComponentElement<FakeComponent2>(13); // 3: <FakeComponent2> newTree.OpenComponent<FakeComponent2>(13); // 3: <FakeComponent2>
newTree.CloseComponent(); // </FakeComponent2> newTree.CloseComponent(); // </FakeComponent2>
newTree.CloseElement(); // </container newTree.CloseElement(); // </container
@ -738,11 +738,11 @@ namespace Microsoft.AspNetCore.Blazor.Test
{ {
// Arrange // Arrange
var objectWillNotChange = new object(); var objectWillNotChange = new object();
oldTree.OpenComponentElement<FakeComponent>(12); oldTree.OpenComponent<FakeComponent>(12);
oldTree.AddAttribute(13, nameof(FakeComponent.StringProperty), "String will change"); oldTree.AddAttribute(13, nameof(FakeComponent.StringProperty), "String will change");
oldTree.AddAttribute(14, nameof(FakeComponent.ObjectProperty), objectWillNotChange); oldTree.AddAttribute(14, nameof(FakeComponent.ObjectProperty), objectWillNotChange);
oldTree.CloseComponent(); oldTree.CloseComponent();
newTree.OpenComponentElement<FakeComponent>(12); newTree.OpenComponent<FakeComponent>(12);
newTree.AddAttribute(13, nameof(FakeComponent.StringProperty), "String did change"); newTree.AddAttribute(13, nameof(FakeComponent.StringProperty), "String did change");
newTree.AddAttribute(14, nameof(FakeComponent.ObjectProperty), objectWillNotChange); newTree.AddAttribute(14, nameof(FakeComponent.ObjectProperty), objectWillNotChange);
newTree.CloseComponent(); newTree.CloseComponent();
@ -766,7 +766,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void NotifiesIHandlePropertiesChangedBeforeFirstRender() public void NotifiesIHandlePropertiesChangedBeforeFirstRender()
{ {
// Arrange // Arrange
newTree.OpenComponentElement<HandlePropertiesChangedComponent>(0); newTree.OpenComponent<HandlePropertiesChangedComponent>(0);
newTree.CloseComponent(); newTree.CloseComponent();
// Act // Act
@ -784,13 +784,13 @@ namespace Microsoft.AspNetCore.Blazor.Test
// Arrange // Arrange
var newTree1 = new RenderTreeBuilder(renderer); var newTree1 = new RenderTreeBuilder(renderer);
var newTree2 = new RenderTreeBuilder(renderer); var newTree2 = new RenderTreeBuilder(renderer);
oldTree.OpenComponentElement<HandlePropertiesChangedComponent>(0); oldTree.OpenComponent<HandlePropertiesChangedComponent>(0);
oldTree.AddAttribute(1, nameof(HandlePropertiesChangedComponent.IntProperty), 123); oldTree.AddAttribute(1, nameof(HandlePropertiesChangedComponent.IntProperty), 123);
oldTree.CloseComponent(); oldTree.CloseComponent();
newTree1.OpenComponentElement<HandlePropertiesChangedComponent>(0); newTree1.OpenComponent<HandlePropertiesChangedComponent>(0);
newTree1.AddAttribute(1, nameof(HandlePropertiesChangedComponent.IntProperty), 123); newTree1.AddAttribute(1, nameof(HandlePropertiesChangedComponent.IntProperty), 123);
newTree1.CloseComponent(); newTree1.CloseComponent();
newTree2.OpenComponentElement<HandlePropertiesChangedComponent>(0); newTree2.OpenComponent<HandlePropertiesChangedComponent>(0);
newTree2.AddAttribute(1, nameof(HandlePropertiesChangedComponent.IntProperty), 456); newTree2.AddAttribute(1, nameof(HandlePropertiesChangedComponent.IntProperty), 456);
newTree2.CloseComponent(); newTree2.CloseComponent();
@ -819,14 +819,14 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void CallsDisposeOnlyOnRemovedChildComponents() public void CallsDisposeOnlyOnRemovedChildComponents()
{ {
// Arrange // Arrange
oldTree.OpenComponentElement<DisposableComponent>(10); // <DisposableComponent> oldTree.OpenComponent<DisposableComponent>(10); // <DisposableComponent>
oldTree.CloseComponent(); // </DisposableComponent> oldTree.CloseComponent(); // </DisposableComponent>
oldTree.OpenComponentElement<NonDisposableComponent>(20); // <NonDisposableComponent> oldTree.OpenComponent<NonDisposableComponent>(20); // <NonDisposableComponent>
oldTree.CloseComponent(); // </NonDisposableComponent> oldTree.CloseComponent(); // </NonDisposableComponent>
oldTree.OpenComponentElement<DisposableComponent>(30); // <DisposableComponent> oldTree.OpenComponent<DisposableComponent>(30); // <DisposableComponent>
oldTree.CloseComponent(); // </DisposableComponent> oldTree.CloseComponent(); // </DisposableComponent>
newTree.OpenComponentElement<DisposableComponent>(30); // <DisposableComponent> newTree.OpenComponent<DisposableComponent>(30); // <DisposableComponent>
newTree.CloseComponent(); // </DisposableComponent> newTree.CloseComponent(); // </DisposableComponent>
diff.ApplyNewRenderTreeVersion(new RenderBatchBuilder(), 0, new RenderTreeBuilder(renderer).GetFrames(), oldTree.GetFrames()); diff.ApplyNewRenderTreeVersion(new RenderBatchBuilder(), 0, new RenderTreeBuilder(renderer).GetFrames(), oldTree.GetFrames());
var disposableComponent1 = (DisposableComponent)oldTree.GetFrames().Array[0].Component; var disposableComponent1 = (DisposableComponent)oldTree.GetFrames().Array[0].Component;

18
test/Microsoft.AspNetCore.Blazor.Test/RendererTest.cs
View File

@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var component = new TestComponent(builder => var component = new TestComponent(builder =>
{ {
builder.AddText(0, "Hello"); builder.AddText(0, "Hello");
builder.OpenComponentElement<MessageComponent>(1); builder.OpenComponent<MessageComponent>(1);
builder.AddAttribute(2, nameof(MessageComponent.Message), "Nested component output"); builder.AddAttribute(2, nameof(MessageComponent.Message), "Nested component output");
builder.CloseComponent(); builder.CloseComponent();
}); });
@ -91,7 +91,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var renderer = new TestRenderer(); var renderer = new TestRenderer();
var parentComponent = new TestComponent(builder => var parentComponent = new TestComponent(builder =>
{ {
builder.OpenComponentElement<MessageComponent>(0); builder.OpenComponent<MessageComponent>(0);
builder.CloseComponent(); builder.CloseComponent();
}); });
var parentComponentId = renderer.AssignComponentId(parentComponent); var parentComponentId = renderer.AssignComponentId(parentComponent);
@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var renderer = new TestRenderer(); var renderer = new TestRenderer();
var parentComponent = new TestComponent(builder => var parentComponent = new TestComponent(builder =>
{ {
builder.OpenComponentElement<EventComponent>(0); builder.OpenComponent<EventComponent>(0);
builder.CloseComponent(); builder.CloseComponent();
}); });
var parentComponentId = renderer.AssignComponentId(parentComponent); var parentComponentId = renderer.AssignComponentId(parentComponent);
@ -306,7 +306,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var component = new TestComponent(builder => var component = new TestComponent(builder =>
{ {
builder.AddText(0, message); builder.AddText(0, message);
builder.OpenComponentElement<MessageComponent>(1); builder.OpenComponent<MessageComponent>(1);
builder.CloseComponent(); builder.CloseComponent();
}); });
@ -336,7 +336,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var firstRender = true; var firstRender = true;
var component = new TestComponent(builder => var component = new TestComponent(builder =>
{ {
builder.OpenComponentElement<FakeComponent>(1); builder.OpenComponent<FakeComponent>(1);
builder.AddAttribute(2, nameof(FakeComponent.IntProperty), firstRender ? 123 : 256); builder.AddAttribute(2, nameof(FakeComponent.IntProperty), firstRender ? 123 : 256);
builder.AddAttribute(3, nameof(FakeComponent.ObjectProperty), objectThatWillNotChange); builder.AddAttribute(3, nameof(FakeComponent.ObjectProperty), objectThatWillNotChange);
builder.AddAttribute(4, nameof(FakeComponent.StringProperty), firstRender ? "String that will change" : "String that did change"); builder.AddAttribute(4, nameof(FakeComponent.StringProperty), firstRender ? "String that will change" : "String that did change");
@ -378,7 +378,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var firstRender = true; var firstRender = true;
var component = new TestComponent(builder => var component = new TestComponent(builder =>
{ {
builder.OpenComponentElement<MessageComponent>(1); builder.OpenComponent<MessageComponent>(1);
builder.AddAttribute(2, nameof(MessageComponent.Message), firstRender ? "first" : "second"); builder.AddAttribute(2, nameof(MessageComponent.Message), firstRender ? "first" : "second");
builder.CloseComponent(); builder.CloseComponent();
}); });
@ -413,12 +413,12 @@ namespace Microsoft.AspNetCore.Blazor.Test
builder.OpenElement(7, "some element"); builder.OpenElement(7, "some element");
if (firstRender) if (firstRender)
{ {
builder.OpenComponentElement<FakeComponent>(100); builder.OpenComponent<FakeComponent>(100);
builder.CloseComponent(); builder.CloseComponent();
builder.OpenComponentElement<FakeComponent>(150); builder.OpenComponent<FakeComponent>(150);
builder.CloseComponent(); builder.CloseComponent();
} }
builder.OpenComponentElement<FakeComponent>(200); builder.OpenComponent<FakeComponent>(200);
builder.CloseComponent(); builder.CloseComponent();
builder.CloseElement(); builder.CloseElement();
}); });