Skip to content

Use shared instances of NodeWriter classes #12362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ToddGrun merged 5 commits into from
Oct 21, 2025
Merged

Use shared instances of NodeWriter classes #12362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4c4dac
Use shared instances of NodeWriter classes
ToddGrun Oct 17, 2025
443c81c
Get rid of backing fields
ToddGrun Oct 18, 2025
522c327
Formatting
ToddGrun Oct 18, 2025
acd1a2a
1) Get rid of TestRuntimeNodeWriter
ToddGrun Oct 20, 2025
11b5e4f
Fix build break after making ctors less accessible
ToddGrun Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions ...piler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DesignTimeNodeWriterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ protected override void ConfigureCodeDocumentProcessor(RazorCodeDocumentProcesso
public void WriteUsingDirective_NoSource_WritesContent()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var node = new UsingDirectiveIntermediateNode()
Expand All @@ -45,7 +45,7 @@ public void WriteUsingDirective_NoSource_WritesContent()
public void WriteUsingDirective_WithSource_WritesContentWithLinePragmaAndMapping()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var originalSpan = new SourceSpan("test.cshtml", 0, 0, 0, 6);
Expand Down Expand Up @@ -81,7 +81,7 @@ public void WriteUsingDirective_WithSource_WritesContentWithLinePragmaAndMapping
public void WriteUsingDirective_WithSourceAndLineDirectives_WritesContentWithLinePragmaAndMapping()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var originalSpan = new SourceSpan("test.cshtml", 0, 0, 0, 6);
Expand Down Expand Up @@ -120,7 +120,7 @@ public void WriteUsingDirective_WithSourceAndLineDirectives_WritesContentWithLin
public void WriteCSharpExpression_SkipsLinePragma_WithoutSource()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var node = new CSharpExpressionIntermediateNode();
Expand All @@ -143,7 +143,7 @@ public void WriteCSharpExpression_SkipsLinePragma_WithoutSource()
public void WriteCSharpExpression_WritesLinePragma_WithSource()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var node = new CSharpExpressionIntermediateNode()
Expand Down Expand Up @@ -178,7 +178,7 @@ public void WriteCSharpExpression_WritesLinePragma_WithSource()
public void WriteCSharpExpression_WithExtensionNode_WritesPadding()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var node = new CSharpExpressionIntermediateNode();
Expand Down Expand Up @@ -207,7 +207,7 @@ public void WriteCSharpExpression_WithExtensionNode_WritesPadding()
public void WriteCSharpExpression_WithSource_WritesPadding()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var node = new CSharpExpressionIntermediateNode()
Expand Down Expand Up @@ -246,7 +246,7 @@ public void WriteCSharpExpression_WithSource_WritesPadding()
public void WriteCSharpCode_WhitespaceContentWithSource_WritesContent()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var node = new CSharpCodeIntermediateNode()
Expand Down Expand Up @@ -280,7 +280,7 @@ public void WriteCSharpCode_WhitespaceContentWithSource_WritesContent()
public void WriteCSharpCode_SkipsLinePragma_WithoutSource()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var node = new CSharpCodeIntermediateNode();
Expand All @@ -303,7 +303,7 @@ public void WriteCSharpCode_SkipsLinePragma_WithoutSource()
public void WriteCSharpCode_WritesLinePragma_WithSource()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var node = new CSharpCodeIntermediateNode()
Expand Down Expand Up @@ -337,7 +337,7 @@ public void WriteCSharpCode_WritesLinePragma_WithSource()
public void WriteCSharpCode_WritesPadding_WithSource()
{
// Arrange
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

var node = new CSharpCodeIntermediateNode()
Expand Down Expand Up @@ -370,14 +370,14 @@ public void WriteCSharpCode_WritesPadding_WithSource()
[Fact]
public void WriteCSharpExpressionAttributeValue_RendersCorrectly()
{
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;

var content = "<input checked=\"hello-world @false\" />";
var source = TestRazorSourceDocument.Create(content);
var codeDocument = ProjectEngine.CreateCodeDocument(source);
var processor = CreateCodeDocumentProcessor(codeDocument);
var documentNode = processor.GetDocumentNode();
var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1] as CSharpExpressionAttributeValueIntermediateNode;
var node = (CSharpExpressionAttributeValueIntermediateNode)documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1];

using var context = TestCodeRenderingContext.CreateDesignTime(source: source);

Expand All @@ -403,13 +403,13 @@ public void WriteCSharpExpressionAttributeValue_RendersCorrectly()
[Fact]
public void WriteCSharpCodeAttributeValue_RendersCorrectly()
{
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
var content = "<input checked=\"hello-world @if(@true){ }\" />";
var sourceDocument = TestRazorSourceDocument.Create(content);
var codeDocument = ProjectEngine.CreateCodeDocument(sourceDocument);
var processor = CreateCodeDocumentProcessor(codeDocument);
var documentNode = processor.GetDocumentNode();
var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1] as CSharpCodeAttributeValueIntermediateNode;
var node = (CSharpCodeAttributeValueIntermediateNode)documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1];

using var context = TestCodeRenderingContext.CreateDesignTime(source: sourceDocument);

Expand All @@ -435,13 +435,13 @@ public void WriteCSharpCodeAttributeValue_RendersCorrectly()
[Fact]
public void WriteCSharpCodeAttributeValue_WithExpression_RendersCorrectly()
{
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
var content = "<input checked=\"hello-world @if(@true){ @false }\" />";
var source = TestRazorSourceDocument.Create(content);
var codeDocument = ProjectEngine.CreateCodeDocument(source);
var processor = CreateCodeDocumentProcessor(codeDocument);
var documentNode = processor.GetDocumentNode();
var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1] as CSharpCodeAttributeValueIntermediateNode;
var node = (CSharpCodeAttributeValueIntermediateNode)documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1];

using var context = TestCodeRenderingContext.CreateDesignTime(source: source);

Expand Down Expand Up @@ -484,7 +484,7 @@ Render Children
[InlineData(@"\\SERVER/pages\test.cshtml", @"\\SERVER\pages\test.cshtml")]
public void LinePragma_Is_Adjusted_On_Windows(string fileName, string expectedFileName)
{
var writer = new DesignTimeNodeWriter();
var writer = DesignTimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime();

Assert.True(context.Options.RemapLinePragmaPathsOnWindows);
Expand Down Expand Up @@ -528,7 +528,7 @@ public void LinePragma_Is_Adjusted_On_Windows(string fileName, string expectedFi
[InlineData(@"\\SERVER/pages\test.cshtml", @"\\SERVER\pages\test.cshtml")]
public void LinePragma_Enhanced_Is_Adjusted_On_Windows(string fileName, string expectedFileName)
{
var writer = new RuntimeNodeWriter();
var writer = RuntimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateDesignTime(source: RazorSourceDocument.Create("", fileName));

Assert.True(context.Options.RemapLinePragmaPathsOnWindows);
Expand Down
4 changes: 2 additions & 2 deletions ...r/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/LiteralRuntimeNodeWriterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class LiteralRuntimeNodeWriterTest
public void WriteCSharpExpression_UsesWriteLiteral_WritesLinePragma_WithSource()
{
// Arrange
var writer = new LiteralRuntimeNodeWriter();
var writer = LiteralRuntimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateRuntime();

var node = new CSharpExpressionIntermediateNode();
Expand Down Expand Up @@ -43,7 +43,7 @@ public void WriteCSharpExpression_UsesWriteLiteral_WritesLinePragma_WithSource()
public void WriteCSharpExpression_WithMultipleChildren()
{
// Arrange
var writer = new LiteralRuntimeNodeWriter();
var writer = LiteralRuntimeNodeWriter.Instance;
using var context = TestCodeRenderingContext.CreateRuntime();

var node = new CSharpExpressionIntermediateNode();
Expand Down
Loading