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

Suppress compilation errors for TModel in imports

This commit is contained in:
Ajay Bhargav Baaskaran 2017-03-28 15:19:41 -07:00
parent 56c2d76e03
commit 0b5113c76e
28 changed files with 212 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs
View File

@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
public static IRazorEngineBuilder Register(IRazorEngineBuilder builder) public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
{ {
builder.AddDirective(Directive); builder.AddDirective(Directive);
builder.Features.Add(new Pass()); builder.Features.Add(new Pass(builder.DesignTime));
return builder; return builder;
} }
@ -58,6 +58,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
internal class Pass : RazorIRPassBase, IRazorDirectiveClassifierPass internal class Pass : RazorIRPassBase, IRazorDirectiveClassifierPass
{ {
private readonly bool _designTime;
public Pass(bool designTime)
{
_designTime = designTime;
}
// Runs after the @inherits directive // Runs after the @inherits directive
public override int Order => 5; public override int Order => 5;
@ -66,6 +73,19 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var visitor = new Visitor(); var visitor = new Visitor();
var modelType = GetModelType(irDocument, visitor); var modelType = GetModelType(irDocument, visitor);
if (_designTime)
{
// Alias the TModel token to a known type ('object' if the model type is unknown).
// This allows design time compilation to succeed for Razor files where the token isn't replaced.
var typeName = modelType == "dynamic" ? $"global::{typeof(object).FullName}" : modelType;
var usingNode = new UsingStatementIRNode()
{
Content = $"TModel = {typeName}"
};
visitor.Namespace?.Children.Insert(0, usingNode);
}
var baseType = visitor.Class?.BaseType?.Replace("<TModel>", "<" + modelType + ">"); var baseType = visitor.Class?.BaseType?.Replace("<TModel>", "<" + modelType + ">");
for (var i = visitor.InheritsDirectives.Count - 1; i >= 0; i--) for (var i = visitor.InheritsDirectives.Count - 1; i >= 0; i--)
{ {
@ -85,12 +105,24 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
private class Visitor : RazorIRNodeWalker private class Visitor : RazorIRNodeWalker
{ {
public NamespaceDeclarationIRNode Namespace { get; private set; }
public ClassDeclarationIRNode Class { get; private set; } public ClassDeclarationIRNode Class { get; private set; }
public IList<DirectiveIRNode> InheritsDirectives { get; } = new List<DirectiveIRNode>(); public IList<DirectiveIRNode> InheritsDirectives { get; } = new List<DirectiveIRNode>();
public IList<DirectiveIRNode> ModelDirectives { get; } = new List<DirectiveIRNode>(); public IList<DirectiveIRNode> ModelDirectives { get; } = new List<DirectiveIRNode>();
public override void VisitNamespace(NamespaceDeclarationIRNode node)
{
if (Namespace == null)
{
Namespace = node;
}
base.VisitNamespace(node);
}
public override void VisitClass(ClassDeclarationIRNode node) public override void VisitClass(ClassDeclarationIRNode node)
{ {
if (Class == null) if (Class == null)

2
src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorIRLoweringPhase.cs
View File

@ -3,10 +3,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using Microsoft.AspNetCore.Razor.Evolution.Intermediate; using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
using Microsoft.AspNetCore.Razor.Evolution.Legacy; using Microsoft.AspNetCore.Razor.Evolution.Legacy;
using System.Diagnostics;
namespace Microsoft.AspNetCore.Razor.Evolution namespace Microsoft.AspNetCore.Razor.Evolution
{ {

1
src/Microsoft.AspNetCore.Razor.Evolution/RazorTemplateEngine.cs
View File

@ -3,7 +3,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
namespace Microsoft.AspNetCore.Razor.Evolution namespace Microsoft.AspNetCore.Razor.Evolution
{ {

84
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelDirectiveTest.cs
View File

@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
"); ");
var engine = CreateEngine(); var engine = CreateEngine();
var pass = new ModelDirective.Pass() var pass = new ModelDirective.Pass(designTime: false)
{ {
Engine = engine, Engine = engine,
}; };
@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
"); ");
var engine = CreateEngine(); var engine = CreateEngine();
var pass = new ModelDirective.Pass() var pass = new ModelDirective.Pass(designTime: false)
{ {
Engine = engine, Engine = engine,
}; };
@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
"); ");
var engine = CreateEngine(); var engine = CreateEngine();
var pass = new ModelDirective.Pass() var pass = new ModelDirective.Pass(designTime: false)
{ {
Engine = engine, Engine = engine,
}; };
@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
"); ");
var engine = CreateEngine(); var engine = CreateEngine();
var pass = new ModelDirective.Pass() var pass = new ModelDirective.Pass(designTime: false)
{ {
Engine = engine, Engine = engine,
}; };
@ -154,6 +154,65 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
Assert.Equal("BaseType<dynamic>", @class.BaseType); Assert.Equal("BaseType<dynamic>", @class.BaseType);
} }
[Fact]
public void ModelDirectivePass_DesignTime_AddsTModelUsingStatement()
{
// Arrange
var codeDocument = CreateDocument(@"
@inherits BaseType<TModel>
");
var engine = CreateEngine();
var pass = new ModelDirective.Pass(designTime: true)
{
Engine = engine,
};
var irDocument = CreateIRDocument(engine, codeDocument);
// Act
pass.Execute(codeDocument, irDocument);
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<dynamic>", @class.BaseType);
var @namespace = FindNamespaceNode(irDocument);
var usingNode = Assert.IsType<UsingStatementIRNode>(@namespace.Children[0]);
Assert.Equal($"TModel = global::{typeof(object).FullName}", usingNode.Content);
}
[Fact]
public void ModelDirectivePass_DesignTime_WithModel_AddsTModelUsingStatement()
{
// Arrange
var codeDocument = CreateDocument(@"
@inherits BaseType<TModel>
@model SomeType
");
var engine = CreateEngine();
var pass = new ModelDirective.Pass(designTime: true)
{
Engine = engine,
};
var irDocument = CreateIRDocument(engine, codeDocument);
// Act
pass.Execute(codeDocument, irDocument);
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<SomeType>", @class.BaseType);
var @namespace = FindNamespaceNode(irDocument);
var usingNode = Assert.IsType<UsingStatementIRNode>(@namespace.Children[0]);
Assert.Equal($"TModel = SomeType", usingNode.Content);
}
private RazorCodeDocument CreateDocument(string content) private RazorCodeDocument CreateDocument(string content)
{ {
var source = RazorSourceDocument.Create(content, "test.cshtml"); var source = RazorSourceDocument.Create(content, "test.cshtml");
@ -167,6 +226,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
return visitor.Node; return visitor.Node;
} }
private NamespaceDeclarationIRNode FindNamespaceNode(RazorIRNode node)
{
var visitor = new NamespaceNodeVisitor();
visitor.Visit(node);
return visitor.Node;
}
private RazorEngine CreateEngine() private RazorEngine CreateEngine()
{ {
return RazorEngine.Create(b => return RazorEngine.Create(b =>
@ -216,5 +282,15 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
Node = node; Node = node;
} }
} }
private class NamespaceNodeVisitor : RazorIRNodeWalker
{
public NamespaceDeclarationIRNode Node { get; set; }
public override void VisitNamespace(NamespaceDeclarationIRNode node)
{
Node = node;
}
}
} }
} }

7
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/RazorEngineTest.cs
View File

@ -12,7 +12,6 @@ using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Emit;
using Microsoft.CodeAnalysis.Razor; using Microsoft.CodeAnalysis.Razor;
using Microsoft.Extensions.DependencyModel; using Microsoft.Extensions.DependencyModel;
using Moq;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Mvc.Razor.Extensions namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
@ -131,13 +130,14 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
}); });
var inputContent = ResourceFile.ReadResource(_assembly, inputFile, sourceFile: true); var inputContent = ResourceFile.ReadResource(_assembly, inputFile, sourceFile: true);
var item = new TestRazorProjectItem(inputFile) { Content = inputContent, }; var item = new TestRazorProjectItem("/" + inputFile) { Content = inputContent, };
var project = new TestRazorProject(new List<RazorProjectItem>() var project = new TestRazorProject(new List<RazorProjectItem>()
{ {
item, item,
}); });
var razorTemplateEngine = new MvcRazorTemplateEngine(engine, project); var razorTemplateEngine = new MvcRazorTemplateEngine(engine, project);
razorTemplateEngine.Options.ImportsFileName = "_ViewImports.cshtml";
var codeDocument = razorTemplateEngine.CreateCodeDocument(item); var codeDocument = razorTemplateEngine.CreateCodeDocument(item);
codeDocument.Items["SuppressUniqueIds"] = "test"; codeDocument.Items["SuppressUniqueIds"] = "test";
codeDocument.Items["NewLineString"] = "\r\n"; codeDocument.Items["NewLineString"] = "\r\n";
@ -174,13 +174,14 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
}); });
var inputContent = ResourceFile.ReadResource(_assembly, inputFile, sourceFile: true); var inputContent = ResourceFile.ReadResource(_assembly, inputFile, sourceFile: true);
var item = new TestRazorProjectItem(inputFile) { Content = inputContent, }; var item = new TestRazorProjectItem("/" + inputFile) { Content = inputContent, };
var project = new TestRazorProject(new List<RazorProjectItem>() var project = new TestRazorProject(new List<RazorProjectItem>()
{ {
item, item,
}); });
var razorTemplateEngine = new MvcRazorTemplateEngine(engine, project); var razorTemplateEngine = new MvcRazorTemplateEngine(engine, project);
razorTemplateEngine.Options.ImportsFileName = "_ViewImports.cshtml";
var codeDocument = razorTemplateEngine.CreateCodeDocument(item); var codeDocument = razorTemplateEngine.CreateCodeDocument(item);
codeDocument.Items["SuppressUniqueIds"] = "test"; codeDocument.Items["SuppressUniqueIds"] = "test";
codeDocument.Items["NewLineString"] = "\r\n"; codeDocument.Items["NewLineString"] = "\r\n";

7
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/Basic.cs
View File

@ -1,6 +1,7 @@
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
using TModel = global::System.Object;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "" #line 2 ""
@ -28,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Basic_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> public class _TestFiles_Input_Basic_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {
@ -82,12 +83,12 @@ System.Object __typeHelper = "Microsoft.AspNetCore.Razor.TagHelpers.UrlResolutio
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()
{ {
#line 1 "TestFiles/Input/Basic.cshtml" #line 1 "/TestFiles/Input/Basic.cshtml"
__o = logo; __o = logo;
#line default #line default
#line hidden #line hidden
#line 3 "TestFiles/Input/Basic.cshtml" #line 3 "/TestFiles/Input/Basic.cshtml"
__o = Html.Input("SomeKey"); __o = Html.Input("SomeKey");
#line default #line default

8
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/Basic.mappings.txt
View File

@ -1,10 +1,10 @@
Source Location: (13:0,13 [4] TestFiles/Input/Basic.cshtml) Source Location: (13:0,13 [4] /TestFiles/Input/Basic.cshtml)
|logo| |logo|
Generated Location: (2325:85,13 [4] ) Generated Location: (2370:86,13 [4] )
|logo| |logo|
Source Location: (43:2,5 [21] TestFiles/Input/Basic.cshtml) Source Location: (43:2,5 [21] /TestFiles/Input/Basic.cshtml)
|Html.Input("SomeKey")| |Html.Input("SomeKey")|
Generated Location: (2409:90,6 [21] ) Generated Location: (2455:91,6 [21] )
|Html.Input("SomeKey")| |Html.Input("SomeKey")|

5
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/Inject.cs
View File

@ -1,6 +1,7 @@
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
using TModel = global::System.Object;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "" #line 2 ""
@ -28,12 +29,12 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
#line 1 "TestFiles/Input/Inject.cshtml" #line 1 "/TestFiles/Input/Inject.cshtml"
using MyNamespace; using MyNamespace;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Inject_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> public class _TestFiles_Input_Inject_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

8
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/Inject.mappings.txt
View File

@ -1,10 +1,10 @@
Source Location: (28:1,8 [5] TestFiles/Input/Inject.cshtml) Source Location: (28:1,8 [5] /TestFiles/Input/Inject.cshtml)
|MyApp| |MyApp|
Generated Location: (2170:84,0 [5] ) Generated Location: (2215:85,0 [5] )
|MyApp| |MyApp|
Source Location: (34:1,14 [14] TestFiles/Input/Inject.cshtml) Source Location: (34:1,14 [14] /TestFiles/Input/Inject.cshtml)
|MyPropertyName| |MyPropertyName|
Generated Location: (2272:88,14 [14] ) Generated Location: (2317:89,14 [14] )
|MyPropertyName| |MyPropertyName|

3
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/InjectWithModel.cs
View File

@ -1,6 +1,7 @@
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
using TModel = MyModel;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "" #line 2 ""
@ -28,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_InjectWithModel_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> public class _TestFiles_Input_InjectWithModel_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

20
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/InjectWithModel.mappings.txt
View File

@ -1,25 +1,25 @@
Source Location: (7:0,7 [7] TestFiles/Input/InjectWithModel.cshtml) Source Location: (7:0,7 [7] /TestFiles/Input/InjectWithModel.cshtml)
|MyModel| |MyModel|
Generated Location: (2087:79,0 [7] ) Generated Location: (2117:80,0 [7] )
|MyModel| |MyModel|
Source Location: (24:1,8 [5] TestFiles/Input/InjectWithModel.cshtml) Source Location: (24:1,8 [5] /TestFiles/Input/InjectWithModel.cshtml)
|MyApp| |MyApp|
Generated Location: (2177:83,0 [5] ) Generated Location: (2207:84,0 [5] )
|MyApp| |MyApp|
Source Location: (30:1,14 [14] TestFiles/Input/InjectWithModel.cshtml) Source Location: (30:1,14 [14] /TestFiles/Input/InjectWithModel.cshtml)
|MyPropertyName| |MyPropertyName|
Generated Location: (2279:87,14 [14] ) Generated Location: (2309:88,14 [14] )
|MyPropertyName| |MyPropertyName|
Source Location: (54:2,8 [17] TestFiles/Input/InjectWithModel.cshtml) Source Location: (54:2,8 [17] /TestFiles/Input/InjectWithModel.cshtml)
|MyService<TModel>| |MyService<TModel>|
Generated Location: (2363:91,0 [17] ) Generated Location: (2393:92,0 [17] )
|MyService<TModel>| |MyService<TModel>|
Source Location: (72:2,26 [4] TestFiles/Input/InjectWithModel.cshtml) Source Location: (72:2,26 [4] /TestFiles/Input/InjectWithModel.cshtml)
|Html| |Html|
Generated Location: (2477:95,14 [4] ) Generated Location: (2507:96,14 [4] )
|Html| |Html|

3
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/InjectWithSemicolon.cs
View File

@ -1,6 +1,7 @@
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
using TModel = MyModel;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "" #line 2 ""
@ -28,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_InjectWithSemicolon_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> public class _TestFiles_Input_InjectWithSemicolon_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

36
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/InjectWithSemicolon.mappings.txt
View File

@ -1,45 +1,45 @@
Source Location: (7:0,7 [7] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (7:0,7 [7] /TestFiles/Input/InjectWithSemicolon.cshtml)
|MyModel| |MyModel|
Generated Location: (2091:79,0 [7] ) Generated Location: (2121:80,0 [7] )
|MyModel| |MyModel|
Source Location: (24:1,8 [5] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (24:1,8 [5] /TestFiles/Input/InjectWithSemicolon.cshtml)
|MyApp| |MyApp|
Generated Location: (2181:83,0 [5] ) Generated Location: (2211:84,0 [5] )
|MyApp| |MyApp|
Source Location: (30:1,14 [14] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (30:1,14 [14] /TestFiles/Input/InjectWithSemicolon.cshtml)
|MyPropertyName| |MyPropertyName|
Generated Location: (2283:87,14 [14] ) Generated Location: (2313:88,14 [14] )
|MyPropertyName| |MyPropertyName|
Source Location: (58:2,8 [17] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (58:2,8 [17] /TestFiles/Input/InjectWithSemicolon.cshtml)
|MyService<TModel>| |MyService<TModel>|
Generated Location: (2367:91,0 [17] ) Generated Location: (2397:92,0 [17] )
|MyService<TModel>| |MyService<TModel>|
Source Location: (76:2,26 [4] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (76:2,26 [4] /TestFiles/Input/InjectWithSemicolon.cshtml)
|Html| |Html|
Generated Location: (2481:95,14 [4] ) Generated Location: (2511:96,14 [4] )
|Html| |Html|
Source Location: (93:3,8 [5] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (93:3,8 [5] /TestFiles/Input/InjectWithSemicolon.cshtml)
|MyApp| |MyApp|
Generated Location: (2555:99,0 [5] ) Generated Location: (2585:100,0 [5] )
|MyApp| |MyApp|
Source Location: (99:3,14 [15] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (99:3,14 [15] /TestFiles/Input/InjectWithSemicolon.cshtml)
|MyPropertyName2| |MyPropertyName2|
Generated Location: (2657:103,14 [15] ) Generated Location: (2687:104,14 [15] )
|MyPropertyName2| |MyPropertyName2|
Source Location: (129:4,8 [17] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (129:4,8 [17] /TestFiles/Input/InjectWithSemicolon.cshtml)
|MyService<TModel>| |MyService<TModel>|
Generated Location: (2742:107,0 [17] ) Generated Location: (2772:108,0 [17] )
|MyService<TModel>| |MyService<TModel>|
Source Location: (147:4,26 [5] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (147:4,26 [5] /TestFiles/Input/InjectWithSemicolon.cshtml)
|Html2| |Html2|
Generated Location: (2856:111,14 [5] ) Generated Location: (2886:112,14 [5] )
|Html2| |Html2|

3
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/Model.cs
View File

@ -1,6 +1,7 @@
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
using TModel = System.Collections.IEnumerable;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "" #line 2 ""
@ -28,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Model_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> public class _TestFiles_Input_Model_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

4
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/Model.mappings.txt
View File

@ -1,5 +1,5 @@
Source Location: (7:0,7 [30] TestFiles/Input/Model.cshtml) Source Location: (7:0,7 [30] /TestFiles/Input/Model.cshtml)
|System.Collections.IEnumerable| |System.Collections.IEnumerable|
Generated Location: (2100:79,0 [30] ) Generated Location: (2153:80,0 [30] )
|System.Collections.IEnumerable| |System.Collections.IEnumerable|

7
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs
View File

@ -1,6 +1,7 @@
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
using TModel = DateTime;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "" #line 2 ""
@ -28,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_ModelExpressionTagHelper_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> public class _TestFiles_Input_ModelExpressionTagHelper_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {
@ -92,13 +93,13 @@ System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTes
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()
{ {
__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper>(); __Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper>();
#line 5 "TestFiles/Input/ModelExpressionTagHelper.cshtml" #line 5 "/TestFiles/Input/ModelExpressionTagHelper.cshtml"
__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Now); __Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Now);
#line default #line default
#line hidden #line hidden
__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper>(); __Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper>();
#line 6 "TestFiles/Input/ModelExpressionTagHelper.cshtml" #line 6 "/TestFiles/Input/ModelExpressionTagHelper.cshtml"
__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model); __Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
#line default #line default

16
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.mappings.txt
View File

@ -1,20 +1,20 @@
Source Location: (7:0,7 [8] TestFiles/Input/ModelExpressionTagHelper.cshtml) Source Location: (7:0,7 [8] /TestFiles/Input/ModelExpressionTagHelper.cshtml)
|DateTime| |DateTime|
Generated Location: (2097:79,0 [8] ) Generated Location: (2128:80,0 [8] )
|DateTime| |DateTime|
Source Location: (33:2,14 [108] TestFiles/Input/ModelExpressionTagHelper.cshtml) Source Location: (33:2,14 [108] /TestFiles/Input/ModelExpressionTagHelper.cshtml)
|Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Extensions.Test| |Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Extensions.Test|
Generated Location: (2218:83,30 [108] ) Generated Location: (2249:84,30 [108] )
|Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Extensions.Test| |Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Extensions.Test|
Source Location: (162:4,17 [3] TestFiles/Input/ModelExpressionTagHelper.cshtml) Source Location: (162:4,17 [3] /TestFiles/Input/ModelExpressionTagHelper.cshtml)
|Now| |Now|
Generated Location: (3112:95,144 [3] ) Generated Location: (3144:96,144 [3] )
|Now| |Now|
Source Location: (189:5,18 [5] TestFiles/Input/ModelExpressionTagHelper.cshtml) Source Location: (189:5,18 [5] /TestFiles/Input/ModelExpressionTagHelper.cshtml)
|Model| |Model|
Generated Location: (3512:101,136 [5] ) Generated Location: (3545:102,136 [5] )
|Model| |Model|

3
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/MultipleModels.cs
View File

@ -1,6 +1,7 @@
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
using TModel = System.Collections.IEnumerable;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "" #line 2 ""
@ -28,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_MultipleModels_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> public class _TestFiles_Input_MultipleModels_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

8
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/MultipleModels.mappings.txt
View File

@ -1,10 +1,10 @@
Source Location: (7:0,7 [21] TestFiles/Input/MultipleModels.cshtml) Source Location: (7:0,7 [21] /TestFiles/Input/MultipleModels.cshtml)
|ThisShouldBeGenerated| |ThisShouldBeGenerated|
Generated Location: (2109:79,0 [21] ) Generated Location: (2162:80,0 [21] )
|ThisShouldBeGenerated| |ThisShouldBeGenerated|
Source Location: (37:1,7 [30] TestFiles/Input/MultipleModels.cshtml) Source Location: (37:1,7 [30] /TestFiles/Input/MultipleModels.cshtml)
|System.Collections.IEnumerable| |System.Collections.IEnumerable|
Generated Location: (2213:83,0 [30] ) Generated Location: (2266:84,0 [30] )
|System.Collections.IEnumerable| |System.Collections.IEnumerable|

3
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/_ViewImports.cs
View File

@ -1,6 +1,7 @@
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
using TModel = global::System.Object;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
#line 2 "" #line 2 ""
@ -28,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input__ViewImports_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> public class _TestFiles_Input__ViewImports_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

8
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/DesignTime/_ViewImports.mappings.txt
View File

@ -1,10 +1,10 @@
Source Location: (8:0,8 [19] TestFiles/Input/_ViewImports.cshtml) Source Location: (8:0,8 [19] /TestFiles/Input/_ViewImports.cshtml)
|IHtmlHelper<TModel>| |IHtmlHelper<TModel>|
Generated Location: (2084:79,0 [19] ) Generated Location: (2128:80,0 [19] )
|IHtmlHelper<TModel>| |IHtmlHelper<TModel>|
Source Location: (28:0,28 [5] TestFiles/Input/_ViewImports.cshtml) Source Location: (28:0,28 [5] /TestFiles/Input/_ViewImports.cshtml)
|Model| |Model|
Generated Location: (2200:83,14 [5] ) Generated Location: (2244:84,14 [5] )
|Model| |Model|

8
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/Basic.cs
View File

@ -1,4 +1,4 @@
#pragma checksum "TestFiles/Input/Basic.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "54a70ff4c6d27ac6cdc6725cb6bab12012015729" #pragma checksum "/TestFiles/Input/Basic.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "54a70ff4c6d27ac6cdc6725cb6bab12012015729"
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Basic_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> public class _TestFiles_Input_Basic_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()
@ -38,7 +38,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
WriteLiteral("<div"); WriteLiteral("<div");
EndContext(); EndContext();
BeginWriteAttribute("class", " class=\"", 4, "\"", 17, 1); BeginWriteAttribute("class", " class=\"", 4, "\"", 17, 1);
#line 1 "TestFiles/Input/Basic.cshtml" #line 1 "/TestFiles/Input/Basic.cshtml"
WriteAttributeValue("", 12, logo, 12, 5, false); WriteAttributeValue("", 12, logo, 12, 5, false);
#line default #line default
@ -48,7 +48,7 @@ WriteAttributeValue("", 12, logo, 12, 5, false);
WriteLiteral(">\r\n Hello world\r\n "); WriteLiteral(">\r\n Hello world\r\n ");
EndContext(); EndContext();
BeginContext(43, 21, false); BeginContext(43, 21, false);
#line 3 "TestFiles/Input/Basic.cshtml" #line 3 "/TestFiles/Input/Basic.cshtml"
Write(Html.Input("SomeKey")); Write(Html.Input("SomeKey"));
#line default #line default

6
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/Inject.cs
View File

@ -1,4 +1,4 @@
#pragma checksum "TestFiles/Input/Inject.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "225760ec3beca02a80469066fab66433e90ddc2e" #pragma checksum "/TestFiles/Input/Inject.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "225760ec3beca02a80469066fab66433e90ddc2e"
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
@ -29,12 +29,12 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
#line 1 "TestFiles/Input/Inject.cshtml" #line 1 "/TestFiles/Input/Inject.cshtml"
using MyNamespace; using MyNamespace;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Inject_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> public class _TestFiles_Input_Inject_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()

4
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/InjectWithModel.cs
View File

@ -1,4 +1,4 @@
#pragma checksum "TestFiles/Input/InjectWithModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1f010500f93116162444110956e512df61642f4e" #pragma checksum "/TestFiles/Input/InjectWithModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1f010500f93116162444110956e512df61642f4e"
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_InjectWithModel_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> public class _TestFiles_Input_InjectWithModel_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()

4
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/InjectWithSemicolon.cs
View File

@ -1,4 +1,4 @@
#pragma checksum "TestFiles/Input/InjectWithSemicolon.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "fc807ec0dc76610bdca62f482fefd7f584348df9" #pragma checksum "/TestFiles/Input/InjectWithSemicolon.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "fc807ec0dc76610bdca62f482fefd7f584348df9"
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_InjectWithSemicolon_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> public class _TestFiles_Input_InjectWithSemicolon_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()

4
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/Model.cs
View File

@ -1,4 +1,4 @@
#pragma checksum "TestFiles/Input/Model.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "31c5b047a450ac9f6dc4116626667d26bfb657ba" #pragma checksum "/TestFiles/Input/Model.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "31c5b047a450ac9f6dc4116626667d26bfb657ba"
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Model_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> public class _TestFiles_Input_Model_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()

8
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
View File

@ -1,4 +1,4 @@
#pragma checksum "TestFiles/Input/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "55aa7d9113d1666f0c8e05c6ad9b86fc8464b277" #pragma checksum "/TestFiles/Input/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "55aa7d9113d1666f0c8e05c6ad9b86fc8464b277"
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_ModelExpressionTagHelper_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> public class _TestFiles_Input_ModelExpressionTagHelper_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
{ {
#line hidden #line hidden
#pragma warning disable 0414 #pragma warning disable 0414
@ -64,7 +64,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
); );
__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper>(); __Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper>();
__tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper); __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper);
#line 5 "TestFiles/Input/ModelExpressionTagHelper.cshtml" #line 5 "/TestFiles/Input/ModelExpressionTagHelper.cshtml"
__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Now); __Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Now);
#line default #line default
@ -87,7 +87,7 @@ __Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper.For = ModelExpres
); );
__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper>(); __Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper>();
__tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper); __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper);
#line 6 "TestFiles/Input/ModelExpressionTagHelper.cshtml" #line 6 "/TestFiles/Input/ModelExpressionTagHelper.cshtml"
__Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model); __Microsoft_AspNetCore_Mvc_Razor_Extensions_InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
#line default #line default

4
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/_ViewImports.cs
View File

@ -1,4 +1,4 @@
#pragma checksum "TestFiles/Input/_ViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "778b41f9406fcda776cc3f1bf093f3b21956e582" #pragma checksum "/TestFiles/Input/_ViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "778b41f9406fcda776cc3f1bf093f3b21956e582"
namespace AspNetCore namespace AspNetCore
{ {
#line hidden #line hidden
@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input__ViewImports_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> public class _TestFiles_Input__ViewImports_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()