From 300e7c2e550b126dae2a54c42e59185128e34717 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 16 May 2017 16:48:01 -0700 Subject: [PATCH] Make extensible directive type token rendering allow value types. - Instead of rendering a null assigning statement for a type token we now render a `default(TTypeToken)`. With this approach type tokens can be value types without creating a design time error. - Re-generated baseline files to reflect new directive token code generation. #1176 --- .../DesignTimeDirectiveTargetExtension.cs | 6 ++++-- .../IncompleteDirectives_DesignTime.codegen.cs | 2 +- .../InheritsViewModel_DesignTime.codegen.cs | 4 ++-- .../InheritsViewModel_DesignTime.mappings.txt | 2 +- ...InheritsWithViewImports_DesignTime.codegen.cs | 2 +- .../InjectWithModel_DesignTime.codegen.cs | 6 +++--- .../InjectWithModel_DesignTime.mappings.txt | 8 ++++---- .../InjectWithSemicolon_DesignTime.codegen.cs | 10 +++++----- .../InjectWithSemicolon_DesignTime.mappings.txt | 16 ++++++++-------- .../Inject_DesignTime.codegen.cs | 2 +- .../Inject_DesignTime.mappings.txt | 2 +- ...odelExpressionTagHelper_DesignTime.codegen.cs | 2 +- .../Model_DesignTime.codegen.cs | 2 +- .../MultipleModels_DesignTime.codegen.cs | 4 ++-- .../MultipleModels_DesignTime.mappings.txt | 2 +- .../RazorPages_DesignTime.codegen.cs | 2 +- .../RazorPages_DesignTime.mappings.txt | 6 +++--- .../_ViewImports_DesignTime.codegen.cs | 2 +- .../_ViewImports_DesignTime.mappings.txt | 2 +- .../DesignTimeDirectiveTargetExtensionTest.cs | 2 +- .../Inherits_DesignTime.codegen.cs | 2 +- .../Inherits_DesignTime.mappings.txt | 2 +- 22 files changed, 45 insertions(+), 43 deletions(-) diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeDirectiveTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeDirectiveTargetExtension.cs index 802a487f4..96b49c9ec 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeDirectiveTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeDirectiveTargetExtension.cs @@ -56,14 +56,16 @@ private void WriteDesignTimeDirectiveToken(CSharpRenderingContext context, Direc { case DirectiveTokenKind.Type: - // {node.Content} __typeHelper = null; + // {node.Content} __typeHelper = default({node.Content}); context.AddLineMappingFor(node); context.Writer .Write(node.Content) .Write(" ") .WriteStartAssignment(TypeHelper) - .WriteLine("null;"); + .Write("default(") + .Write(node.Content) + .WriteLine(");"); break; case DirectiveTokenKind.Member: diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs index 98270f3b4..c5ce5a237 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs @@ -14,7 +14,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Incomplete #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -MyService __typeHelper = null; +MyService __typeHelper = default(MyService); } ))(); } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs index cbfc6ffd4..404dcb5bd 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs @@ -14,11 +14,11 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsVi #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -MyBasePageForViews __typeHelper = null; +MyBasePageForViews __typeHelper = default(MyBasePageForViews); } ))(); ((System.Action)(() => { -MyModel __typeHelper = null; +MyModel __typeHelper = default(MyModel); } ))(); } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt index f81dba05b..0d0ccf8ba 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (602:16,0 [26] ) Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml) |MyModel| -Generated Location: (711:20,0 [7] ) +Generated Location: (742:20,0 [7] ) |MyModel| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs index 107028a72..fe92464e5 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs @@ -14,7 +14,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWi #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -MyModel __typeHelper = null; +MyModel __typeHelper = default(MyModel); } ))(); } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs index db8aaea1b..a737e0d11 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs @@ -14,11 +14,11 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWith #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -MyModel __typeHelper = null; +MyModel __typeHelper = default(MyModel); } ))(); ((System.Action)(() => { -MyApp __typeHelper = null; +MyApp __typeHelper = default(MyApp); } ))(); ((System.Action)(() => { @@ -26,7 +26,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWith } ))(); ((System.Action)(() => { -MyService __typeHelper = null; +MyService __typeHelper = default(MyService); } ))(); ((System.Action)(() => { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt index d7952909f..a6e455d81 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt @@ -5,21 +5,21 @@ Generated Location: (630:16,0 [7] ) Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml) |MyApp| -Generated Location: (720:20,0 [5] ) +Generated Location: (732:20,0 [5] ) |MyApp| Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml) |MyPropertyName| -Generated Location: (830:24,22 [14] ) +Generated Location: (852:24,22 [14] ) |MyPropertyName| Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml) |MyService| -Generated Location: (914:28,0 [17] ) +Generated Location: (936:28,0 [17] ) |MyService| Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml) |Html| -Generated Location: (1036:32,22 [4] ) +Generated Location: (1080:32,22 [4] ) |Html| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs index fc69262ae..d86a855e7 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs @@ -14,11 +14,11 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWith #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -MyModel __typeHelper = null; +MyModel __typeHelper = default(MyModel); } ))(); ((System.Action)(() => { -MyApp __typeHelper = null; +MyApp __typeHelper = default(MyApp); } ))(); ((System.Action)(() => { @@ -26,7 +26,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWith } ))(); ((System.Action)(() => { -MyService __typeHelper = null; +MyService __typeHelper = default(MyService); } ))(); ((System.Action)(() => { @@ -34,7 +34,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWith } ))(); ((System.Action)(() => { -MyApp __typeHelper = null; +MyApp __typeHelper = default(MyApp); } ))(); ((System.Action)(() => { @@ -42,7 +42,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWith } ))(); ((System.Action)(() => { -MyService __typeHelper = null; +MyService __typeHelper = default(MyService); } ))(); ((System.Action)(() => { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt index b204440de..65cdba489 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt @@ -5,41 +5,41 @@ Generated Location: (634:16,0 [7] ) Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml) |MyApp| -Generated Location: (724:20,0 [5] ) +Generated Location: (736:20,0 [5] ) |MyApp| Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml) |MyPropertyName| -Generated Location: (834:24,22 [14] ) +Generated Location: (856:24,22 [14] ) |MyPropertyName| Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml) |MyService| -Generated Location: (918:28,0 [17] ) +Generated Location: (940:28,0 [17] ) |MyService| Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml) |Html| -Generated Location: (1040:32,22 [4] ) +Generated Location: (1084:32,22 [4] ) |Html| Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml) |MyApp| -Generated Location: (1114:36,0 [5] ) +Generated Location: (1158:36,0 [5] ) |MyApp| Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml) |MyPropertyName2| -Generated Location: (1224:40,22 [15] ) +Generated Location: (1278:40,22 [15] ) |MyPropertyName2| Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml) |MyService| -Generated Location: (1309:44,0 [17] ) +Generated Location: (1363:44,0 [17] ) |MyService| Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml) |Html2| -Generated Location: (1431:48,22 [5] ) +Generated Location: (1507:48,22 [5] ) |Html2| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs index 1775af193..a1cfde9af 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs @@ -14,7 +14,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject_csh #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -MyApp __typeHelper = null; +MyApp __typeHelper = default(MyApp); } ))(); ((System.Action)(() => { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt index edcc46bfd..1c7b82c9f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (621:16,0 [5] ) Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml) |MyPropertyName| -Generated Location: (731:20,22 [14] ) +Generated Location: (741:20,22 [14] ) |MyPropertyName| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs index c047add55..05f63f2a4 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs @@ -14,7 +14,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpre #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -DateTime __typeHelper = null; +DateTime __typeHelper = default(DateTime); } ))(); ((System.Action)(() => { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs index ea02db168..a657a1b30 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs @@ -14,7 +14,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model_csht #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -System.Collections.IEnumerable __typeHelper = null; +System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable); } ))(); } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs index 364e2e532..9292279e9 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs @@ -14,11 +14,11 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleMo #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -ThisShouldBeGenerated __typeHelper = null; +ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated); } ))(); ((System.Action)(() => { -System.Collections.IEnumerable __typeHelper = null; +System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable); } ))(); } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt index fcd1f869f..28762ad4c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (652:16,0 [21] ) Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml) |System.Collections.IEnumerable| -Generated Location: (756:20,0 [30] ) +Generated Location: (782:20,0 [30] ) |System.Collections.IEnumerable| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs index 8b91b44c3..49681b3e6 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs @@ -19,7 +19,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -NewModel __typeHelper = null; +NewModel __typeHelper = default(NewModel); } ))(); ((System.Action)(() => { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt index 03dc4d521..bf8615fd8 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt @@ -10,12 +10,12 @@ Generated Location: (777:21,0 [8] ) Source Location: (40:3,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml) |"*, AppCode"| -Generated Location: (905:25,37 [12] ) +Generated Location: (918:25,37 [12] ) |"*, AppCode"| Source Location: (661:28,47 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml) |Model.Name| -Generated Location: (1441:37,47 [10] ) +Generated Location: (1454:37,47 [10] ) |Model.Name| Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml) @@ -36,7 +36,7 @@ Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegr public string Name { get; set; } } | -Generated Location: (1916:48,12 [360] ) +Generated Location: (1929:48,12 [360] ) | public class NewModel : PageModel { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs index bb34730ae..ca034a8e5 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs @@ -14,7 +14,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImpor #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -IHtmlHelper __typeHelper = null; +IHtmlHelper __typeHelper = default(IHtmlHelper); } ))(); ((System.Action)(() => { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt index 6ac7a052a..a6603cc1d 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (627:16,0 [19] ) Source Location: (28:0,28 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml) |Model| -Generated Location: (751:20,22 [5] ) +Generated Location: (775:20,22 [5] ) |Model| diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeDirectiveTargetExtensionTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeDirectiveTargetExtensionTest.cs index 32a4ea69a..4f2a736e9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeDirectiveTargetExtensionTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeDirectiveTargetExtensionTest.cs @@ -65,7 +65,7 @@ public void WriteDesignTimeDirective_WithTypeToken_WritesLambda() @"#pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -System.String __typeHelper = null; +System.String __typeHelper = default(System.String); } ))(); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs index cf72bb2c8..86dfe523a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs @@ -6,7 +6,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inherits_D #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -foo.bar>.boz __typeHelper = null; +foo.bar>.boz __typeHelper = default(foo.bar>.boz); } ))(); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt index a61a16a16..1f7df2332 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (349:8,0 [21] ) Source Location: (1:0,1 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml) |foo()| -Generated Location: (721:18,6 [5] ) +Generated Location: (747:18,6 [5] ) |foo()|