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

Fix broken padding in design time 

The padding calculation for C# expression wasn't taking into account the
` = ` so all of the padding values for expressions were off by 3.
This commit is contained in:
Ryan Nowak 2017-03-06 15:54:47 -08:00
parent 966cd4a68d
commit cefca39510
70 changed files with 1221 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/DefaultDocumentWriter.cs
View File

@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
_context.RenderChildren = visitor.RenderChildren;
_context.RenderNode = visitor.Visit;
_context.BasicWriter = new DefaultBasicWriter();
_context.BasicWriter = _context.Options.DesignTimeMode ? (BasicWriter)new DesignTimeBasicWriter() : new RuntimeBasicWriter();
_context.TagHelperWriter = new DefaultTagHelperWriter();
visitor.VisitDocument(node);

78
src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/DefaultBasicWriter.cs → src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/DesignTimeBasicWriter.cs
View File

@ -6,10 +6,8 @@ using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
{
public class DefaultBasicWriter : BasicWriter
public class DesignTimeBasicWriter : BasicWriter
{
public string WriteCSharpExpressionMethod { get; set; } = "Write";
public override void WriteCSharpExpression(CSharpRenderingContext context, CSharpExpressionIRNode node)
{
if (context == null)
@ -22,62 +20,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
throw new ArgumentNullException(nameof(node));
}
if (context.Options.DesignTimeMode)
{
WriteCSharpExpressionDesignTime(context, node);
}
else
{
WriteCSharpExpressionRuntime(context, node);
}
}
public override void WriteCSharpStatement(CSharpRenderingContext context, CSharpStatementIRNode node)
{
throw new NotImplementedException();
}
public override void WriteHtmlAttribute(CSharpRenderingContext context, HtmlAttributeIRNode node)
{
throw new NotImplementedException();
}
public override void WriteHtmlContent(CSharpRenderingContext context, HtmlContentIRNode node)
{
throw new NotImplementedException();
}
protected void WriteCSharpExpressionRuntime(CSharpRenderingContext context, CSharpExpressionIRNode node)
{
IDisposable linePragmaScope = null;
if (node.Source != null)
{
linePragmaScope = context.Writer.BuildLinePragma(node.Source.Value);
context.Writer.WritePadding(WriteCSharpExpressionMethod.Length + 1, node.Source, context);
}
context.Writer.WriteStartMethodInvocation(WriteCSharpExpressionMethod);
for (var i = 0; i < node.Children.Count; i++)
{
if (node.Children[i] is RazorIRToken token && token.IsCSharp)
{
context.Writer.Write(token.Content);
}
else
{
// There may be something else inside the expression like a Template or another extension node.
context.RenderNode(node.Children[i]);
}
}
context.Writer.WriteEndMethodInvocation();
linePragmaScope?.Dispose();
}
protected void WriteCSharpExpressionDesignTime(CSharpRenderingContext context, CSharpExpressionIRNode node)
{
if (node.Children.Count == 0)
{
return;
@ -87,7 +29,8 @@ namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
{
using (context.Writer.BuildLinePragma(node.Source.Value))
{
context.Writer.WritePadding(RazorDesignTimeIRPass.DesignTimeVariable.Length, node.Source, context);
var offset = RazorDesignTimeIRPass.DesignTimeVariable.Length + " = ".Length;
context.Writer.WritePadding(offset, node.Source, context);
context.Writer.WriteStartAssignment(RazorDesignTimeIRPass.DesignTimeVariable);
for (var i = 0; i < node.Children.Count; i++)
@ -125,5 +68,20 @@ namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
context.Writer.WriteLine(";");
}
}
public override void WriteCSharpStatement(CSharpRenderingContext context, CSharpStatementIRNode node)
{
throw new NotImplementedException();
}
public override void WriteHtmlAttribute(CSharpRenderingContext context, HtmlAttributeIRNode node)
{
throw new NotImplementedException();
}
public override void WriteHtmlContent(CSharpRenderingContext context, HtmlContentIRNode node)
{
throw new NotImplementedException();
}
}
}

3
src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/DesignTimeCSharpRenderer.cs
View File

@ -27,7 +27,8 @@ namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
{
using (Context.Writer.BuildLinePragma(node.Source.Value))
{
var padding = BuildOffsetPadding(RazorDesignTimeIRPass.DesignTimeVariable.Length, node.Source.Value, Context);
var offset = RazorDesignTimeIRPass.DesignTimeVariable.Length + " = ".Length;
var padding = BuildOffsetPadding(offset, node.Source.Value, Context);
Context.Writer
.Write(padding)

67
src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/RuntimeBasicWriter.cs Normal file
View File

@ -0,0 +1,67 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
{
public class RuntimeBasicWriter : BasicWriter
{
public string WriteCSharpExpressionMethod { get; set; } = "Write";
public override void WriteCSharpExpression(CSharpRenderingContext context, CSharpExpressionIRNode node)
{
if (context == null)
{
throw new ArgumentNullException(nameof(context));
}
if (node == null)
{
throw new ArgumentNullException(nameof(node));
}
IDisposable linePragmaScope = null;
if (node.Source != null)
{
linePragmaScope = context.Writer.BuildLinePragma(node.Source.Value);
context.Writer.WritePadding(WriteCSharpExpressionMethod.Length + 1, node.Source, context);
}
context.Writer.WriteStartMethodInvocation(WriteCSharpExpressionMethod);
for (var i = 0; i < node.Children.Count; i++)
{
if (node.Children[i] is RazorIRToken token && token.IsCSharp)
{
context.Writer.Write(token.Content);
}
else
{
// There may be something else inside the expression like a Template or another extension node.
context.RenderNode(node.Children[i]);
}
}
context.Writer.WriteEndMethodInvocation();
linePragmaScope?.Dispose();
}
public override void WriteCSharpStatement(CSharpRenderingContext context, CSharpStatementIRNode node)
{
throw new NotImplementedException();
}
public override void WriteHtmlAttribute(CSharpRenderingContext context, HtmlAttributeIRNode node)
{
throw new NotImplementedException();
}
public override void WriteHtmlContent(CSharpRenderingContext context, HtmlContentIRNode node)
{
throw new NotImplementedException();
}
}
}

138
test/Microsoft.AspNetCore.Razor.Evolution.Test/CodeGeneration/DefaultDocumentWriterTest.cs Normal file
View File

@ -0,0 +1,138 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
using Xunit;
namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
{
public class DefaultDocumentWriterTest
{
[Fact]
public void WriteDocument_WritesNamespace()
{
// Arrange
var codeDocument = TestRazorCodeDocument.CreateEmpty();
var options = RazorParserOptions.CreateDefaultOptions();
var target = RuntimeTarget.CreateDefault(codeDocument, options);
var context = new CSharpRenderingContext()
{
Options = options,
Writer = new Legacy.CSharpCodeWriter(),
};
var renderer = new RuntimeCSharpRenderer(target, context);
var writer = new DefaultDocumentWriter(target, context, renderer);
var builder = RazorIRBuilder.Document();
builder.Add(new NamespaceDeclarationIRNode()
{
Content = "TestNamespace",
});
var document = (DocumentIRNode)builder.Build();
// Act
writer.WriteDocument(document);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"namespace TestNamespace
{
#line hidden
}
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteDocument_WritesClass()
{
// Arrange
var codeDocument = TestRazorCodeDocument.CreateEmpty();
var options = RazorParserOptions.CreateDefaultOptions();
var target = RuntimeTarget.CreateDefault(codeDocument, options);
var context = new CSharpRenderingContext()
{
Options = options,
Writer = new Legacy.CSharpCodeWriter(),
};
var renderer = new RuntimeCSharpRenderer(target, context);
var writer = new DefaultDocumentWriter(target, context, renderer);
var builder = RazorIRBuilder.Document();
builder.Add(new ClassDeclarationIRNode()
{
AccessModifier = "internal",
BaseType = "TestBase",
Interfaces = new List<string> { "IFoo", "IBar", },
Name = "TestClass",
});
var document = (DocumentIRNode)builder.Build();
// Act
writer.WriteDocument(document);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"internal class TestClass : TestBase, IFoo, IBar
{
}
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteDocument_WritesMethod()
{
// Arrange
var codeDocument = TestRazorCodeDocument.CreateEmpty();
var options = RazorParserOptions.CreateDefaultOptions();
var target = RuntimeTarget.CreateDefault(codeDocument, options);
var context = new CSharpRenderingContext()
{
Options = options,
Writer = new Legacy.CSharpCodeWriter(),
};
var renderer = new RuntimeCSharpRenderer(target, context);
var writer = new DefaultDocumentWriter(target, context, renderer);
var builder = RazorIRBuilder.Document();
builder.Add(new RazorMethodDeclarationIRNode()
{
AccessModifier = "internal",
Modifiers = new List<string> { "virtual", "async", },
Name = "TestMethod",
ReturnType = "string",
});
var document = (DocumentIRNode)builder.Build();
// Act
writer.WriteDocument(document);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"#pragma warning disable 1998
internal virtual async string TestMethod()
{
}
#pragma warning restore 1998
",
csharp,
ignoreLineEndingDifferences: true);
}
}
}

193
test/Microsoft.AspNetCore.Razor.Evolution.Test/CodeGeneration/DesignTimeBasicWriterTest.cs Normal file
View File

@ -0,0 +1,193 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
using Xunit;
namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
{
public class DesignTimeBasicWriterTest
{
[Fact]
public void WriteCSharpExpression_SkipsLinePragma_WithoutSource()
{
// Arrange
var writer = new DesignTimeBasicWriter();
var context = new CSharpRenderingContext()
{
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode();
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i++",
Kind = RazorIRToken.TokenKind.CSharp,
});
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"__o = i++;
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteCSharpExpression_WritesLinePragma_WithSource()
{
// Arrange
var writer = new DesignTimeBasicWriter();
var context = new CSharpRenderingContext()
{
Options = RazorParserOptions.CreateDefaultOptions(),
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode()
{
Source = new SourceSpan("test.cshtml", 0, 0, 0, 3),
};
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i++",
Kind = RazorIRToken.TokenKind.CSharp,
});
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"#line 1 ""test.cshtml""
__o = i++;
#line default
#line hidden
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteCSharpExpression_WithExtensionNode_WritesPadding()
{
// Arrange
var writer = new DesignTimeBasicWriter();
var context = new CSharpRenderingContext()
{
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode();
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i",
Kind = RazorIRToken.TokenKind.CSharp,
});
builder.Add(new MyExtensionIRNode());
builder.Add(new RazorIRToken()
{
Content = "++",
Kind = RazorIRToken.TokenKind.CSharp,
});
context.RenderNode = (n) => Assert.IsType<MyExtensionIRNode>(n);
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"__o = i++;
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteCSharpExpression_WithSource_WritesPadding()
{
// Arrange
var writer = new DesignTimeBasicWriter();
var context = new CSharpRenderingContext()
{
Options = RazorParserOptions.CreateDefaultOptions(),
SourceDocument = TestRazorSourceDocument.Create(" @i++"),
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode()
{
Source = new SourceSpan("test.cshtml", 8, 0, 8, 3),
};
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i",
Kind = RazorIRToken.TokenKind.CSharp,
});
builder.Add(new MyExtensionIRNode());
builder.Add(new RazorIRToken()
{
Content = "++",
Kind = RazorIRToken.TokenKind.CSharp,
});
context.RenderNode = (n) => Assert.IsType<MyExtensionIRNode>(n);
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"#line 1 ""test.cshtml""
__o = i++;
#line default
#line hidden
",
csharp,
ignoreLineEndingDifferences: true);
}
private class MyExtensionIRNode : ExtensionIRNode
{
public override IList<RazorIRNode> Children => throw new NotImplementedException();
public override RazorIRNode Parent { get; set; }
public override SourceSpan? Source { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public override void Accept(RazorIRNodeVisitor visitor)
{
throw new NotImplementedException();
}
public override TResult Accept<TResult>(RazorIRNodeVisitor<TResult> visitor)
{
throw new NotImplementedException();
}
public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context)
{
throw new NotImplementedException();
}
}
}
}

245
test/Microsoft.AspNetCore.Razor.Evolution.Test/CodeGeneration/RedirectedBasicWriterTest.cs Normal file
View File

@ -0,0 +1,245 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
using Xunit;
namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
{
public class RedirectedBasicWriterTest
{
// In design time this will not include the 'text writer' parameter.
[Fact]
public void WriteCSharpExpression_DesignTime_DoesNormalWrite()
{
// Arrange
var writer = new RedirectedBasicWriter(new DesignTimeBasicWriter(), "test_writer")
{
WriteCSharpExpressionMethod = "Test",
};
var context = new CSharpRenderingContext()
{
Options = RazorParserOptions.CreateDefaultOptions(),
Writer = new Legacy.CSharpCodeWriter(),
};
context.Options.DesignTimeMode = true;
var node = new CSharpExpressionIRNode();
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i++",
Kind = RazorIRToken.TokenKind.CSharp,
});
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"__o = i++;
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteCSharpExpression_Runtime_SkipsLinePragma_WithoutSource()
{
// Arrange
var writer = new RedirectedBasicWriter(new DesignTimeBasicWriter(), "test_writer")
{
WriteCSharpExpressionMethod = "Test",
};
var context = new CSharpRenderingContext()
{
Options = RazorParserOptions.CreateDefaultOptions(),
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode();
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i++",
Kind = RazorIRToken.TokenKind.CSharp,
});
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"Test(test_writer, i++);
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteCSharpExpression_Runtime_WritesLinePragma_WithSource()
{
// Arrange
var writer = new RedirectedBasicWriter(new DesignTimeBasicWriter(), "test_writer")
{
WriteCSharpExpressionMethod = "Test",
};
var context = new CSharpRenderingContext()
{
Options = RazorParserOptions.CreateDefaultOptions(),
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode()
{
Source = new SourceSpan("test.cshtml", 0, 0, 0, 3),
};
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i++",
Kind = RazorIRToken.TokenKind.CSharp,
});
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"#line 1 ""test.cshtml""
Test(test_writer, i++);
#line default
#line hidden
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteCSharpExpression_Runtime_WithExtensionNode_WritesPadding()
{
// Arrange
var writer = new RedirectedBasicWriter(new DesignTimeBasicWriter(), "test_writer")
{
WriteCSharpExpressionMethod = "Test",
};
var context = new CSharpRenderingContext()
{
Options = RazorParserOptions.CreateDefaultOptions(),
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode();
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i",
Kind = RazorIRToken.TokenKind.CSharp,
});
builder.Add(new MyExtensionIRNode());
builder.Add(new RazorIRToken()
{
Content = "++",
Kind = RazorIRToken.TokenKind.CSharp,
});
context.RenderNode = (n) => Assert.IsType<MyExtensionIRNode>(n);
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"Test(test_writer, i++);
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteCSharpExpression_Runtime_WithSource_WritesPadding()
{
// Arrange
var writer = new RedirectedBasicWriter(new DesignTimeBasicWriter(), "test_writer")
{
WriteCSharpExpressionMethod = "Test",
};
var context = new CSharpRenderingContext()
{
Options = RazorParserOptions.CreateDefaultOptions(),
SourceDocument = TestRazorSourceDocument.Create(" @i++"),
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode()
{
Source = new SourceSpan("test.cshtml", 24, 0, 24, 3),
};
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i",
Kind = RazorIRToken.TokenKind.CSharp,
});
builder.Add(new MyExtensionIRNode());
builder.Add(new RazorIRToken()
{
Content = "++",
Kind = RazorIRToken.TokenKind.CSharp,
});
context.RenderNode = (n) => Assert.IsType<MyExtensionIRNode>(n);
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"#line 1 ""test.cshtml""
Test(test_writer, i++);
#line default
#line hidden
",
csharp,
ignoreLineEndingDifferences: true);
}
private class MyExtensionIRNode : ExtensionIRNode
{
public override IList<RazorIRNode> Children => throw new NotImplementedException();
public override RazorIRNode Parent { get; set; }
public override SourceSpan? Source { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public override void Accept(RazorIRNodeVisitor visitor)
{
throw new NotImplementedException();
}
public override TResult Accept<TResult>(RazorIRNodeVisitor<TResult> visitor)
{
throw new NotImplementedException();
}
public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context)
{
throw new NotImplementedException();
}
}
}
}

205
test/Microsoft.AspNetCore.Razor.Evolution.Test/CodeGeneration/RuntimeBasicWriterTest.cs Normal file
View File

@ -0,0 +1,205 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
using Xunit;
namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
{
public class RuntimeBasicWriterTest
{
[Fact]
public void WriteCSharpExpression_SkipsLinePragma_WithoutSource()
{
// Arrange
var writer = new RuntimeBasicWriter()
{
WriteCSharpExpressionMethod = "Test",
};
var context = new CSharpRenderingContext()
{
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode();
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i++",
Kind = RazorIRToken.TokenKind.CSharp,
});
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"Test(i++);
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteCSharpExpression_WritesLinePragma_WithSource()
{
// Arrange
var writer = new RuntimeBasicWriter()
{
WriteCSharpExpressionMethod = "Test",
};
var context = new CSharpRenderingContext()
{
Options = RazorParserOptions.CreateDefaultOptions(),
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode()
{
Source = new SourceSpan("test.cshtml", 0, 0, 0, 3),
};
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i++",
Kind = RazorIRToken.TokenKind.CSharp,
});
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"#line 1 ""test.cshtml""
Test(i++);
#line default
#line hidden
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteCSharpExpression_WithExtensionNode_WritesPadding()
{
// Arrange
var writer = new RuntimeBasicWriter()
{
WriteCSharpExpressionMethod = "Test",
};
var context = new CSharpRenderingContext()
{
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode();
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i",
Kind = RazorIRToken.TokenKind.CSharp,
});
builder.Add(new MyExtensionIRNode());
builder.Add(new RazorIRToken()
{
Content = "++",
Kind = RazorIRToken.TokenKind.CSharp,
});
context.RenderNode = (n) => Assert.IsType<MyExtensionIRNode>(n);
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"Test(i++);
",
csharp,
ignoreLineEndingDifferences: true);
}
[Fact]
public void WriteCSharpExpression_WithSource_WritesPadding()
{
// Arrange
var writer = new RuntimeBasicWriter()
{
WriteCSharpExpressionMethod = "Test",
};
var context = new CSharpRenderingContext()
{
Options = RazorParserOptions.CreateDefaultOptions(),
SourceDocument = TestRazorSourceDocument.Create(" @i++"),
Writer = new Legacy.CSharpCodeWriter(),
};
var node = new CSharpExpressionIRNode()
{
Source = new SourceSpan("test.cshtml", 8, 0, 8, 3),
};
var builder = RazorIRBuilder.Create(node);
builder.Add(new RazorIRToken()
{
Content = "i",
Kind = RazorIRToken.TokenKind.CSharp,
});
builder.Add(new MyExtensionIRNode());
builder.Add(new RazorIRToken()
{
Content = "++",
Kind = RazorIRToken.TokenKind.CSharp,
});
context.RenderNode = (n) => Assert.IsType<MyExtensionIRNode>(n);
// Act
writer.WriteCSharpExpression(context, node);
// Assert
var csharp = context.Writer.Builder.ToString();
Assert.Equal(
@"#line 1 ""test.cshtml""
Test(i++);
#line default
#line hidden
",
csharp,
ignoreLineEndingDifferences: true);
}
private class MyExtensionIRNode : ExtensionIRNode
{
public override IList<RazorIRNode> Children => throw new NotImplementedException();
public override RazorIRNode Parent { get; set; }
public override SourceSpan? Source { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public override void Accept(RazorIRNodeVisitor visitor)
{
throw new NotImplementedException();
}
public override TResult Accept<TResult>(RazorIRNodeVisitor<TResult> visitor)
{
throw new NotImplementedException();
}
public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context)
{
throw new NotImplementedException();
}
}
}
}

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/CodeGeneration/TemplateTargetExtensionTest.cs
View File

@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
var context = new CSharpRenderingContext()
{
BasicWriter = new DefaultBasicWriter(),
BasicWriter = new RuntimeBasicWriter(),
Writer = new CSharpCodeWriter(),
};

18
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.cs
View File

@ -14,12 +14,12 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
public async System.Threading.Tasks.Task ExecuteAsync()
{
#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
__o = await Foo();
__o = await Foo();
#line default
#line hidden
#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
__o = await Foo();
__o = await Foo();
#line default
#line hidden
@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
__o = await Foo();
__o = await Foo();
#line default
#line hidden
@ -44,22 +44,22 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
__o = await;
__o = await;
#line default
#line hidden
#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
__o = await Foo(1, 2);
__o = await Foo(1, 2);
#line default
#line hidden
#line 20 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
__o = await Foo.Bar(1, 2);
__o = await Foo.Bar(1, 2);
#line default
#line hidden
#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
__o = await Foo("bob", true);
__o = await Foo("bob", true);
#line default
#line hidden
@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
__o = await Foo(boolValue: false);
__o = await Foo(boolValue: false);
#line default
#line hidden
@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
__o = await ("wrrronggg");
__o = await ("wrrronggg");
#line default
#line hidden

34
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.mappings.txt
View File

@ -1,81 +1,81 @@
Source Location: (192:9,39 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
|await Foo()|
Generated Location: (679:16,42 [11] )
Generated Location: (676:16,39 [11] )
|await Foo()|
Source Location: (247:10,38 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
|await Foo()|
Generated Location: (847:21,41 [11] )
Generated Location: (841:21,38 [11] )
|await Foo()|
Source Location: (304:11,39 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
| await Foo(); |
Generated Location: (1013:26,39 [14] )
Generated Location: (1007:26,39 [14] )
| await Foo(); |
Source Location: (371:12,46 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
| |
Generated Location: (1188:31,46 [1] )
Generated Location: (1182:31,46 [1] )
| |
Source Location: (376:12,51 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
|await Foo()|
Generated Location: (1358:36,54 [11] )
Generated Location: (1349:36,51 [11] )
|await Foo()|
Source Location: (391:12,66 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
| |
Generated Location: (1551:41,66 [1] )
Generated Location: (1542:41,66 [1] )
| |
Source Location: (448:13,49 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
|await|
Generated Location: (1719:46,52 [5] )
Generated Location: (1707:46,49 [5] )
|await|
Source Location: (578:18,42 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
|await Foo(1, 2)|
Generated Location: (1885:51,45 [15] )
Generated Location: (1870:51,42 [15] )
|await Foo(1, 2)|
Source Location: (650:19,51 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
|await Foo.Bar(1, 2)|
Generated Location: (2070:56,54 [19] )
Generated Location: (2052:56,51 [19] )
|await Foo.Bar(1, 2)|
Source Location: (716:20,41 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
|await Foo("bob", true)|
Generated Location: (2249:61,44 [22] )
Generated Location: (2228:61,41 [22] )
|await Foo("bob", true)|
Source Location: (787:21,42 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
| await Foo(something, hello: "world"); |
Generated Location: (2429:66,42 [39] )
Generated Location: (2408:66,42 [39] )
| await Foo(something, hello: "world"); |
Source Location: (884:22,51 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
| await Foo.Bar(1, 2) |
Generated Location: (2634:71,51 [21] )
Generated Location: (2613:71,51 [21] )
| await Foo.Bar(1, 2) |
Source Location: (961:23,49 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
| |
Generated Location: (2819:76,49 [1] )
Generated Location: (2798:76,49 [1] )
| |
Source Location: (966:23,54 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
|await Foo(boolValue: false)|
Generated Location: (2992:81,57 [27] )
Generated Location: (2968:81,54 [27] )
|await Foo(boolValue: false)|
Source Location: (997:23,85 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
| |
Generated Location: (3220:86,85 [1] )
Generated Location: (3196:86,85 [1] )
| |
Source Location: (1057:24,52 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
|await ("wrrronggg")|
Generated Location: (3391:91,55 [19] )
Generated Location: (3364:91,52 [19] )
|await ("wrrronggg")|
Source Location: (12:0,12 [76] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
@ -85,7 +85,7 @@ Source Location: (12:0,12 [76] TestFiles/IntegrationTests/CodeGenerationIntegrat
return "Bar";
}
|
Generated Location: (3586:98,12 [76] )
Generated Location: (3559:98,12 [76] )
|
public async Task<string> Foo()
{

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs
View File

@ -24,7 +24,7 @@ System.Object __typeHelper = "*, TestAssembly";
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
__TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml"
__o = ViewBag.DefaultInterval;
__o = ViewBag.DefaultInterval;
#line default
#line hidden

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt
View File

@ -5,11 +5,11 @@ Generated Location: (416:10,29 [17] )
Source Location: (220:5,38 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
|ViewBag.DefaultInterval|
Generated Location: (1382:26,41 [23] )
Generated Location: (1379:26,38 [23] )
|ViewBag.DefaultInterval|
Source Location: (303:6,40 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
|true|
Generated Location: (2080:37,42 [4] )
Generated Location: (2077:37,42 [4] )
|true|

8
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.cs
View File

@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
__o = i;
__o = i;
#line default
#line hidden
@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
__o = j;
__o = j;
#line default
#line hidden
@ -102,7 +102,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
__o = ex.Message;
__o = ex.Message;
#line default
#line hidden
@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
__o = i;
__o = i;
#line default
#line hidden

34
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.mappings.txt
View File

@ -16,14 +16,14 @@ Generated Location: (772:22,1 [22] )
Source Location: (69:5,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|i|
Generated Location: (937:28,28 [1] )
Generated Location: (934:28,25 [1] )
|i|
Source Location: (75:5,31 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|
i += 1;
}|
Generated Location: (1085:33,31 [16] )
Generated Location: (1082:33,31 [16] )
|
i += 1;
}|
@ -31,14 +31,14 @@ Generated Location: (1085:33,31 [16] )
Source Location: (96:9,1 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|if(i == 11) {
|
Generated Location: (1218:40,1 [19] )
Generated Location: (1215:40,1 [19] )
|if(i == 11) {
|
Source Location: (140:10,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|
}|
Generated Location: (1382:46,29 [3] )
Generated Location: (1379:46,29 [3] )
|
}|
@ -46,7 +46,7 @@ Source Location: (148:13,1 [35] TestFiles/IntegrationTests/CodeGenerationIntegra
|switch(i) {
case 11:
|
Generated Location: (1502:52,1 [35] )
Generated Location: (1499:52,1 [35] )
|switch(i) {
case 11:
|
@ -56,7 +56,7 @@ Source Location: (219:15,44 [40] TestFiles/IntegrationTests/CodeGenerationIntegr
break;
default:
|
Generated Location: (1697:59,44 [40] )
Generated Location: (1694:59,44 [40] )
|
break;
default:
@ -66,7 +66,7 @@ Source Location: (288:18,37 [19] TestFiles/IntegrationTests/CodeGenerationIntegr
|
break;
}|
Generated Location: (1890:67,37 [19] )
Generated Location: (1887:67,37 [19] )
|
break;
}|
@ -74,26 +74,26 @@ Generated Location: (1890:67,37 [19] )
Source Location: (312:22,1 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|for(int j = 1; j <= 10; j += 2) {
|
Generated Location: (2026:74,1 [39] )
Generated Location: (2023:74,1 [39] )
|for(int j = 1; j <= 10; j += 2) {
|
Source Location: (378:23,31 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|j|
Generated Location: (2215:80,34 [1] )
Generated Location: (2209:80,31 [1] )
|j|
Source Location: (384:23,37 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|
}|
Generated Location: (2370:85,37 [3] )
Generated Location: (2364:85,37 [3] )
|
}|
Source Location: (392:26,1 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|try {
|
Generated Location: (2490:91,1 [11] )
Generated Location: (2484:91,1 [11] )
|try {
|
@ -101,39 +101,39 @@ Source Location: (438:27,39 [31] TestFiles/IntegrationTests/CodeGenerationIntegr
|
} catch(Exception ex) {
|
Generated Location: (2656:97,39 [31] )
Generated Location: (2650:97,39 [31] )
|
} catch(Exception ex) {
|
Source Location: (500:29,35 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|ex.Message|
Generated Location: (2841:104,38 [10] )
Generated Location: (2832:104,35 [10] )
|ex.Message|
Source Location: (515:29,50 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|
}|
Generated Location: (3018:109,50 [3] )
Generated Location: (3009:109,50 [3] )
|
}|
Source Location: (535:32,13 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|i|
Generated Location: (3153:115,16 [1] )
Generated Location: (3141:115,13 [1] )
|i|
Source Location: (545:34,1 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|lock(new object()) {
|
Generated Location: (3272:120,1 [26] )
Generated Location: (3260:120,1 [26] )
|lock(new object()) {
|
Source Location: (618:35,51 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
|
}|
Generated Location: (3465:126,51 [3] )
Generated Location: (3453:126,51 [3] )
|
}|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.cs
View File

@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml"
__o = a+b;
__o = a+b;
#line default
#line hidden

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.mappings.txt
View File

@ -14,13 +14,13 @@ Generated Location: (857:22,31 [22] )
Source Location: (69:2,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml)
|a+b|
Generated Location: (1053:28,41 [3] )
Generated Location: (1050:28,38 [3] )
|a+b|
Source Location: (80:2,40 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml)
|
|
Generated Location: (1239:33,49 [2] )
Generated Location: (1236:33,49 [2] )
|
|

8
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs
View File

@ -53,7 +53,7 @@ System.Object __typeHelper = "*, TestAssembly";
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
__TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
__o = checkbox;
__o = checkbox;
#line default
#line hidden
@ -74,7 +74,7 @@ System.Object __typeHelper = "*, TestAssembly";
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
__TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
__o = true ? "checkbox" : "anything";
__o = true ? "checkbox" : "anything";
#line default
#line hidden
@ -113,7 +113,7 @@ System.Object __typeHelper = "*, TestAssembly";
#line hidden
__TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
__o = DateTime.Now;
__o = DateTime.Now;
#line default
#line hidden
@ -175,7 +175,7 @@ __TestNamespace_PTagHelper.Age = ("My age is this long.".Length);
#line default
#line hidden
#line 34 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
__o = someMethod(item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
__o = someMethod(item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
__TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
#line 34 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"

74
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt
View File

@ -40,194 +40,194 @@ Generated Location: (1955:44,99 [66] )
Source Location: (446:15,46 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|checkbox|
Generated Location: (2405:55,49 [8] )
Generated Location: (2402:55,46 [8] )
|checkbox|
Source Location: (463:15,63 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|true|
Generated Location: (2758:62,63 [4] )
Generated Location: (2755:62,63 [4] )
|true|
Source Location: (474:15,74 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|
|
Generated Location: (3059:68,74 [18] )
Generated Location: (3056:68,74 [18] )
|
|
Source Location: (507:16,31 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|true ? "checkbox" : "anything"|
Generated Location: (3446:76,34 [30] )
Generated Location: (3440:76,31 [30] )
|true ? "checkbox" : "anything"|
Source Location: (542:16,66 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|
|
Generated Location: (3824:83,66 [18] )
Generated Location: (3818:83,66 [18] )
|
|
Source Location: (574:17,30 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|if(true) { |
Generated Location: (4207:91,30 [11] )
Generated Location: (4201:91,30 [11] )
|if(true) { |
Source Location: (606:17,62 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
| } else { |
Generated Location: (4407:96,62 [10] )
Generated Location: (4401:96,62 [10] )
| } else { |
Source Location: (637:17,93 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
| }|
Generated Location: (4637:101,93 [2] )
Generated Location: (4631:101,93 [2] )
| }|
Source Location: (641:17,97 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|
}|
Generated Location: (5017:108,97 [15] )
Generated Location: (5011:108,97 [15] )
|
}|
Source Location: (163:7,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|DateTime.Now|
Generated Location: (5288:115,35 [12] )
Generated Location: (5279:115,32 [12] )
|DateTime.Now|
Source Location: (783:21,14 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
| var @object = false;|
Generated Location: (5442:120,14 [21] )
Generated Location: (5433:120,14 [21] )
| var @object = false;|
Source Location: (836:22,29 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|(|
Generated Location: (5840:127,42 [1] )
Generated Location: (5831:127,42 [1] )
|(|
Source Location: (837:22,30 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|@object|
Generated Location: (5841:127,43 [7] )
Generated Location: (5832:127,43 [7] )
|@object|
Source Location: (844:22,37 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|)|
Generated Location: (5848:127,50 [1] )
Generated Location: (5839:127,50 [1] )
|)|
Source Location: (711:20,39 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|DateTimeOffset.Now.Year|
Generated Location: (6110:133,38 [23] )
Generated Location: (6101:133,38 [23] )
|DateTimeOffset.Now.Year|
Source Location: (734:20,62 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
| - 1970|
Generated Location: (6133:133,61 [7] )
Generated Location: (6124:133,61 [7] )
| - 1970|
Source Location: (976:25,61 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|(|
Generated Location: (6536:140,60 [1] )
Generated Location: (6527:140,60 [1] )
|(|
Source Location: (977:25,62 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|DateTimeOffset.Now.Year > 2014|
Generated Location: (6537:140,61 [30] )
Generated Location: (6528:140,61 [30] )
|DateTimeOffset.Now.Year > 2014|
Source Location: (1007:25,92 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|)|
Generated Location: (6567:140,91 [1] )
Generated Location: (6558:140,91 [1] )
|)|
Source Location: (879:24,16 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|-1970 + |
Generated Location: (6824:146,33 [8] )
Generated Location: (6815:146,33 [8] )
|-1970 + |
Source Location: (887:24,24 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|@|
Generated Location: (6832:146,41 [1] )
Generated Location: (6823:146,41 [1] )
|@|
Source Location: (888:24,25 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|DateTimeOffset.Now.Year|
Generated Location: (6833:146,42 [23] )
Generated Location: (6824:146,42 [23] )
|DateTimeOffset.Now.Year|
Source Location: (1106:28,28 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|DateTimeOffset.Now.Year > 2014|
Generated Location: (7234:153,42 [30] )
Generated Location: (7225:153,42 [30] )
|DateTimeOffset.Now.Year > 2014|
Source Location: (1044:27,16 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|DateTimeOffset.Now.Year - 1970|
Generated Location: (7520:159,33 [30] )
Generated Location: (7511:159,33 [30] )
|DateTimeOffset.Now.Year - 1970|
Source Location: (1234:31,28 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
| |
Generated Location: (7928:166,42 [3] )
Generated Location: (7919:166,42 [3] )
| |
Source Location: (1237:31,31 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|@(|
Generated Location: (7931:166,45 [2] )
Generated Location: (7922:166,45 [2] )
|@(|
Source Location: (1239:31,33 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
| DateTimeOffset.Now.Year |
Generated Location: (7933:166,47 [27] )
Generated Location: (7924:166,47 [27] )
| DateTimeOffset.Now.Year |
Source Location: (1266:31,60 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|)|
Generated Location: (7960:166,74 [1] )
Generated Location: (7951:166,74 [1] )
|)|
Source Location: (1267:31,61 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
| > 2014 |
Generated Location: (7961:166,75 [10] )
Generated Location: (7952:166,75 [10] )
| > 2014 |
Source Location: (1171:30,17 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|(|
Generated Location: (8227:172,33 [1] )
Generated Location: (8218:172,33 [1] )
|(|
Source Location: (1172:30,18 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|"My age is this long.".Length|
Generated Location: (8228:172,34 [29] )
Generated Location: (8219:172,34 [29] )
|"My age is this long.".Length|
Source Location: (1201:30,47 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|)|
Generated Location: (8257:172,63 [1] )
Generated Location: (8248:172,63 [1] )
|)|
Source Location: (1306:33,9 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|someMethod(|
Generated Location: (8398:177,12 [11] )
Generated Location: (8386:177,9 [11] )
|someMethod(|
Source Location: (1361:33,64 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|checked|
Generated Location: (8851:181,63 [7] )
Generated Location: (8839:181,63 [7] )
|checked|
Source Location: (1326:33,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|123|
Generated Location: (9106:187,33 [3] )
Generated Location: (9094:187,33 [3] )
|123|
Source Location: (1375:33,78 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|)|
Generated Location: (9147:192,1 [1] )
Generated Location: (9135:192,1 [1] )
|)|
Source Location: (1388:34,10 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
|
}|
Generated Location: (9286:197,10 [3] )
Generated Location: (9274:197,10 [3] )
|
}|

16
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
__o = cls;
__o = cls;
#line default
#line hidden
@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
__o = cls;
__o = cls;
#line default
#line hidden
@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
__o = cls;
__o = cls;
#line default
#line hidden
@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
__o = ch;
__o = ch;
#line default
#line hidden
@ -72,7 +72,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
__o = ch;
__o = ch;
#line default
#line hidden
@ -88,7 +88,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
__o = cls;
__o = cls;
#line default
#line hidden
@ -110,7 +110,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
__o = Url.Content("~/Scripts/jquery-1.6.2.min.js");
__o = Url.Content("~/Scripts/jquery-1.6.2.min.js");
#line default
#line hidden
@ -121,7 +121,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
__o = Url.Content("~/Scripts/modernizr-2.0.6-development-only.js");
__o = Url.Content("~/Scripts/modernizr-2.0.6-development-only.js");
#line default
#line hidden

40
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.mappings.txt
View File

@ -18,121 +18,121 @@ Generated Location: (868:24,20 [6] )
Source Location: (83:4,15 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|cls|
Generated Location: (1022:30,18 [3] )
Generated Location: (1019:30,15 [3] )
|cls|
Source Location: (90:4,22 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|
|
Generated Location: (1178:35,22 [6] )
Generated Location: (1175:35,22 [6] )
|
|
Source Location: (111:5,19 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|cls|
Generated Location: (1336:41,22 [3] )
Generated Location: (1330:41,19 [3] )
|cls|
Source Location: (118:5,26 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|
|
Generated Location: (1496:46,26 [6] )
Generated Location: (1490:46,26 [6] )
|
|
Source Location: (135:6,15 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|cls|
Generated Location: (1650:52,18 [3] )
Generated Location: (1641:52,15 [3] )
|cls|
Source Location: (146:6,26 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|
|
Generated Location: (1810:57,26 [6] )
Generated Location: (1801:57,26 [6] )
|
|
Source Location: (185:7,37 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|ch|
Generated Location: (1986:63,40 [2] )
Generated Location: (1974:63,37 [2] )
|ch|
Source Location: (191:7,43 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|
|
Generated Location: (2162:68,43 [6] )
Generated Location: (2150:68,43 [6] )
|
|
Source Location: (234:8,41 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|ch|
Generated Location: (2342:74,44 [2] )
Generated Location: (2327:74,41 [2] )
|ch|
Source Location: (240:8,47 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|
|
Generated Location: (2522:79,47 [6] )
Generated Location: (2507:79,47 [6] )
|
|
Source Location: (257:9,15 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|if(cls != null) { |
Generated Location: (2674:85,15 [18] )
Generated Location: (2659:85,15 [18] )
|if(cls != null) { |
Source Location: (276:9,34 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|cls|
Generated Location: (2860:90,37 [3] )
Generated Location: (2842:90,34 [3] )
|cls|
Source Location: (279:9,37 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
| }|
Generated Location: (3032:95,37 [2] )
Generated Location: (3014:95,37 [2] )
| }|
Source Location: (285:9,43 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|
|
Generated Location: (3208:100,43 [6] )
Generated Location: (3190:100,43 [6] )
|
|
Source Location: (309:10,22 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|
|
Generated Location: (3367:106,22 [6] )
Generated Location: (3349:106,22 [6] )
|
|
Source Location: (329:11,18 [44] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|Url.Content("~/Scripts/jquery-1.6.2.min.js")|
Generated Location: (3525:112,21 [44] )
Generated Location: (3504:112,18 [44] )
|Url.Content("~/Scripts/jquery-1.6.2.min.js")|
Source Location: (407:11,96 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|
|
Generated Location: (3797:117,96 [6] )
Generated Location: (3776:117,96 [6] )
|
|
Source Location: (427:12,18 [60] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")|
Generated Location: (3955:123,21 [60] )
Generated Location: (3931:123,18 [60] )
|Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")|
Source Location: (521:12,112 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|
|
Generated Location: (4259:128,112 [6] )
Generated Location: (4235:128,112 [6] )
|
|
Source Location: (638:13,115 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
|
|
Generated Location: (4511:134,115 [2] )
Generated Location: (4487:134,115 [2] )
|
|

6
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs
View File

@ -24,7 +24,7 @@ System.Object Footer = null;
#line default
#line hidden
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
__o = i;
__o = i;
#line default
#line hidden
@ -42,7 +42,7 @@ __o = Foo(Bar.Baz);
#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
__o = Foo(item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
__o = baz;
__o = baz;
#line default
#line hidden
@ -53,7 +53,7 @@ __o = Foo(item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_
#line hidden
DefineSection("Footer", async (__razor_section_writer) => {
#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
__o = bar;
__o = bar;
#line default
#line hidden

14
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt
View File

@ -12,38 +12,38 @@ Generated Location: (749:20,13 [36] )
Source Location: (74:2,22 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
|i|
Generated Location: (929:26,25 [1] )
Generated Location: (926:26,22 [1] )
|i|
Source Location: (79:2,27 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
|
}|
Generated Location: (1077:31,27 [15] )
Generated Location: (1074:31,27 [15] )
|
}|
Source Location: (113:7,2 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
|Foo(Bar.Baz)|
Generated Location: (1217:37,6 [12] )
Generated Location: (1214:37,6 [12] )
|Foo(Bar.Baz)|
Source Location: (129:8,1 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
|Foo(|
Generated Location: (1355:42,6 [4] )
Generated Location: (1352:42,6 [4] )
|Foo(|
Source Location: (142:8,14 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
|baz|
Generated Location: (1555:44,17 [3] )
Generated Location: (1549:44,14 [3] )
|baz|
Source Location: (153:8,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
|)|
Generated Location: (1596:49,1 [1] )
Generated Location: (1590:49,1 [1] )
|)|
Source Location: (204:13,5 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
|bar|
Generated Location: (1799:55,8 [3] )
Generated Location: (1791:55,6 [3] )
|bar|

36
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs
View File

@ -20,7 +20,7 @@ System.Object __typeHelper = "*, TestAssembly";
{
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = DateTime.Now;
__o = DateTime.Now;
#line default
#line hidden
@ -31,7 +31,7 @@ System.Object __typeHelper = "*, TestAssembly";
#line default
#line hidden
#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = string.Empty;
__o = string.Empty;
#line default
#line hidden
@ -41,7 +41,7 @@ System.Object __typeHelper = "*, TestAssembly";
#line default
#line hidden
#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = false;
__o = false;
#line default
#line hidden
@ -52,19 +52,19 @@ System.Object __typeHelper = "*, TestAssembly";
#line hidden
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = DateTime.Now;
__o = DateTime.Now;
#line default
#line hidden
__TestNamespace_InputTagHelper.Bound = string.Empty;
#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = DateTime.Now;
__o = DateTime.Now;
#line default
#line hidden
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = long.MinValue;
__o = long.MinValue;
#line default
#line hidden
@ -74,7 +74,7 @@ System.Object __typeHelper = "*, TestAssembly";
#line default
#line hidden
#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = string.Empty;
__o = string.Empty;
#line default
#line hidden
@ -84,7 +84,7 @@ System.Object __typeHelper = "*, TestAssembly";
#line default
#line hidden
#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = false;
__o = false;
#line default
#line hidden
@ -94,13 +94,13 @@ System.Object __typeHelper = "*, TestAssembly";
#line default
#line hidden
#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = int.MaxValue;
__o = int.MaxValue;
#line default
#line hidden
__TestNamespace_InputTagHelper.Bound = string.Empty;
#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = long.MinValue;
__o = long.MinValue;
#line default
#line hidden
@ -110,7 +110,7 @@ System.Object __typeHelper = "*, TestAssembly";
#line default
#line hidden
#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = string.Empty;
__o = string.Empty;
#line default
#line hidden
@ -120,7 +120,7 @@ System.Object __typeHelper = "*, TestAssembly";
#line default
#line hidden
#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = false;
__o = false;
#line default
#line hidden
@ -130,23 +130,23 @@ System.Object __typeHelper = "*, TestAssembly";
#line default
#line hidden
#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = int.MaxValue;
__o = int.MaxValue;
#line default
#line hidden
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = long.MinValue;
__o = long.MinValue;
#line default
#line hidden
#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = DateTime.Now;
__o = DateTime.Now;
#line default
#line hidden
#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = int.MaxValue;
__o = int.MaxValue;
#line default
#line hidden
@ -157,7 +157,7 @@ System.Object __typeHelper = "*, TestAssembly";
#line default
#line hidden
#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = string.Empty;
__o = string.Empty;
#line default
#line hidden
@ -167,7 +167,7 @@ System.Object __typeHelper = "*, TestAssembly";
#line default
#line hidden
#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
__o = false;
__o = false;
#line default
#line hidden

60
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt
View File

@ -5,151 +5,151 @@ Generated Location: (427:10,29 [17] )
Source Location: (59:2,24 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|DateTime.Now|
Generated Location: (1010:22,27 [12] )
Generated Location: (1007:22,24 [12] )
|DateTime.Now|
Source Location: (96:4,17 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|if (true) { |
Generated Location: (1278:28,17 [12] )
Generated Location: (1275:28,17 [12] )
|if (true) { |
Source Location: (109:4,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|string.Empty|
Generated Location: (1458:33,33 [12] )
Generated Location: (1452:33,30 [12] )
|string.Empty|
Source Location: (121:4,42 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
| } else { |
Generated Location: (1648:38,42 [10] )
Generated Location: (1642:38,42 [10] )
| } else { |
Source Location: (132:4,53 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|false|
Generated Location: (1849:43,56 [5] )
Generated Location: (1840:43,53 [5] )
|false|
Source Location: (137:4,58 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
| }|
Generated Location: (2048:48,58 [2] )
Generated Location: (2039:48,58 [2] )
| }|
Source Location: (176:6,22 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|DateTime.Now|
Generated Location: (2313:54,25 [12] )
Generated Location: (2301:54,22 [12] )
|DateTime.Now|
Source Location: (214:6,60 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|DateTime.Now|
Generated Location: (2590:60,63 [12] )
Generated Location: (2575:60,60 [12] )
|DateTime.Now|
Source Location: (256:8,15 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|long.MinValue|
Generated Location: (2859:66,18 [13] )
Generated Location: (2841:66,15 [13] )
|long.MinValue|
Source Location: (271:8,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|if (true) { |
Generated Location: (3038:71,30 [12] )
Generated Location: (3020:71,30 [12] )
|if (true) { |
Source Location: (284:8,43 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|string.Empty|
Generated Location: (3231:76,46 [12] )
Generated Location: (3210:76,43 [12] )
|string.Empty|
Source Location: (296:8,55 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
| } else { |
Generated Location: (3434:81,55 [10] )
Generated Location: (3413:81,55 [10] )
| } else { |
Source Location: (307:8,66 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|false|
Generated Location: (3648:86,69 [5] )
Generated Location: (3624:86,66 [5] )
|false|
Source Location: (312:8,71 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
| }|
Generated Location: (3860:91,71 [2] )
Generated Location: (3836:91,71 [2] )
| }|
Source Location: (316:8,75 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|int.MaxValue|
Generated Location: (4075:96,78 [12] )
Generated Location: (4048:96,75 [12] )
|int.MaxValue|
Source Location: (348:9,17 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|long.MinValue|
Generated Location: (4310:102,20 [13] )
Generated Location: (4280:102,17 [13] )
|long.MinValue|
Source Location: (363:9,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|if (true) { |
Generated Location: (4492:107,32 [12] )
Generated Location: (4462:107,32 [12] )
|if (true) { |
Source Location: (376:9,45 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|string.Empty|
Generated Location: (4688:112,48 [12] )
Generated Location: (4655:112,45 [12] )
|string.Empty|
Source Location: (388:9,57 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
| } else { |
Generated Location: (4894:117,57 [10] )
Generated Location: (4861:117,57 [10] )
| } else { |
Source Location: (399:9,68 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|false|
Generated Location: (5111:122,71 [5] )
Generated Location: (5075:122,68 [5] )
|false|
Source Location: (404:9,73 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
| }|
Generated Location: (5326:127,73 [2] )
Generated Location: (5290:127,73 [2] )
| }|
Source Location: (408:9,77 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|int.MaxValue|
Generated Location: (5544:132,80 [12] )
Generated Location: (5505:132,77 [12] )
|int.MaxValue|
Source Location: (445:11,17 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|long.MinValue|
Generated Location: (5816:138,20 [13] )
Generated Location: (5774:138,17 [13] )
|long.MinValue|
Source Location: (460:11,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|DateTime.Now|
Generated Location: (6001:143,35 [12] )
Generated Location: (5956:143,32 [12] )
|DateTime.Now|
Source Location: (492:11,64 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|int.MaxValue|
Generated Location: (6217:148,67 [12] )
Generated Location: (6169:148,64 [12] )
|int.MaxValue|
Source Location: (529:13,17 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|if (true) { |
Generated Location: (6486:154,17 [12] )
Generated Location: (6438:154,17 [12] )
|if (true) { |
Source Location: (542:13,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|string.Empty|
Generated Location: (6667:159,33 [12] )
Generated Location: (6616:159,30 [12] )
|string.Empty|
Source Location: (554:13,42 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
| } else { |
Generated Location: (6858:164,42 [10] )
Generated Location: (6807:164,42 [10] )
| } else { |
Source Location: (565:13,53 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
|false|
Generated Location: (7060:169,56 [5] )
Generated Location: (7006:169,53 [5] )
|false|
Source Location: (570:13,58 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
| }|
Generated Location: (7260:174,58 [2] )
Generated Location: (7206:174,58 [2] )
| }|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs
View File

@ -35,7 +35,7 @@ __TestNamespace_InputTagHelper.Value = MyEnum.MyValue;
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
__o = MyEnum.MySecondValue;
__o = MyEnum.MySecondValue;
#line default
#line hidden

12
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt
View File

@ -19,31 +19,31 @@ Generated Location: (1368:30,39 [14] )
Source Location: (131:7,15 [20] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
|MyEnum.MySecondValue|
Generated Location: (1736:37,18 [20] )
Generated Location: (1733:37,15 [20] )
|MyEnum.MySecondValue|
Source Location: (171:8,14 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
|MyValue|
Generated Location: (2225:44,133 [7] )
Generated Location: (2222:44,133 [7] )
|MyValue|
Source Location: (198:9,14 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
|MySecondValue|
Generated Location: (2702:51,133 [13] )
Generated Location: (2699:51,133 [13] )
|MySecondValue|
Source Location: (224:9,40 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
|MyValue|
Generated Location: (2979:56,139 [7] )
Generated Location: (2976:56,139 [7] )
|MyValue|
Source Location: (251:10,15 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
|enumValue|
Generated Location: (3362:63,39 [9] )
Generated Location: (3359:63,39 [9] )
|enumValue|
Source Location: (274:10,38 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
|enumValue|
Generated Location: (3541:68,45 [9] )
Generated Location: (3538:68,45 [9] )
|enumValue|

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs
View File

@ -20,14 +20,14 @@ System.Object __typeHelper = "*, TestAssembly";
public async System.Threading.Tasks.Task ExecuteAsync()
{
#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml"
__o = DateTime.Now;
__o = DateTime.Now;
#line default
#line hidden
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
__TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml"
__o = DateTime.Now;
__o = DateTime.Now;
#line default
#line hidden

6
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt
View File

@ -5,16 +5,16 @@ Generated Location: (419:10,30 [15] )
Source Location: (106:3,29 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
|DateTime.Now|
Generated Location: (989:22,32 [12] )
Generated Location: (986:22,29 [12] )
|DateTime.Now|
Source Location: (204:5,51 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
|DateTime.Now|
Generated Location: (1390:29,54 [12] )
Generated Location: (1384:29,51 [12] )
|DateTime.Now|
Source Location: (227:5,74 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
|true|
Generated Location: (1757:36,74 [4] )
Generated Location: (1751:36,74 [4] )
|true|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
public async System.Threading.Tasks.Task ExecuteAsync()
{
#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml"
__o = item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
__o = item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
}
);

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
public async System.Threading.Tasks.Task ExecuteAsync()
{
#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml"
__o = 1+1;
__o = 1+1;
#line default
#line hidden

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.mappings.txt
View File

@ -1,5 +1,5 @@
Source Location: (10:0,10 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml)
|1+1|
Generated Location: (675:16,13 [3] )
Generated Location: (672:16,10 [3] )
|1+1|

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.cs
View File

@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
__o = foo;
__o = foo;
#line default
#line hidden
@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
__o = bar.Replace("F", "B");
__o = bar.Replace("F", "B");
#line default
#line hidden

12
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.mappings.txt
View File

@ -18,14 +18,14 @@ Generated Location: (838:23,1 [23] )
Source Location: (83:6,5 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
|foo|
Generated Location: (995:29,8 [3] )
Generated Location: (993:29,6 [3] )
|foo|
Source Location: (86:6,8 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
|
} else {
|
Generated Location: (1133:34,8 [16] )
Generated Location: (1131:34,8 [16] )
|
} else {
|
@ -33,26 +33,26 @@ Generated Location: (1133:34,8 [16] )
Source Location: (121:8,23 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
|
}|
Generated Location: (1298:41,23 [3] )
Generated Location: (1296:41,23 [3] )
|
}|
Source Location: (134:12,1 [38] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
|if(!String.IsNullOrEmpty(bar)) {
|
Generated Location: (1429:47,1 [38] )
Generated Location: (1427:47,1 [38] )
|if(!String.IsNullOrEmpty(bar)) {
|
Source Location: (174:13,6 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
|bar.Replace("F", "B")|
Generated Location: (1603:53,9 [21] )
Generated Location: (1598:53,6 [21] )
|bar.Replace("F", "B")|
Source Location: (196:13,28 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
|
}|
Generated Location: (1780:58,28 [3] )
Generated Location: (1775:58,28 [3] )
|
}|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
public async System.Threading.Tasks.Task ExecuteAsync()
{
#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml"
__o = RandomInt();
__o = RandomInt();
#line default
#line hidden

6
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.mappings.txt
View File

@ -1,13 +1,13 @@
Source Location: (167:11,25 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml)
|RandomInt()|
Generated Location: (683:16,28 [11] )
Generated Location: (680:16,25 [11] )
|RandomInt()|
Source Location: (12:0,12 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml)
|
|
Generated Location: (879:23,12 [4] )
Generated Location: (876:23,12 [4] )
|
|
@ -19,7 +19,7 @@ Source Location: (33:4,12 [104] TestFiles/IntegrationTests/CodeGenerationIntegra
return _rand.Next();
}
|
Generated Location: (1016:29,12 [104] )
Generated Location: (1013:29,12 [104] )
|
Random _rand = new Random();
private int RandomInt() {

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.cs
View File

@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml"
__o = i;
__o = i;
#line default
#line hidden

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.mappings.txt
View File

@ -7,13 +7,13 @@ Generated Location: (663:16,1 [36] )
Source Location: (55:1,22 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml)
|i|
Generated Location: (851:22,25 [1] )
Generated Location: (848:22,22 [1] )
|i|
Source Location: (60:1,27 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml)
|
}|
Generated Location: (1007:27,27 [3] )
Generated Location: (1004:27,27 [3] )
|
}|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs
View File

@ -25,7 +25,7 @@ System.Object Link = null;
#line default
#line hidden
#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
__o = link;
__o = link;
#line default
#line hidden

6
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt
View File

@ -10,16 +10,16 @@ Generated Location: (840:22,14 [19] )
Source Location: (64:1,34 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
|link|
Generated Location: (1017:27,37 [4] )
Generated Location: (1014:27,34 [4] )
|link|
Source Location: (68:1,38 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
| } else { |
Generated Location: (1181:32,38 [10] )
Generated Location: (1178:32,38 [10] )
| } else { |
Source Location: (92:1,62 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
| }|
Generated Location: (1374:37,62 [2] )
Generated Location: (1371:37,62 [2] )
| }|

6
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.cs
View File

@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
__o = i;
__o = i;
#line default
#line hidden
@ -98,7 +98,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
__o = j;
__o = j;
#line default
#line hidden
@ -122,7 +122,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
__o = ex.Message;
__o = ex.Message;
#line default
#line hidden

32
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.mappings.txt
View File

@ -35,14 +35,14 @@ Generated Location: (1363:42,1 [22] )
Source Location: (142:8,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|i|
Generated Location: (1534:48,28 [1] )
Generated Location: (1531:48,25 [1] )
|i|
Source Location: (148:8,31 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|
i += 1;
}|
Generated Location: (1688:53,31 [16] )
Generated Location: (1685:53,31 [16] )
|
i += 1;
}|
@ -50,14 +50,14 @@ Generated Location: (1688:53,31 [16] )
Source Location: (169:12,1 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|if(i == 11) {
|
Generated Location: (1827:60,1 [19] )
Generated Location: (1824:60,1 [19] )
|if(i == 11) {
|
Source Location: (213:13,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|
}|
Generated Location: (1997:66,29 [3] )
Generated Location: (1994:66,29 [3] )
|
}|
@ -65,7 +65,7 @@ Source Location: (221:16,1 [35] TestFiles/IntegrationTests/CodeGenerationIntegra
|switch(i) {
case 11:
|
Generated Location: (2123:72,1 [35] )
Generated Location: (2120:72,1 [35] )
|switch(i) {
case 11:
|
@ -75,7 +75,7 @@ Source Location: (292:18,44 [40] TestFiles/IntegrationTests/CodeGenerationIntegr
break;
default:
|
Generated Location: (2324:79,44 [40] )
Generated Location: (2321:79,44 [40] )
|
break;
default:
@ -85,7 +85,7 @@ Source Location: (361:21,37 [19] TestFiles/IntegrationTests/CodeGenerationIntegr
|
break;
}|
Generated Location: (2523:87,37 [19] )
Generated Location: (2520:87,37 [19] )
|
break;
}|
@ -93,26 +93,26 @@ Generated Location: (2523:87,37 [19] )
Source Location: (385:25,1 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|for(int j = 1; j <= 10; j += 2) {
|
Generated Location: (2665:94,1 [39] )
Generated Location: (2662:94,1 [39] )
|for(int j = 1; j <= 10; j += 2) {
|
Source Location: (451:26,31 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|j|
Generated Location: (2860:100,34 [1] )
Generated Location: (2854:100,31 [1] )
|j|
Source Location: (457:26,37 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|
}|
Generated Location: (3021:105,37 [3] )
Generated Location: (3015:105,37 [3] )
|
}|
Source Location: (465:29,1 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|try {
|
Generated Location: (3147:111,1 [11] )
Generated Location: (3141:111,1 [11] )
|try {
|
@ -120,34 +120,34 @@ Source Location: (511:30,39 [31] TestFiles/IntegrationTests/CodeGenerationIntegr
|
} catch(Exception ex) {
|
Generated Location: (3319:117,39 [31] )
Generated Location: (3313:117,39 [31] )
|
} catch(Exception ex) {
|
Source Location: (573:32,35 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|ex.Message|
Generated Location: (3510:124,38 [10] )
Generated Location: (3501:124,35 [10] )
|ex.Message|
Source Location: (588:32,50 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|
}|
Generated Location: (3693:129,50 [3] )
Generated Location: (3684:129,50 [3] )
|
}|
Source Location: (596:35,1 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|lock(new object()) {
|
Generated Location: (3819:135,1 [26] )
Generated Location: (3810:135,1 [26] )
|lock(new object()) {
|
Source Location: (669:36,51 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
|
}|
Generated Location: (4018:141,51 [3] )
Generated Location: (4009:141,51 [3] )
|
}|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml"
__o = i.ToString();
__o = i.ToString();
#line default
#line hidden

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.mappings.txt
View File

@ -9,14 +9,14 @@ Generated Location: (662:16,2 [46] )
Source Location: (69:2,29 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml)
|i.ToString()|
Generated Location: (866:23,32 [12] )
Generated Location: (863:23,29 [12] )
|i.ToString()|
Source Location: (86:2,46 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml)
|
}
|
Generated Location: (1051:28,46 [9] )
Generated Location: (1048:28,46 [9] )
|
}
|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.cs
View File

@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml"
__o = result.SomeValue;
__o = result.SomeValue;
#line default
#line hidden

6
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.mappings.txt
View File

@ -16,20 +16,20 @@ Generated Location: (784:22,5 [53] )
Source Location: (82:4,13 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml)
|result.SomeValue|
Generated Location: (974:29,16 [16] )
Generated Location: (971:29,13 [16] )
|result.SomeValue|
Source Location: (115:5,14 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml)
|
}|
Generated Location: (1126:34,14 [7] )
Generated Location: (1123:34,14 [7] )
|
}|
Source Location: (122:6,5 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml)
|
|
Generated Location: (1259:40,5 [2] )
Generated Location: (1256:40,5 [2] )
|
|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs
View File

@ -29,7 +29,7 @@ System.Object __typeHelper = "*, TestAssembly";
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
__TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
__o = ViewBag.DefaultInterval;
__o = ViewBag.DefaultInterval;
#line default
#line hidden

6
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt
View File

@ -12,18 +12,18 @@ Generated Location: (1071:23,13 [46] )
Source Location: (339:7,50 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
|ViewBag.DefaultInterval|
Generated Location: (1512:31,53 [23] )
Generated Location: (1509:31,50 [23] )
|ViewBag.DefaultInterval|
Source Location: (389:7,100 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
|true|
Generated Location: (1918:38,100 [4] )
Generated Location: (1915:38,100 [4] )
|true|
Source Location: (422:8,25 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
|
}|
Generated Location: (2082:43,25 [15] )
Generated Location: (2079:43,25 [15] )
|
}|

8
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.cs
View File

@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
__o = i;
__o = i;
#line default
#line hidden
@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
__o = j;
__o = j;
#line default
#line hidden
@ -102,7 +102,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
__o = ex.Message;
__o = ex.Message;
#line default
#line hidden
@ -119,7 +119,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 34 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
__o = i;
__o = i;
#line default
#line hidden

36
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.mappings.txt
View File

@ -16,14 +16,14 @@ Generated Location: (793:22,1 [22] )
Source Location: (69:5,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|i|
Generated Location: (965:28,28 [1] )
Generated Location: (962:28,25 [1] )
|i|
Source Location: (75:5,31 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|
i += 1;
}|
Generated Location: (1120:33,31 [16] )
Generated Location: (1117:33,31 [16] )
|
i += 1;
}|
@ -31,14 +31,14 @@ Generated Location: (1120:33,31 [16] )
Source Location: (96:9,1 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|if(i == 11) {
|
Generated Location: (1260:40,1 [19] )
Generated Location: (1257:40,1 [19] )
|if(i == 11) {
|
Source Location: (140:10,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|
}|
Generated Location: (1431:46,29 [3] )
Generated Location: (1428:46,29 [3] )
|
}|
@ -46,7 +46,7 @@ Source Location: (148:13,1 [35] TestFiles/IntegrationTests/CodeGenerationIntegra
|switch(i) {
case 11:
|
Generated Location: (1558:52,1 [35] )
Generated Location: (1555:52,1 [35] )
|switch(i) {
case 11:
|
@ -56,7 +56,7 @@ Source Location: (219:15,44 [40] TestFiles/IntegrationTests/CodeGenerationIntegr
break;
default:
|
Generated Location: (1760:59,44 [40] )
Generated Location: (1757:59,44 [40] )
|
break;
default:
@ -66,7 +66,7 @@ Source Location: (288:18,37 [19] TestFiles/IntegrationTests/CodeGenerationIntegr
|
break;
}|
Generated Location: (1960:67,37 [19] )
Generated Location: (1957:67,37 [19] )
|
break;
}|
@ -74,26 +74,26 @@ Generated Location: (1960:67,37 [19] )
Source Location: (312:22,1 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|for(int j = 1; j <= 10; j += 2) {
|
Generated Location: (2103:74,1 [39] )
Generated Location: (2100:74,1 [39] )
|for(int j = 1; j <= 10; j += 2) {
|
Source Location: (378:23,31 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|j|
Generated Location: (2299:80,34 [1] )
Generated Location: (2293:80,31 [1] )
|j|
Source Location: (384:23,37 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|
}|
Generated Location: (2461:85,37 [3] )
Generated Location: (2455:85,37 [3] )
|
}|
Source Location: (392:26,1 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|try {
|
Generated Location: (2588:91,1 [11] )
Generated Location: (2582:91,1 [11] )
|try {
|
@ -101,14 +101,14 @@ Source Location: (438:27,39 [31] TestFiles/IntegrationTests/CodeGenerationIntegr
|
} catch(Exception ex) {
|
Generated Location: (2761:97,39 [31] )
Generated Location: (2755:97,39 [31] )
|
} catch(Exception ex) {
|
Source Location: (500:29,35 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|ex.Message|
Generated Location: (2953:104,38 [10] )
Generated Location: (2944:104,35 [10] )
|ex.Message|
Source Location: (515:29,50 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
@ -116,7 +116,7 @@ Source Location: (515:29,50 [7] TestFiles/IntegrationTests/CodeGenerationIntegra
}
|
Generated Location: (3137:109,50 [7] )
Generated Location: (3128:109,50 [7] )
|
}
@ -124,25 +124,25 @@ Generated Location: (3137:109,50 [7] )
Source Location: (556:32,34 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
||
Generated Location: (3299:116,34 [0] )
Generated Location: (3290:116,34 [0] )
||
Source Location: (571:33,13 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|i|
Generated Location: (3438:121,16 [1] )
Generated Location: (3426:121,13 [1] )
|i|
Source Location: (581:35,1 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|lock(new object()) {
|
Generated Location: (3564:126,1 [26] )
Generated Location: (3552:126,1 [26] )
|lock(new object()) {
|
Source Location: (654:36,51 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
|
}|
Generated Location: (3764:132,51 [3] )
Generated Location: (3752:132,51 [3] )
|
}|

8
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.cs
View File

@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
__o = ViewBag?.Data;
__o = ViewBag?.Data;
#line default
#line hidden
@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
__o = ViewBag.IntIndexer?[0];
__o = ViewBag.IntIndexer?[0];
#line default
#line hidden
@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
__o = ViewBag.StrIndexer?["key"];
__o = ViewBag.StrIndexer?["key"];
#line default
#line hidden
@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
__o = ViewBag?.Method(Value?[23]?.More)?["key"];
__o = ViewBag?.Method(Value?[23]?.More)?["key"];
#line default
#line hidden

24
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.mappings.txt
View File

@ -7,69 +7,69 @@ Generated Location: (680:16,2 [6] )
Source Location: (9:1,5 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|ViewBag?.Data|
Generated Location: (829:22,8 [13] )
Generated Location: (827:22,6 [13] )
|ViewBag?.Data|
Source Location: (22:1,18 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|
|
Generated Location: (996:27,18 [6] )
Generated Location: (994:27,18 [6] )
|
|
Source Location: (29:2,5 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|ViewBag.IntIndexer?[0]|
Generated Location: (1145:33,8 [22] )
Generated Location: (1141:33,6 [22] )
|ViewBag.IntIndexer?[0]|
Source Location: (51:2,27 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|
|
Generated Location: (1330:38,27 [6] )
Generated Location: (1326:38,27 [6] )
|
|
Source Location: (58:3,5 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|ViewBag.StrIndexer?["key"]|
Generated Location: (1479:44,8 [26] )
Generated Location: (1473:44,6 [26] )
|ViewBag.StrIndexer?["key"]|
Source Location: (84:3,31 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|
|
Generated Location: (1672:49,31 [6] )
Generated Location: (1666:49,31 [6] )
|
|
Source Location: (91:4,5 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|ViewBag?.Method(Value?[23]?.More)?["key"]|
Generated Location: (1821:55,8 [41] )
Generated Location: (1813:55,6 [41] )
|ViewBag?.Method(Value?[23]?.More)?["key"]|
Source Location: (132:4,46 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|
|
Generated Location: (2044:60,46 [2] )
Generated Location: (2036:60,46 [2] )
|
|
Source Location: (140:7,1 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|ViewBag?.Data|
Generated Location: (2185:65,6 [13] )
Generated Location: (2177:65,6 [13] )
|ViewBag?.Data|
Source Location: (156:8,1 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|ViewBag.IntIndexer?[0]|
Generated Location: (2340:70,6 [22] )
Generated Location: (2332:70,6 [22] )
|ViewBag.IntIndexer?[0]|
Source Location: (181:9,1 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|ViewBag.StrIndexer?["key"]|
Generated Location: (2505:75,6 [26] )
Generated Location: (2497:75,6 [26] )
|ViewBag.StrIndexer?["key"]|
Source Location: (210:10,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
|ViewBag?.Method(Value?[23]?.More)?["key"]|
Generated Location: (2674:80,6 [41] )
Generated Location: (2666:80,6 [41] )
|ViewBag?.Method(Value?[23]?.More)?["key"]|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs
View File

@ -92,7 +92,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty["salt"] = 37;
__TestNamespace_InputTagHelper1.StringDictionaryProperty["paprika"] = "another string";
__TestNamespace_InputTagHelper2.StringDictionaryProperty["paprika"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["paprika"];
#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
__o = literate;
__o = literate;
#line default
#line hidden

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt
View File

@ -70,11 +70,11 @@ Generated Location: (4468:84,75 [2] )
Source Location: (783:20,42 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
|literate|
Generated Location: (5253:94,45 [8] )
Generated Location: (5250:94,42 [8] )
|literate|
Source Location: (826:21,29 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
|37|
Generated Location: (5917:103,65 [2] )
Generated Location: (5914:103,65 [2] )
|37|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.cs
View File

@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
__o = bar;
__o = bar;
#line default
#line hidden

6
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.mappings.txt
View File

@ -32,16 +32,16 @@ Generated Location: (1195:36,2 [24] )
Source Location: (310:12,45 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml)
|bar|
Generated Location: (1390:41,48 [3] )
Generated Location: (1387:41,45 [3] )
|bar|
Source Location: (323:14,2 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml)
|a|
Generated Location: (1523:46,6 [1] )
Generated Location: (1520:46,6 [1] )
|a|
Source Location: (328:14,7 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml)
|b|
Generated Location: (1524:46,7 [1] )
Generated Location: (1521:46,7 [1] )
|b|

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
View File

@ -33,7 +33,7 @@ System.Object NestedDelegates = null;
#line hidden
DefineSection("Section2", async (__razor_section_writer) => {
#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
__o = thing;
__o = thing;
#line default
#line hidden
@ -48,7 +48,7 @@ System.Object NestedDelegates = null;
#line hidden
item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
__o = item;
__o = item;
#line default
#line hidden

8
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
View File

@ -24,21 +24,21 @@ Generated Location: (927:28,2 [44] )
Source Location: (123:7,22 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
|thing|
Generated Location: (1186:35,25 [5] )
Generated Location: (1183:35,22 [5] )
|thing|
Source Location: (260:15,6 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
| Func<dynamic, object> f = |
Generated Location: (1507:44,6 [27] )
Generated Location: (1504:44,6 [27] )
| Func<dynamic, object> f = |
Source Location: (295:15,41 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
|item|
Generated Location: (1801:50,44 [4] )
Generated Location: (1795:50,41 [4] )
|item|
Source Location: (306:15,52 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
|; |
Generated Location: (2006:57,52 [2] )
Generated Location: (2000:57,52 [2] )
|; |

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs
View File

@ -20,7 +20,7 @@ System.Object __typeHelper = "*, TestAssembly";
{
__InputTagHelper = CreateTagHelper<global::InputTagHelper>();
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml"
__o = Hello;
__o = Hello;
#line default
#line hidden

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt
View File

@ -5,6 +5,6 @@ Generated Location: (431:10,30 [15] )
Source Location: (57:2,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml)
|Hello|
Generated Location: (954:22,21 [5] )
Generated Location: (951:22,18 [5] )
|Hello|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs
View File

@ -24,7 +24,7 @@ System.Object __typeHelper = "cool:";
{
__InputTagHelper = CreateTagHelper<global::InputTagHelper>();
#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml"
__o = Hello;
__o = Hello;
#line default
#line hidden

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt
View File

@ -10,6 +10,6 @@ Generated Location: (531:14,30 [5] )
Source Location: (86:3,23 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml)
|Hello|
Generated Location: (1040:26,26 [5] )
Generated Location: (1037:26,23 [5] )
|Hello|

2
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs
View File

@ -27,7 +27,7 @@ __TestNamespace_PTagHelper.Age = 1337;
#line default
#line hidden
#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml"
__o = true;
__o = true;
#line default
#line hidden

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt
View File

@ -10,11 +10,11 @@ Generated Location: (1210:24,33 [4] )
Source Location: (99:6,19 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
|true|
Generated Location: (1383:29,22 [4] )
Generated Location: (1380:29,19 [4] )
|true|
Source Location: (186:10,11 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
|1234|
Generated Location: (2019:39,33 [4] )
Generated Location: (2016:39,33 [4] )
|1234|

16
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line hidden
item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
__o = item;
__o = item;
#line default
#line hidden
@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line default
#line hidden
#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
__o = foo("");
__o = foo("");
#line default
#line hidden
@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
__o = Repeat(10, item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
__o = item;
__o = item;
#line default
#line hidden
@ -59,7 +59,7 @@ __o = Repeat(10, item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(_
__o = Repeat(10,
item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
__o = item;
__o = item;
#line default
#line hidden
@ -72,7 +72,7 @@ __o = Repeat(10,
__o = Repeat(10,
item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
__o = item;
__o = item;
#line default
#line hidden
@ -85,7 +85,7 @@ __o = Repeat(10,
__o = Repeat(10,
item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
#line 34 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
__o = item;
__o = item;
#line default
#line hidden
@ -95,9 +95,9 @@ __o = Repeat(10,
#line default
#line hidden
#line 40 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
__o = Repeat(10, item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
__o = Repeat(10, item => new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
#line 41 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
__o = item;
__o = item;
#line default
#line hidden

42
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.mappings.txt
View File

@ -7,112 +7,112 @@ Generated Location: (647:16,2 [34] )
Source Location: (337:11,51 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|item|
Generated Location: (959:23,54 [4] )
Generated Location: (956:23,51 [4] )
|item|
Source Location: (349:11,63 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|;
|
Generated Location: (1176:30,63 [7] )
Generated Location: (1173:30,63 [7] )
|;
|
Source Location: (357:12,5 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|foo("")|
Generated Location: (1310:36,8 [7] )
Generated Location: (1305:36,6 [7] )
|foo("")|
Source Location: (364:12,12 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|
|
Generated Location: (1449:41,12 [2] )
Generated Location: (1444:41,12 [2] )
|
|
Source Location: (379:16,2 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|Repeat(10, |
Generated Location: (1574:46,6 [11] )
Generated Location: (1569:46,6 [11] )
|Repeat(10, |
Source Location: (402:16,25 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|item|
Generated Location: (1792:48,28 [4] )
Generated Location: (1784:48,25 [4] )
|item|
Source Location: (411:16,34 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|)|
Generated Location: (1834:53,1 [1] )
Generated Location: (1826:53,1 [1] )
|)|
Source Location: (430:20,1 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|Repeat(10,
|
Generated Location: (1961:58,6 [16] )
Generated Location: (1953:58,6 [16] )
|Repeat(10,
|
Source Location: (463:21,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|item|
Generated Location: (2180:61,24 [4] )
Generated Location: (2169:61,21 [4] )
|item|
Source Location: (484:22,0 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|)|
Generated Location: (2222:66,1 [1] )
Generated Location: (2211:66,1 [1] )
|)|
Source Location: (501:26,1 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|Repeat(10,
|
Generated Location: (2349:71,6 [16] )
Generated Location: (2338:71,6 [16] )
|Repeat(10,
|
Source Location: (535:27,22 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|item|
Generated Location: (2569:74,25 [4] )
Generated Location: (2555:74,22 [4] )
|item|
Source Location: (557:28,0 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|)|
Generated Location: (2611:79,1 [1] )
Generated Location: (2597:79,1 [1] )
|)|
Source Location: (574:32,1 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|Repeat(10,
|
Generated Location: (2738:84,6 [16] )
Generated Location: (2724:84,6 [16] )
|Repeat(10,
|
Source Location: (609:33,23 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|item|
Generated Location: (2959:87,26 [4] )
Generated Location: (2942:87,23 [4] )
|item|
Source Location: (631:34,0 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|)|
Generated Location: (3001:92,1 [1] )
Generated Location: (2984:92,1 [1] )
|)|
Source Location: (655:39,5 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|Repeat(10, |
Generated Location: (3130:97,8 [11] )
Generated Location: (3111:97,6 [11] )
|Repeat(10, |
Source Location: (688:40,15 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|item|
Generated Location: (3338:99,18 [4] )
Generated Location: (3316:99,15 [4] )
|item|
Source Location: (704:41,10 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|var parent = item;|
Generated Location: (3472:104,10 [18] )
Generated Location: (3450:104,10 [18] )
|var parent = item;|
Source Location: (863:46,9 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
|)|
Generated Location: (3527:109,1 [1] )
Generated Location: (3505:109,1 [1] )
|)|
Source Location: (12:0,12 [265] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
@ -125,7 +125,7 @@ Source Location: (12:0,12 [265] TestFiles/IntegrationTests/CodeGenerationIntegra
});
}
|
Generated Location: (3708:116,12 [265] )
Generated Location: (3686:116,12 [265] )
|
public HelperResult Repeat(int times, Func<int, object> template) {
return new HelperResult((writer) => {

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs
View File

@ -33,7 +33,7 @@ __TestNamespace_PTagHelper.Age = 1337;
#line hidden
__TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
__o = @class;
__o = @class;
#line default
#line hidden
@ -62,7 +62,7 @@ __TestNamespace_PTagHelper.Age = (@int);
#line hidden
__TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
__o = @class;
__o = @class;
#line default
#line hidden

28
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt
View File

@ -21,71 +21,71 @@ Generated Location: (1212:29,33 [4] )
Source Location: (157:7,12 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|@class|
Generated Location: (1468:35,15 [6] )
Generated Location: (1465:35,12 [6] )
|@class|
Source Location: (171:7,26 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|42|
Generated Location: (1649:40,33 [2] )
Generated Location: (1646:40,33 [2] )
|42|
Source Location: (202:8,21 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|42 + |
Generated Location: (1921:46,33 [5] )
Generated Location: (1918:46,33 [5] )
|42 + |
Source Location: (207:8,26 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|@|
Generated Location: (1926:46,38 [1] )
Generated Location: (1923:46,38 [1] )
|@|
Source Location: (208:8,27 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|int|
Generated Location: (1927:46,39 [3] )
Generated Location: (1924:46,39 [3] )
|int|
Source Location: (241:9,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|int|
Generated Location: (2201:52,33 [3] )
Generated Location: (2198:52,33 [3] )
|int|
Source Location: (274:10,22 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|(|
Generated Location: (2475:58,33 [1] )
Generated Location: (2472:58,33 [1] )
|(|
Source Location: (275:10,23 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|@int|
Generated Location: (2476:58,34 [4] )
Generated Location: (2473:58,34 [4] )
|@int|
Source Location: (279:10,27 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|)|
Generated Location: (2480:58,38 [1] )
Generated Location: (2477:58,38 [1] )
|)|
Source Location: (307:11,19 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|@class|
Generated Location: (2741:64,22 [6] )
Generated Location: (2735:64,19 [6] )
|@class|
Source Location: (321:11,33 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|4 * |
Generated Location: (2923:69,33 [4] )
Generated Location: (2917:69,33 [4] )
|4 * |
Source Location: (325:11,37 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|@(|
Generated Location: (2927:69,37 [2] )
Generated Location: (2921:69,37 [2] )
|@(|
Source Location: (327:11,39 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|@int + 2|
Generated Location: (2929:69,39 [8] )
Generated Location: (2923:69,39 [8] )
|@int + 2|
Source Location: (335:11,47 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
|)|
Generated Location: (2937:69,47 [1] )
Generated Location: (2931:69,47 [1] )
|)|

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.cs
View File

@ -39,12 +39,12 @@ using static global::System.Text.Encoding;
public async System.Threading.Tasks.Task ExecuteAsync()
{
#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
__o = typeof(Path).FullName;
__o = typeof(Path).FullName;
#line default
#line hidden
#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
__o = typeof(Foo).FullName;
__o = typeof(Foo).FullName;
#line default
#line hidden

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.mappings.txt
View File

@ -1,10 +1,10 @@
Source Location: (197:8,29 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
|typeof(Path).FullName|
Generated Location: (1384:41,32 [21] )
Generated Location: (1381:41,29 [21] )
|typeof(Path).FullName|
Source Location: (259:9,35 [20] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
|typeof(Foo).FullName|
Generated Location: (1560:46,38 [20] )
Generated Location: (1554:46,35 [20] )
|typeof(Foo).FullName|