Transitioned SourceLocation => MappingLocation on IRNodes.

- Also modified the property name from `SourceLocation` => `SourceRange` to avoid ambiguity.
- Updated IR baselines
- Updated IR baseline infrastructure to conditionally render the document location.

#884

src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorIRLoweringPhase.cs

@@ -62,8 +62,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                     Name = chunkGenerator.Name,
                     Prefix = chunkGenerator.Prefix,
                     Suffix = chunkGenerator.Suffix,
-
+                    SourceRange = new MappingLocation(block.Start, block.Length),
-                    SourceLocation = block.Start,
                 });
             }
 
@@ -81,7 +80,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                 Builder.Push(new CSharpAttributeValueIRNode()
                 {
                     Prefix = chunkGenerator.Prefix,
-                    SourceLocation = block.Start,
+                    SourceRange = new MappingLocation(block.Start, block.Length),
                 });
             }
 
@@ -96,7 +95,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                 {
                     Prefix = chunkGenerator.Prefix,
                     Content = chunkGenerator.Value,
-                    SourceLocation = span.Start,
+                    SourceRange = new MappingLocation(span.Start, span.Length),
                 });
             }
 
@@ -118,15 +117,31 @@ namespace Microsoft.AspNetCore.Razor.Evolution
             // We need to capture this in the IR so that we can give each piece the correct source mappings
             public override void VisitStartExpressionBlock(ExpressionChunkGenerator chunkGenerator, Block block)
             {
-                Builder.Push(new CSharpExpressionIRNode()
+                Builder.Push(new CSharpExpressionIRNode());
-                {
-                    SourceLocation = block.Start,
-                });
             }
 
             public override void VisitEndExpressionBlock(ExpressionChunkGenerator chunkGenerator, Block block)
             {
-                Builder.Pop();
+                var expressionNode = Builder.Pop();
+
+                if (expressionNode.Children.Count > 0)
+                {
+                    var sourceRangeStart = expressionNode.Children[0].SourceRange;
+                    var contentLength = 0;
+
+                    for (var i = 0; i < expressionNode.Children.Count; i++)
+                    {
+                        contentLength += expressionNode.Children[i].SourceRange.ContentLength;
+                    }
+
+                    expressionNode.SourceRange = new MappingLocation(
+                        sourceRangeStart.AbsoluteIndex,
+                        sourceRangeStart.LineIndex,
+                        sourceRangeStart.CharacterIndex,
+                        contentLength,
+                        sourceRangeStart.FilePath);
+                }
+
             }
 
             public override void VisitExpressionSpan(ExpressionChunkGenerator chunkGenerator, Span span)
@@ -134,7 +149,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                 Builder.Add(new CSharpTokenIRNode()
                 {
                     Content = span.Content,
-                    SourceLocation = span.Start,
+                    SourceRange = new MappingLocation(span.Start, span.Length),
                 });
             }
 
@@ -143,7 +158,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                 var functionsNode = new CSharpStatementIRNode()
                 {
                     Content = span.Content,
-                    SourceLocation = span.Start,
+                    SourceRange = new MappingLocation(span.Start, span.Length),
                     Parent = Class,
                 };
 
@@ -155,7 +170,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                 Builder.Add(new CSharpStatementIRNode()
                 {
                     Content = span.Content,
-                    SourceLocation = span.Start,
+                    SourceRange = new MappingLocation(span.Start, span.Length),
                 });
             }
 
@@ -172,7 +187,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                     Builder.Add(new HtmlContentIRNode()
                     {
                         Content = span.Content,
-                        SourceLocation = span.Start,
+                        SourceRange = new MappingLocation(span.Start, span.Length),
                     });
                 }
             }
@@ -193,7 +208,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                 {
                     Content = span.Content,
                     Parent = Namespace,
-                    SourceLocation = span.Start,
+                    SourceRange = new MappingLocation(span.Start, span.Length),
                 };
 
                 Namespace.Children.Insert(i, @using);
@@ -205,7 +220,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                 {
                     Content = span.Content,
                     Descriptor = chunkGenerator.Descriptor,
-                    SourceLocation = span.Start,
+                    SourceRange = new MappingLocation(span.Start, span.Length),
                 });
             }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpAttributeValueIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string Prefix { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpExpressionIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public override void Accept(RazorIRNodeVisitor visitor)
         {

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpStatementIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string Content { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpTokenIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string Content { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/ClassDeclarationIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string AccessModifier { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DirectiveIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string Name { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DirectiveTokenIRNode.cs

@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string Content { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DocumentIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public override void Accept(RazorIRNodeVisitor visitor)
         {

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlAttributeIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string Name { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlAttributeValueIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string Prefix { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlContentIRNode.cs

@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public override void Accept(RazorIRNodeVisitor visitor)
         {

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/NamespaceDeclarationIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string Content { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNode.cs

@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public abstract RazorIRNode Parent { get; set; }
 
-        internal abstract SourceLocation SourceLocation { get; set; }
+        internal abstract MappingLocation SourceRange { get; set; }
 
         public abstract void Accept(RazorIRNodeVisitor visitor);
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorMethodDeclarationIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string AccessModifier { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/TemplateIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public override void Accept(RazorIRNodeVisitor visitor)
         {

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/UsingStatementIRNode.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
         public override RazorIRNode Parent { get; set; }
 
-        internal override SourceLocation SourceLocation { get; set; }
+        internal override MappingLocation SourceRange { get; set; }
 
         public string Content { get; set; }
 

src/Microsoft.AspNetCore.Razor.Evolution/Legacy/MappingLocation.cs

@@ -14,12 +14,17 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
         }
 
         public MappingLocation(SourceLocation location, int contentLength)
+            : this (location.AbsoluteIndex, location.LineIndex, location.CharacterIndex, contentLength, location.FilePath)
         {
+        }
+
+        public MappingLocation(int absoluteIndex, int lineIndex, int characterIndex, int contentLength, string filePath)
+        {
+            AbsoluteIndex = absoluteIndex;
+            LineIndex = lineIndex;
+            CharacterIndex = characterIndex;
             ContentLength = contentLength;
-            AbsoluteIndex = location.AbsoluteIndex;
+            FilePath = filePath;
-            LineIndex = location.LineIndex;
-            CharacterIndex = location.CharacterIndex;
-            FilePath = location.FilePath;
         }
 
         public int ContentLength { get; }

test/Microsoft.AspNetCore.Razor.Evolution.Test/IntegrationTests/RazorIRNodeWriter.cs

@@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests
             WriteIndent();
             WriteName(node);
             WriteSeparator();
-            WriteLocation(node);
+            WriteSourceRange(node);
         }
 
         protected void WriteContentNode(RazorIRNode node, params string[] content)
@@ -97,7 +97,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests
             WriteIndent();
             WriteName(node);
             WriteSeparator();
-            WriteLocation(node);
+            WriteSourceRange(node);
 
             for (var i = 0; i < content.Length; i++)
             {
@@ -140,9 +140,12 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests
             }
         }
 
-        protected void WriteLocation(RazorIRNode node)
+        protected void WriteSourceRange(RazorIRNode node)
         {
-            _writer.Write(node.SourceLocation.ToString());
+            if (node.SourceRange != null)
+            {
+                _writer.Write(node.SourceRange.ToString());
+            }
         }
 
         protected void WriteContent(string content)

test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultRazorIRBuilderTest.cs

@@ -152,7 +152,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
             public override RazorIRNode Parent { get; set; }
 
-            internal override SourceLocation SourceLocation { get; set; }
+            internal override MappingLocation SourceRange { get; set; }
 
             public override void Accept(RazorIRNodeVisitor visitor)
             {

test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRNodeWalkerTest.cs

@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 
             public override RazorIRNode Parent { get; set; }
 
-            internal override SourceLocation SourceLocation { get; set; }
+            internal override MappingLocation SourceRange { get; set; }
 
             public override void Accept(RazorIRNodeVisitor visitor)
             {

test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt

@@ -1,7 +1,7 @@
-Document - (0:0,0)
+Document - 
-    NamespaceDeclaration - (0:0,0) - 
+    NamespaceDeclaration -  - 
-        ClassDeclaration - (0:0,0) -  -  -  - 
+        ClassDeclaration -  -  -  -  - 
-            RazorMethodDeclaration - (0:0,0) -  -  -  - 
+            RazorMethodDeclaration -  -  -  -  - 
-                HtmlContent - (0:0,0) - 
+                HtmlContent - (0:0,0 [0] ) - 
-                Directive - (0:0,0) - test_directive
+                Directive -  - test_directive
-                HtmlContent - (15:0,15) - 
+                HtmlContent - (15:0,15 [0] ) - 

test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt

@@ -1,5 +1,5 @@
-Document - (0:0,0)
+Document - 
-    NamespaceDeclaration - (0:0,0) - 
+    NamespaceDeclaration -  - 
-        ClassDeclaration - (0:0,0) -  -  -  - 
+        ClassDeclaration -  -  -  -  - 
-            RazorMethodDeclaration - (0:0,0) -  -  -  - 
+            RazorMethodDeclaration -  -  -  -  - 
-                HtmlContent - (0:0,0) - 
+                HtmlContent - (0:0,0 [0] ) - 

test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt

@@ -1,5 +1,5 @@
-Document - (0:0,0)
+Document - 
-    NamespaceDeclaration - (0:0,0) - 
+    NamespaceDeclaration -  - 
-        ClassDeclaration - (0:0,0) -  -  -  - 
+        ClassDeclaration -  -  -  -  - 
-            RazorMethodDeclaration - (0:0,0) -  -  -  - 
+            RazorMethodDeclaration -  -  -  -  - 
-                HtmlContent - (0:0,0) - Hello, World!
+                HtmlContent - (0:0,0 [13] ) - Hello, World!

test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt

@@ -1,10 +1,10 @@
-Document - (0:0,0)
+Document - 
-    NamespaceDeclaration - (0:0,0) - 
+    NamespaceDeclaration -  - 
-        ClassDeclaration - (0:0,0) -  -  -  - 
+        ClassDeclaration -  -  -  -  - 
-            RazorMethodDeclaration - (0:0,0) -  -  -  - 
+            RazorMethodDeclaration -  -  -  -  - 
-                HtmlContent - (0:0,0) - <html>\r\n<body>\r\n    <span
+                HtmlContent - (0:0,0 [6] ) - <html>\r\n<body>\r\n    <span
-                HtmlAttribute - (25:2,9) -  val=" - "
+                HtmlAttribute - (25:2,9 [13] ) -  val=" - "
-                    CSharpAttributeValue - (31:2,15) - 
+                    CSharpAttributeValue - (31:2,15 [6] ) - 
-                        CSharpExpression - (31:2,15)
+                        CSharpExpression - (32:2,16 [5] )
-                            CSharpToken - (32:2,16) - Hello
+                            CSharpToken - (32:2,16 [5] ) - Hello
-                HtmlContent - (38:2,22) -  />\r\n</body>\r\n</html>"
+                HtmlContent - (38:2,22 [3] ) -  />\r\n</body>\r\n</html>"

test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt

@@ -1,8 +1,8 @@
-Document - (0:0,0)
+Document - 
-    NamespaceDeclaration - (0:0,0) - 
+    NamespaceDeclaration -  - 
-        ClassDeclaration - (0:0,0) -  -  -  - 
+        ClassDeclaration -  -  -  -  - 
-            RazorMethodDeclaration - (0:0,0) -  -  -  - 
+            RazorMethodDeclaration -  -  -  -  - 
-                HtmlContent - (0:0,0) - <html>\r\n<body>\r\n    <span data\-val="
+                HtmlContent - (0:0,0 [6] ) - <html>\r\n<body>\r\n    <span data\-val="
-                CSharpExpression - (36:2,20)
+                CSharpExpression - (37:2,21 [5] )
-                    CSharpToken - (37:2,21) - Hello
+                    CSharpToken - (37:2,21 [5] ) - Hello
-                HtmlContent - (42:2,26) - " />\r\n</body>\r\n</html>"
+                HtmlContent - (42:2,26 [1] ) - " />\r\n</body>\r\n</html>"