diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorIRLoweringPhase.cs b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorIRLoweringPhase.cs
index dfc5dbeb3e..2c1a96d7c6 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorIRLoweringPhase.cs
+++ b/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,
-
- SourceLocation = block.Start,
+ SourceRange = new MappingLocation(block.Start, block.Length),
});
}
@@ -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()
- {
- SourceLocation = block.Start,
- });
+ Builder.Push(new CSharpExpressionIRNode());
}
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),
});
}
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpAttributeValueIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpAttributeValueIRNode.cs
index c453db4ede..dccb6e084a 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpAttributeValueIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpExpressionIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpExpressionIRNode.cs
index ef63ea9276..cf3cda11a9 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpExpressionIRNode.cs
+++ b/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)
{
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpStatementIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpStatementIRNode.cs
index 40fc25e690..49cfa2c565 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpStatementIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpTokenIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpTokenIRNode.cs
index 0d0406de6e..7edd26d0d9 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpTokenIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/ClassDeclarationIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/ClassDeclarationIRNode.cs
index e902838955..1f5b112242 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/ClassDeclarationIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DirectiveIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DirectiveIRNode.cs
index 35999c85e0..a9a4db3396 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DirectiveIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DirectiveTokenIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DirectiveTokenIRNode.cs
index cd55554304..7dfdc8e461 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DirectiveTokenIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DocumentIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DocumentIRNode.cs
index cc0e01f8ff..f4d9f72965 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DocumentIRNode.cs
+++ b/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)
{
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlAttributeIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlAttributeIRNode.cs
index d0bb940d27..16bf50b686 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlAttributeIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlAttributeValueIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlAttributeValueIRNode.cs
index 15e845fb33..fb4ccb18c4 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlAttributeValueIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlContentIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlContentIRNode.cs
index 7744f9c522..a1797912a8 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/HtmlContentIRNode.cs
+++ b/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)
{
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/NamespaceDeclarationIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/NamespaceDeclarationIRNode.cs
index 30d9eb3950..fe6cfad48d 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/NamespaceDeclarationIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNode.cs
index 5b6d9cc40d..12458b6d1d 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNode.cs
+++ b/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);
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorMethodDeclarationIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorMethodDeclarationIRNode.cs
index 9953efde30..929fe3a238 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorMethodDeclarationIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/TemplateIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/TemplateIRNode.cs
index 77c1354726..7ade5a9a71 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/TemplateIRNode.cs
+++ b/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)
{
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/UsingStatementIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/UsingStatementIRNode.cs
index 3236f3de9f..a316ecbb07 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/UsingStatementIRNode.cs
+++ b/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; }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Legacy/MappingLocation.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Legacy/MappingLocation.cs
index 1ce02080b4..15e1d62f24 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Legacy/MappingLocation.cs
+++ b/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;
- LineIndex = location.LineIndex;
- CharacterIndex = location.CharacterIndex;
- FilePath = location.FilePath;
+ FilePath = filePath;
}
public int ContentLength { get; }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/IntegrationTests/RazorIRNodeWriter.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/IntegrationTests/RazorIRNodeWriter.cs
index 94ff92634a..375d582281 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/IntegrationTests/RazorIRNodeWriter.cs
+++ b/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)
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultRazorIRBuilderTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultRazorIRBuilderTest.cs
index 97040a106a..9c9333f7b0 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultRazorIRBuilderTest.cs
+++ b/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)
{
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRNodeWalkerTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRNodeWalkerTest.cs
index 60b11085cd..07234da8b8 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRNodeWalkerTest.cs
+++ b/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)
{
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt
index bbcb572fab..021224c893 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt
@@ -1,7 +1,7 @@
-Document - (0:0,0)
- NamespaceDeclaration - (0:0,0) -
- ClassDeclaration - (0:0,0) - - - -
- RazorMethodDeclaration - (0:0,0) - - - -
- HtmlContent - (0:0,0) -
- Directive - (0:0,0) - test_directive
- HtmlContent - (15:0,15) -
+Document -
+ NamespaceDeclaration - -
+ ClassDeclaration - - - - -
+ RazorMethodDeclaration - - - - -
+ HtmlContent - (0:0,0 [0] ) -
+ Directive - - test_directive
+ HtmlContent - (15:0,15 [0] ) -
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt
index 1c85f7ab1a..a26b3a9973 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt
@@ -1,5 +1,5 @@
-Document - (0:0,0)
- NamespaceDeclaration - (0:0,0) -
- ClassDeclaration - (0:0,0) - - - -
- RazorMethodDeclaration - (0:0,0) - - - -
- HtmlContent - (0:0,0) -
+Document -
+ NamespaceDeclaration - -
+ ClassDeclaration - - - - -
+ RazorMethodDeclaration - - - - -
+ HtmlContent - (0:0,0 [0] ) -
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt
index b48bcea950..f8e644a9c5 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt
@@ -1,5 +1,5 @@
-Document - (0:0,0)
- NamespaceDeclaration - (0:0,0) -
- ClassDeclaration - (0:0,0) - - - -
- RazorMethodDeclaration - (0:0,0) - - - -
- HtmlContent - (0:0,0) - Hello, World!
+Document -
+ NamespaceDeclaration - -
+ ClassDeclaration - - - - -
+ RazorMethodDeclaration - - - - -
+ HtmlContent - (0:0,0 [13] ) - Hello, World!
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt
index 5e1c335d6c..8ed15041a2 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt
@@ -1,10 +1,10 @@
-Document - (0:0,0)
- NamespaceDeclaration - (0:0,0) -
- ClassDeclaration - (0:0,0) - - - -
- RazorMethodDeclaration - (0:0,0) - - - -
- HtmlContent - (0:0,0) - \r\n\r\n \r\n\r\n"
+Document -
+ NamespaceDeclaration - -
+ ClassDeclaration - - - - -
+ RazorMethodDeclaration - - - - -
+ HtmlContent - (0:0,0 [6] ) - \r\n\r\n \r\n\r\n"
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt
index 3364c9391a..6f2258bf2f 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt
@@ -1,8 +1,8 @@
-Document - (0:0,0)
- NamespaceDeclaration - (0:0,0) -
- ClassDeclaration - (0:0,0) - - - -
- RazorMethodDeclaration - (0:0,0) - - - -
- HtmlContent - (0:0,0) - \r\n\r\n \r\n\r\n"
+Document -
+ NamespaceDeclaration - -
+ ClassDeclaration - - - - -
+ RazorMethodDeclaration - - - - -
+ HtmlContent - (0:0,0 [6] ) - \r\n\r\n \r\n\r\n"