Skip to content

Commit 383d2b0

Browse files
authored
Refactor attribute parsing (#3)
1 parent ea058e2 commit 383d2b0

File tree

52 files changed

+905
-518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+905
-518
lines changed

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ Document -
5353
IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
5454
IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp - }
5555
HtmlContent - (159:7,36 [5] Basic.cshtml)
56-
IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html - />
56+
IntermediateToken - (159:7,36 [1] Basic.cshtml) - Html -
57+
IntermediateToken - (160:7,37 [2] Basic.cshtml) - Html - />
5758
IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
5859
Inject -
5960
Inject -

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@ Document -
4141
IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp - \n Layout = "_SectionTestLayout.cshtml";\n
4242
HtmlContent - (117:7,0 [26] Sections.cshtml)
4343
IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
44-
IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
44+
IntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
45+
IntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
4546
IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
4647
IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
4748
IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
4849
Section - - Section1
4950
HtmlContent - (162:10,19 [43] Sections.cshtml)
5051
IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n
51-
IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
52+
IntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
53+
IntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
5254
IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
5355
IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
5456
IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ Document -
5555
IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
5656
IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp - }
5757
HtmlContent - (159:7,36 [5] Basic.cshtml)
58-
IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html - />
58+
IntermediateToken - (159:7,36 [1] Basic.cshtml) - Html -
59+
IntermediateToken - (160:7,37 [2] Basic.cshtml) - Html - />
5960
IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
6061
Inject -
6162
Inject -

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ Document -
6565
CSharpCode -
6666
IntermediateToken - - CSharp - BeginContext(159, 5, true);
6767
HtmlContent - (159:7,36 [5] Basic.cshtml)
68-
IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html - />
68+
IntermediateToken - (159:7,36 [1] Basic.cshtml) - Html -
69+
IntermediateToken - (160:7,37 [2] Basic.cshtml) - Html - />
6970
IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
7071
CSharpCode -
7172
IntermediateToken - - CSharp - EndContext();

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ Document -
3333
MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
3434
HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
3535
IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
36-
IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
36+
IntermediateToken - (14:2,0 [3] MalformedPageDirective.cshtml) - Html - <h1
37+
IntermediateToken - (17:2,3 [1] MalformedPageDirective.cshtml) - Html - >
3738
IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
3839
IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
3940
IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
40-
IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
41+
IntermediateToken - (33:3,0 [2] MalformedPageDirective.cshtml) - Html - <p
42+
IntermediateToken - (35:3,2 [1] MalformedPageDirective.cshtml) - Html - >
4143
IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
4244
IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
4345
Inject -

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ Document -
1818
IntermediateToken - - CSharp - BeginContext(6, 49, true);
1919
HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
2020
IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
21-
IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
21+
IntermediateToken - (14:2,0 [3] MalformedPageDirective.cshtml) - Html - <h1
22+
IntermediateToken - (17:2,3 [1] MalformedPageDirective.cshtml) - Html - >
2223
IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
2324
IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
2425
IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
25-
IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
26+
IntermediateToken - (33:3,0 [2] MalformedPageDirective.cshtml) - Html - <p
27+
IntermediateToken - (35:3,2 [1] MalformedPageDirective.cshtml) - Html - >
2628
IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
2729
IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
2830
CSharpCode -

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ Document -
3232
IntermediateToken - - CSharp - #pragma warning restore 0414
3333
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
3434
HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
35-
IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
35+
IntermediateToken - (34:2,0 [3] PageWithNamespace.cshtml) - Html - <h1
36+
IntermediateToken - (37:2,3 [1] PageWithNamespace.cshtml) - Html - >
3637
IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
3738
IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
3839
IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ Document -
1616
CSharpCode -
1717
IntermediateToken - - CSharp - BeginContext(34, 20, true);
1818
HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
19-
IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
19+
IntermediateToken - (34:2,0 [3] PageWithNamespace.cshtml) - Html - <h1
20+
IntermediateToken - (37:2,3 [1] PageWithNamespace.cshtml) - Html - >
2021
IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
2122
IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
2223
IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ Document -
3131
IntermediateToken - - CSharp - #pragma warning restore 0414
3232
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
3333
HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
34-
IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
34+
IntermediateToken - (0:0,0 [4] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div
35+
IntermediateToken - (4:0,4 [1] RazorPageWithNoLeadingPageDirective.cshtml) - Html - >
3536
IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
3637
IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
3738
IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ Document -
1616
CSharpCode -
1717
IntermediateToken - - CSharp - BeginContext(0, 28, true);
1818
HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
19-
IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
19+
IntermediateToken - (0:0,0 [4] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div
20+
IntermediateToken - (4:0,4 [1] RazorPageWithNoLeadingPageDirective.cshtml) - Html - >
2021
IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
2122
IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
2223
IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n

0 commit comments

Comments
 (0)