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

Set ParserContext.StartOfLine to true when parsing starts (dotnet/aspnetcore-tooling#116) 

* Set ParserContext.StartOfLine to true when parsing starts

* Missed baselines
\n\nCommit migrated from a80c3a981a
This commit is contained in:
Ajay Bhargav Baaskaran 2019-01-14 14:17:22 -08:00 committed by GitHub
parent d5e9a153c7
commit 56695d17c9
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
View File

@ -34,8 +34,8 @@ Document -
CSharpCode -
IntermediateToken - - CSharp - #pragma warning restore 0414
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (87:2,0 [6] IncompleteDirectives.cshtml) - model
DirectiveToken - (93:2,6 [0] IncompleteDirectives.cshtml) -
HtmlContent - (93:2,6 [2] IncompleteDirectives.cshtml)

4
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
View File

@ -38,8 +38,8 @@ Document -
CSharpCode -
IntermediateToken - - CSharp - #pragma warning restore 0414
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)

4
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
View File

@ -19,8 +19,8 @@ namespace AspNetCore
#pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync()
{
BeginContext(83, 4, true);
WriteLiteral("\r\n\r\n");
BeginContext(85, 2, true);
WriteLiteral("\r\n");
EndContext();
BeginContext(108, 5, true);
WriteLiteral("\"\r\n\r\n");

6
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
View File

@ -14,9 +14,9 @@ Document -
ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page -
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
CSharpCode -
IntermediateToken - - CSharp - BeginContext(83, 4, true);
HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
IntermediateToken - - CSharp - BeginContext(85, 2, true);
HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
CSharpCode -
IntermediateToken - - CSharp - EndContext();
MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page

4
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
View File

@ -38,8 +38,8 @@ Document -
CSharpCode -
IntermediateToken - - CSharp - #pragma warning restore 0414
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
View File

@ -18,7 +18,7 @@ namespace AspNetCore
#pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync()
{
WriteLiteral("\r\n\r\n");
WriteLiteral("\r\n");
WriteLiteral("\"\r\n\r\n");
WriteLiteral("\r\n");
WriteLiteral("\r\n\r\n");

4
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
View File

@ -11,8 +11,8 @@ Document -
RazorSourceChecksumAttribute -
ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page -
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)

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

@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
public bool InTemplateContext { get; set; }
public bool StartOfLine { get; set; }
public bool StartOfLine { get; set; } = true;
public AcceptedCharactersInternal LastAcceptedCharacters { get; set; } = AcceptedCharactersInternal.None;