From a77d0718301cd1be5e3900e21167768c7f964d8d Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Wed, 14 Jan 2015 16:13:41 -0800
Subject: [PATCH] React to aspnet/Razor#268 changes - part I of #1253 using new
 Razor capabilities - update baselines to match latest code generation - use
 new `CodeBuilderContext` and `TagHelperAttributeValueCodeRenderer` signatures
 - test complex expressions in bound non-string attribute values

---
 .../Views/Home/Create.cshtml                  |  3 +-
 .../Views/Home/Index.cshtml                   | 24 ++++++----------
 .../MvcTagHelperAttributeValueCodeRenderer.cs | 28 +++++++++++++------
 ...elpersWebSite.MvcTagHelper_Home.Order.html |  1 +
 .../InjectChunkVisitorTest.cs                 |  4 ++-
 .../ModelChunkVisitorTest.cs                  |  4 ++-
 .../MvcRazorHostTest.cs                       |  6 ++--
 ...TagHelperAttributeValueCodeRendererTest.cs |  7 +++--
 .../DesignTime/ModelExpressionTagHelper.cs    |  6 +++-
 .../Runtime/ModelExpressionTagHelper.cs       |  6 +++-
 .../RazorCompilationServiceTest.cs            |  9 ++++--
 .../Views/MvcTagHelper_Home/Order.cshtml      |  3 +-
 12 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/samples/TagHelperSample.Web/Views/Home/Create.cshtml b/samples/TagHelperSample.Web/Views/Home/Create.cshtml
index ac1733679c..96054bb801 100644
--- a/samples/TagHelperSample.Web/Views/Home/Create.cshtml
+++ b/samples/TagHelperSample.Web/Views/Home/Create.cshtml
@@ -48,7 +48,8 @@
             <label asp-for="YearsEmployeed" class="control-label col-md-2" />
             <div class="col-md-10">
                 @* <select/> tag helper has ContentBehavior.Append -- items render after static options *@
-                <select asp-for="YearsEmployeed" asp-items="(IEnumerable<SelectListItem>)ViewBag.Items" size="2" class="form-control">
+                @{ var @object = "multiple"; }
+                <select asp-for="@(Model.YearsEmployeed)" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Items)" size="2" class="form-control" multiple="@(@object)">
                     @* Static use of "selected" attribute may cause HTML errors if in a single-selection <select/> *@
                     @* - @NTaylorMullen thinks <option/> tag helper could tell <select/> helper not to select anything from "items" *@
                     @* - wouldn't help if user selected one static <option/> and expression indicated another, especially one earlier in the <select/> *@
diff --git a/samples/TagHelperSample.Web/Views/Home/Index.cshtml b/samples/TagHelperSample.Web/Views/Home/Index.cshtml
index dfc8238e48..c4ea763579 100644
--- a/samples/TagHelperSample.Web/Views/Home/Index.cshtml
+++ b/samples/TagHelperSample.Web/Views/Home/Index.cshtml
@@ -9,28 +9,20 @@
         @for (var index = 0; index < Model.Count(); ++index)
         {
             <div class="form-group">
-                @Html.LabelFor(m => m[index].Name)
-                @Html.TextBoxFor(m => m[index].Name, htmlAttributes: new { disabled = "disabled", @readonly= "readonly" })
-                @*<label asp-for="[index].Name" />
-                <input type="text" asp-for="[index].Name" disabled="disabled" readonly="readonly" />*@
+                <label asp-for="@Model[index].Name" />
+                <input type="text" asp-for="@Model[index].Name" disabled="disabled" readonly="readonly" />
             </div>
             <div class="form-group">
-                @Html.LabelFor(m => m[index].DateOfBirth)
-                @Html.TextBoxFor(m => m[index].DateOfBirth, format: "{0:yyyy-MM-dd}", htmlAttributes: new { disabled = "disabled", @readonly = "readonly", type="date" })
-                @*<label asp-for="[index].DateOfBirth" />
-                <input type="date" asp-for="[index].DateOfBirth" disabled="disabled" readonly="readonly" />*@
+                <label asp-for="@Model[index].DateOfBirth" />
+                <input type="date" asp-for="@Model[index].DateOfBirth" asp-format="{0:yyyy-MM-dd}" disabled="disabled" readonly="readonly" />
             </div>
             <div class="form-group">
-                @Html.LabelFor(m => m[index].YearsEmployeed)
-                @Html.TextBoxFor(m => m[index].YearsEmployeed, htmlAttributes: new { disabled = "disabled", @readonly = "readonly", type="number" })
-                @*<label asp-for="[index].YearsEmployeed" />
-                <input type="number" asp-for="[index].YearsEmployeed" disabled="disabled" readonly="readonly" />*@
+                <label asp-for="@Model[index].YearsEmployeed" />
+                <input type="number" asp-for="@Model[index].YearsEmployeed" disabled="disabled" readonly="readonly" />
             </div>
             <div class="form-group">
-                @Html.LabelFor(m => m[index].Blurb)
-                @Html.TextAreaFor(m => m[index].Blurb, htmlAttributes: new { disabled = "disabled", @readonly = "readonly" })
-                @*<label asp-for="[index].Blurb" />
-                <textarea rows="4" asp-for="[index].Blurb" disabled="disabled" readonly="readonly" />*@
+                <label asp-for="@Model[index].Blurb" />
+                <textarea rows="4" asp-for="@Model[index].Blurb" disabled="disabled" readonly="readonly" />
             </div>
 
             <p>
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcTagHelperAttributeValueCodeRenderer.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcTagHelperAttributeValueCodeRenderer.cs
index e66e618f5e..4f14db4ca2 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcTagHelperAttributeValueCodeRenderer.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcTagHelperAttributeValueCodeRenderer.cs
@@ -26,21 +26,28 @@ namespace Microsoft.AspNet.Mvc.Razor
 
         /// <inheritdoc />
         /// <remarks>If the attribute being rendered is of the type
-        /// <see cref="GeneratedTagHelperAttributeContext.ModelExpressionTypeName"/> then a model expression will be
+        /// <see cref="GeneratedTagHelperAttributeContext.ModelExpressionTypeName"/>, then a model expression will be
         /// created by calling into <see cref="GeneratedTagHelperAttributeContext.CreateModelExpressionMethodName"/>.
         /// </remarks>
         public override void RenderAttributeValue([NotNull] TagHelperAttributeDescriptor attributeDescriptor,
                                                   [NotNull] CSharpCodeWriter writer,
                                                   [NotNull] CodeBuilderContext codeBuilderContext,
-                                                  [NotNull] Action<CSharpCodeWriter> renderAttributeValue)
+                                                  [NotNull] Action<CSharpCodeWriter> renderAttributeValue,
+                                                  bool complexValue)
         {
             if (attributeDescriptor.TypeName.Equals(_context.ModelExpressionTypeName, StringComparison.Ordinal))
             {
-                writer.WriteStartMethodInvocation(_context.CreateModelExpressionMethodName)
-                      .Write(ModelLambdaVariableName)
-                      .Write(" => ")
-                      .Write(ModelLambdaVariableName)
-                      .Write(".");
+                writer
+                    .WriteStartMethodInvocation(_context.CreateModelExpressionMethodName)
+                    .Write(ModelLambdaVariableName)
+                    .Write(" => ");
+                if (!complexValue)
+                {
+                    writer
+                        .Write(ModelLambdaVariableName)
+                        .Write(".");
+
+                }
 
                 renderAttributeValue(writer);
 
@@ -48,7 +55,12 @@ namespace Microsoft.AspNet.Mvc.Razor
             }
             else
             {
-                base.RenderAttributeValue(attributeDescriptor, writer, codeBuilderContext, renderAttributeValue);
+                base.RenderAttributeValue(
+                    attributeDescriptor,
+                    writer,
+                    codeBuilderContext,
+                    renderAttributeValue,
+                    complexValue);
             }
         }
     }
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
index f9213ea9b1..97c41f37b0 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
@@ -18,6 +18,7 @@
         </div>
         <div>
             <label class="order" for="Products">Products</label>
+
             <select multiple="multiple" id="Products" name="Products"><option value="0">Product_0</option>
 <option value="1">Product_1</option>
 <option selected="selected" value="2">Product_2</option>
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs
index c5e9c2322a..fdc73a475b 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs
@@ -5,6 +5,7 @@ using System;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Generator.Compiler.CSharp;
+using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Xunit;
 
@@ -149,7 +150,8 @@ MyType1
                                          "MyClass",
                                          "MyNamespace",
                                          string.Empty,
-                                         shouldGenerateLinePragmas: true));
+                                         shouldGenerateLinePragmas: true),
+                new ParserErrorSink());
         }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs
index a5dbf0cf28..f19d22ce36 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs
@@ -5,6 +5,7 @@ using System;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Generator.Compiler.CSharp;
+using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Xunit;
 
@@ -105,7 +106,8 @@ Environment.NewLine +
                                          "MyClass",
                                          "MyNamespace",
                                          string.Empty,
-                                         shouldGenerateLinePragmas: true));
+                                         shouldGenerateLinePragmas: true),
+                new ParserErrorSink());
         }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
index d562a524b1..9f86c9362c 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
@@ -55,9 +55,9 @@ namespace Microsoft.AspNet.Mvc.Razor
                 BuildLineMapping(documentAbsoluteIndex: 139,
                                  documentLineIndex: 4,
                                  documentCharacterIndex: 17,
-                                 generatedAbsoluteIndex: 2058,
-                                 generatedLineIndex: 52,
-                                 generatedCharacterIndex: 107,
+                                 generatedAbsoluteIndex: 2105,
+                                 generatedLineIndex: 53,
+                                 generatedCharacterIndex: 95,
                                  contentLength: 3)
             };
 
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs
index b01972df75..372c400d38 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler.CSharp;
+using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.TagHelpers;
 using Xunit;
 
@@ -31,14 +32,16 @@ namespace Microsoft.AspNet.Mvc.Razor
                                                             rootNamespace: string.Empty,
                                                             sourceFile: string.Empty,
                                                             shouldGenerateLinePragmas: true);
-            var context = new CodeBuilderContext(generatorContext);
+            var errorSink = new ParserErrorSink();
+            var context = new CodeBuilderContext(generatorContext, errorSink);
 
             // Act
             renderer.RenderAttributeValue(attributeDescriptor, writer, context,
             (codeWriter) =>
             {
                 codeWriter.Write("MyValue");
-            });
+            },
+            complexValue: false);
 
             // Assert
             Assert.Equal(expectedValue, writer.GenerateCode());
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs
index b58efdfe2d..91c93af0d2 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs
@@ -50,7 +50,11 @@
         public override async Task ExecuteAsync()
         {
             __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
-            __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => __model.Now);
+#line 5 "TestFiles/Input/ModelExpressionTagHelper.cshtml"
+__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => __model.Now);
+
+#line default
+#line hidden
         }
         #pragma warning restore 1998
     }
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
index a0ad0bf866..b71325c6c3 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
@@ -48,7 +48,11 @@ namespace Asp
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", "test");
             __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
             __tagHelperExecutionContext.Add(__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper);
-            __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => __model.Now);
+#line 5 "TestFiles/Input/ModelExpressionTagHelper.cshtml"
+__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => __model.Now);
+
+#line default
+#line hidden
             __tagHelperExecutionContext.AddTagHelperAttribute("for", __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For);
             __tagHelperExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelperExecutionContext).Result;
             WriteLiteral(__tagHelperExecutionContext.Output.GenerateStartTag());
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
index 9cf4fb9899..fce9da1018 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using Microsoft.AspNet.FileSystems;
 using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Generator.Compiler;
+using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.TagHelpers;
 using Moq;
@@ -49,10 +50,12 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
         public void Compile_ReturnsFailedResultIfParseFails()
         {
             // Arrange
+            var errorSink = new ParserErrorSink();
+            errorSink.OnError(new RazorError("some message", 1, 1, 1, 1));
             var generatorResult = new GeneratorResults(
                     new Block(new BlockBuilder { Type = BlockType.Comment }),
                     Enumerable.Empty<TagHelperDescriptor>(),
-                    new RazorError[] { new RazorError("some message", 1, 1, 1, 1) },
+                    errorSink,
                     new CodeBuilderResult("", new LineMapping[0]),
                     new CodeTree());
             var host = new Mock<IMvcRazorHost>();
@@ -87,7 +90,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
             var generatorResult = new GeneratorResults(
                     new Block(new BlockBuilder { Type = BlockType.Comment }),
                     Enumerable.Empty<TagHelperDescriptor>(),
-                    new RazorError[0],
+                    new ParserErrorSink(),
                     new CodeBuilderResult(code, new LineMapping[0]),
                     new CodeTree());
             var host = new Mock<IMvcRazorHost>();
@@ -119,7 +122,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
             return new GeneratorResults(
                     new Block(new BlockBuilder { Type = BlockType.Comment }),
                     Enumerable.Empty<TagHelperDescriptor>(),
-                    new RazorError[0],
+                    new ParserErrorSink(),
                     new CodeBuilderResult("", new LineMapping[0]),
                     new CodeTree());
         }
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml
index cf5c51fd0c..1bac052993 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml
@@ -29,7 +29,8 @@
         </div>
         <div>
             <label asp-for="Products" class="order" />
-            <select asp-for="Products" asp-items="(IEnumerable<SelectListItem>)ViewBag.Items" multiple="multiple" />
+            @{ var @object = "multiple"; }
+            <select asp-for="@Model.Products" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Items)" multiple="@(@object)" />
         </div>
         <div>
             <label asp-for="OrderDate" class="order" />