Fix IR and HTML outputs with latest Razor versions

Author: jjonescz

src/Compiler/Compiler.cs

@@ -210,7 +210,7 @@ private CompiledAssembly CompileNoCache(
                         Type = "ir",
                         Label = "IR",
                         Language = "csharp",
-                        EagerText = codeDocument.Map(d => d?.GetDocumentIntermediateNode().Serialize() ?? "").Serialize(),
+                        EagerText = codeDocument.Map(d => d?.GetDocumentIntermediateNodeSafe().Serialize() ?? "").Serialize(),
                     },
                     .. string.IsNullOrEmpty(razorDiagnostics)
                         ? ImmutableArray<CompiledFileOutput>.Empty
@@ -237,7 +237,7 @@ .. string.IsNullOrEmpty(razorDiagnostics)
                         Language = "html",
                         LazyText = new(() =>
                         {
-                            var document = codeDocument.Unwrap()?.GetDocumentIntermediateNode()
+                            var document = codeDocument.Unwrap()?.GetDocumentIntermediateNodeSafe()
                                 ?? throw new InvalidOperationException("No IR available.");
 
                             if (document.DocumentKind.StartsWith("mvc"))

src/Compiler/Utils.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
@@ -140,15 +141,7 @@ static string toBase36(ReadOnlySpan<byte> hash)
 
     public static RazorCSharpDocument GetCSharpDocumentSafe(this RazorCodeDocument document)
     {
-        // GetCSharpDocument extension method has been turned into an instance method in https://github.com/dotnet/razor/pull/11939.
-        if (document.GetType().GetMethod("GetCSharpDocument", BindingFlags.Instance | BindingFlags.NonPublic) is { } method)
-        {
-            return (RazorCSharpDocument)method.Invoke(document, [])!;
-        }
-
-        return (RazorCSharpDocument)typeof(RazorCodeDocument).Assembly.GetType("Microsoft.AspNetCore.Razor.Language.RazorCodeDocumentExtensions")!
-            .GetMethod("GetCSharpDocument", BindingFlags.Static | BindingFlags.Public)!
-            .Invoke(null, [document])!;
+        return document.GetDocumentDataSafe<RazorCSharpDocument>("GetCSharpDocument");
     }
 
     public static IReadOnlyList<RazorDiagnostic> GetDiagnostics(this RazorCSharpDocument document)
@@ -160,6 +153,24 @@ public static IReadOnlyList<RazorDiagnostic> GetDiagnostics(this RazorCSharpDocu
             .GetValue(document)!;
     }
 
+    private static T GetDocumentDataSafe<T>(this RazorCodeDocument document, string methodName, string? instanceMethodName = null)
+    {
+        // GetCSharpDocument and similar extension methods have been turned into instance methods in https://github.com/dotnet/razor/pull/11939.
+        if (document.GetType().GetMethod(instanceMethodName ?? methodName, BindingFlags.Instance | BindingFlags.NonPublic) is { } method)
+        {
+            return (T)method.Invoke(document, [])!;
+        }
+
+        return (T)typeof(RazorCodeDocument).Assembly.GetType("Microsoft.AspNetCore.Razor.Language.RazorCodeDocumentExtensions")!
+            .GetMethod(methodName, BindingFlags.Static | BindingFlags.Public)!
+            .Invoke(null, [document])!;
+    }
+
+    public static DocumentIntermediateNode GetDocumentIntermediateNodeSafe(this RazorCodeDocument document)
+    {
+        return document.GetDocumentDataSafe<DocumentIntermediateNode>("GetDocumentIntermediateNode", "GetDocumentNode");
+    }
+
     public static string GetGeneratedCode(this RazorCSharpDocument document)
     {
         // There can be either `string GeneratedCode` or `SourceText Text` property.
@@ -177,15 +188,7 @@ public static string GetGeneratedCode(this RazorCSharpDocument document)
 
     public static RazorSyntaxTree GetSyntaxTreeSafe(this RazorCodeDocument document)
     {
-        // GetSyntaxTree extension method has been turned into an instance method in https://github.com/dotnet/razor/pull/11939.
-        if (document.GetType().GetMethod("GetSyntaxTree", BindingFlags.Instance | BindingFlags.NonPublic) is { } method)
-        {
-            return (RazorSyntaxTree)method.Invoke(document, [])!;
-        }
-
-        return (RazorSyntaxTree)typeof(RazorCodeDocument).Assembly.GetType("Microsoft.AspNetCore.Razor.Language.RazorCodeDocumentExtensions")!
-            .GetMethod("GetSyntaxTree", BindingFlags.Static | BindingFlags.Public)!
-            .Invoke(null, [document])!;
+        return document.GetDocumentDataSafe<RazorSyntaxTree>("GetSyntaxTree");
     }
 
     public static IEnumerable<RazorProjectItem> EnumerateItemsSafe(this RazorProjectFileSystem fileSystem, string basePath)
@@ -241,6 +244,29 @@ .. var rest
             .Invoke(engine, [projectItem, .. Enumerable.Repeat<object?>(null, method.GetParameters().Length - 1)])!;
     }
 
+    public static string Serialize(this IntermediateNode node)
+    {
+        // DebuggerDisplayFormatter merged to IntermediateNodeFormatter in https://github.com/dotnet/razor/pull/11931.
+
+        var assembly = typeof(IntermediateNode).Assembly;
+        if (assembly.GetType("Microsoft.AspNetCore.Razor.Language.Intermediate.DebuggerDisplayFormatter") is { } debuggerDisplayFormatter)
+        {
+            var formatter = Activator.CreateInstance(debuggerDisplayFormatter)!;
+            debuggerDisplayFormatter.GetMethod("FormatTree", BindingFlags.Instance | BindingFlags.Public)!
+                .Invoke(formatter, [node]);
+            return formatter.ToString()!;
+        }
+        else
+        {
+            var type = assembly.GetType("Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeFormatter")!;
+            var sb = new StringBuilder();
+            var formatter = type.GetConstructors().Single().Invoke([sb, 0, false])!;
+            type.GetMethod("FormatTree", BindingFlags.Instance | BindingFlags.Public)!
+                .Invoke(formatter, [node]);
+            return sb.ToString();
+        }
+    }
+
     public static void SetCSharpLanguageVersionSafe(this RazorProjectEngineBuilder builder, LanguageVersion languageVersion)
     {
         // Changed in https://github.com/dotnet/razor/commit/40384334fd4c20180c25b3c88a82d3ca5da07487.

src/RazorAccess/RazorAccessors.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.CodeAnalysis;
 using Microsoft.NET.Sdk.Razor.SourceGenerators;
 using System.Runtime.CompilerServices;
@@ -39,13 +38,6 @@ private static object GetFileKindFromPath(string filePath)
         return FileKinds.GetFileKindFromPath(filePath);
     }
 
-    public static string Serialize(this DocumentIntermediateNode node)
-    {
-        var formatter = new DebuggerDisplayFormatter();
-        formatter.FormatTree(node);
-        return formatter.ToString();
-    }
-
     public static string Serialize(this RazorSyntaxTree tree)
     {
         // SerializedValue property has been moved to another type in https://github.com/dotnet/razor/pull/11859.

test/UnitTests/CompilerProxyTests.cs

@@ -78,16 +78,35 @@ await services.GetRequiredService<CompilerDependencyProvider>()
 
         var diagnosticsText = compiled.GetRequiredGlobalOutput(CompiledAssembly.DiagnosticsOutputType).EagerText;
         Assert.NotNull(diagnosticsText);
+        output.WriteLine("Diagnostics:");
         output.WriteLine(diagnosticsText);
+        output.WriteLine(string.Empty);
         Assert.Empty(diagnosticsText);
 
         var cSharpText = await compiled.GetRequiredGlobalOutput("cs").GetTextAsync(outputFactory: null);
+        output.WriteLine("C#:");
         output.WriteLine(cSharpText);
+        output.WriteLine(string.Empty);
         Assert.Contains("class TestComponent", cSharpText);
 
         var syntaxText = await compiled.Files.First().Value.GetOutput("syntax")!.GetTextAsync(outputFactory: null);
+        output.WriteLine("Syntax:");
         output.WriteLine(syntaxText);
+        output.WriteLine(string.Empty);
         Assert.Contains("RazorDocument", syntaxText);
+
+        var irText = await compiled.Files.First().Value.GetOutput("ir")!.GetTextAsync(outputFactory: null);
+        output.WriteLine("IR:");
+        output.WriteLine(irText);
+        output.WriteLine(string.Empty);
+        Assert.Contains("""component.1.0""", irText);
+        Assert.Contains("TestComponent", irText);
+
+        var htmlText = await compiled.Files.First().Value.GetOutput("html")!.GetTextAsync(outputFactory: null);
+        output.WriteLine("HTML:");
+        output.WriteLine(htmlText);
+        output.WriteLine(string.Empty);
+        Assert.Contains("test", htmlText);
     }
 
     [Theory]