Skip to content

Commit 383d2b0

Browse files
ajaybhargavbajaybhargavb
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

+2-1
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

+4-2
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

+2-1
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

+2-1
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

+4-2
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

+4-2
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

+2-1
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

+2-1
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

+2-1
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

+2-1
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

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ Document -
4040
IntermediateToken - (77:3,42 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
4141
HtmlContent - (191:10,1 [21] RazorPagesWithRouteTemplate.cshtml)
4242
IntermediateToken - (191:10,1 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
43-
IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
43+
IntermediateToken - (195:12,0 [3] RazorPagesWithRouteTemplate.cshtml) - Html - <h1
44+
IntermediateToken - (198:12,3 [1] RazorPagesWithRouteTemplate.cshtml) - Html - >
4445
IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer
4546
CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
4647
IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ Document -
3131
IntermediateToken - - CSharp - BeginContext(193, 19, true);
3232
HtmlContent - (193:11,0 [19] RazorPagesWithRouteTemplate.cshtml)
3333
IntermediateToken - (193:11,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
34-
IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
34+
IntermediateToken - (195:12,0 [3] RazorPagesWithRouteTemplate.cshtml) - Html - <h1
35+
IntermediateToken - (198:12,3 [1] RazorPagesWithRouteTemplate.cshtml) - Html - >
3536
IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer
3637
CSharpCode -
3738
IntermediateToken - - CSharp - EndContext();

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ Document -
4242
IntermediateToken - (79:3,42 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
4343
HtmlContent - (379:18,1 [77] RazorPagesWithoutModel.cshtml)
4444
IntermediateToken - (379:18,1 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
45-
IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
45+
IntermediateToken - (383:20,0 [3] RazorPagesWithoutModel.cshtml) - Html - <h1
46+
IntermediateToken - (386:20,3 [1] RazorPagesWithoutModel.cshtml) - Html - >
4647
IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
4748
IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
4849
IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
@@ -78,7 +79,8 @@ Document -
7879
IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n
7980
IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
8081
IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html - class="form-control"
81-
IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html - />
82+
IntermediateToken - (652:26,39 [1] RazorPagesWithoutModel.cshtml) - Html -
83+
IntermediateToken - (653:26,40 [2] RazorPagesWithoutModel.cshtml) - Html - />
8284
IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n
8385
IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
8486
IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html - class="text-danger"

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Document -
3636
IntermediateToken - - CSharp - BeginContext(381, 75, true);
3737
HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml)
3838
IntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
39-
IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
39+
IntermediateToken - (383:20,0 [3] RazorPagesWithoutModel.cshtml) - Html - <h1
40+
IntermediateToken - (386:20,3 [1] RazorPagesWithoutModel.cshtml) - Html - >
4041
IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
4142
IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
4243
IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
@@ -98,7 +99,8 @@ Document -
9899
IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n
99100
IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
100101
IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html - class="form-control"
101-
IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html - />
102+
IntermediateToken - (652:26,39 [1] RazorPagesWithoutModel.cshtml) - Html -
103+
IntermediateToken - (653:26,40 [2] RazorPagesWithoutModel.cshtml) - Html - />
102104
IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n
103105
IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
104106
IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html - class="text-danger"

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,16 @@ Document -
4343
IntermediateToken - (96:4,42 [4] RazorPages.cshtml) - Html - \n\n
4444
HtmlContent - (473:22,1 [78] RazorPages.cshtml)
4545
IntermediateToken - (473:22,1 [4] RazorPages.cshtml) - Html - \n\n
46-
IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
46+
IntermediateToken - (477:24,0 [3] RazorPages.cshtml) - Html - <h1
47+
IntermediateToken - (480:24,3 [1] RazorPages.cshtml) - Html - >
4748
IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
4849
IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
4950
IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
5051
IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
5152
IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html - method="post"
5253
IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html - class="form-horizontal"
53-
IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html - >
54+
IntermediateToken - (543:25,43 [1] RazorPages.cshtml) - Html -
55+
IntermediateToken - (544:25,44 [1] RazorPages.cshtml) - Html - >
5456
IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n
5557
TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
5658
DefaultTagHelperBody -
@@ -79,7 +81,8 @@ Document -
7981
IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n
8082
IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
8183
IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html - class="form-control"
82-
IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html - />
84+
IntermediateToken - (753:30,39 [1] RazorPages.cshtml) - Html -
85+
IntermediateToken - (754:30,40 [2] RazorPages.cshtml) - Html - />
8386
IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n
8487
IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
8588
IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html - class="text-danger"

0 commit comments

Comments
 (0)