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

Link syntax tree Span nodes

This commit is contained in:
Ajay Bhargav Baaskaran 2017-10-10 10:27:51 -07:00
parent e3d2b48b89
commit f4e9ddad22
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockExtensions.cs → src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockExtensions.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Microsoft.AspNetCore.Razor.Language.Legacy

2
src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeBuilder.cs
View File

@ -88,6 +88,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var rootBuilder = _blockStack.Pop();
var root = rootBuilder.Build();
root.LinkNodes();
return root;
}
}

30
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorParserTest.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.IO;
using System.Linq;
using Xunit;
namespace Microsoft.AspNetCore.Razor.Language.Legacy
@ -21,9 +22,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
[Fact]
public void ParseMethodCallsParseDocumentOnMarkupParserAndReturnsResults()
{
var factory = new SpanFactory();
// Arrange
var factory = new SpanFactory();
var parser = new RazorParser();
// Act/Assert
@ -41,9 +41,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
[Fact]
public void ParseMethodUsesProvidedParserListenerIfSpecified()
{
var factory = new SpanFactory();
// Arrange
var factory = new SpanFactory();
var parser = new RazorParser();
// Act
@ -60,5 +59,28 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
.Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
factory.Markup(" baz")));
}
[Fact]
public void Parse_SyntaxTreeSpansAreLinked()
{
// Arrange
var factory = new SpanFactory();
var parser = new RazorParser();
// Act
var results = parser.Parse(TestRazorSourceDocument.Create("foo @bar baz"));
// Assert
var spans = results.Root.Flatten().ToArray();
for (var i = 0; i < spans.Length - 1; i++)
{
Assert.Same(spans[i + 1], spans[i].Next);
}
for (var i = spans.Length - 1; i > 0; i--)
{
Assert.Same(spans[i - 1], spans[i].Previous);
}
}
}
}