From 68349faaeded3835970e5b2c7d6c440ee36b1d74 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Wed, 17 Jun 2026 16:41:39 +1000
Subject: [PATCH 1/4] Make dev tools split generated documents aware

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 ...CohostGeneratedDocumentContentsEndpoint.cs |  8 +++-
 .../DevTools/GeneratedDocumentKind.cs         |  1 +
 .../Remote/IRemoteDevToolsService.cs          |  2 +-
 .../DevTools/RemoteDevToolsService.cs         |  7 +++-
 .../RazorContextMenu.vsct                     |  8 ++++
 .../SyntaxVisualizerControl.xaml.cs           | 16 ++++++++
 .../SyntaxVisualizerToolWindow.cs             |  7 ++++
 .../xlf/RazorContextMenu.vsct.cs.xlf          |  5 +++
 .../xlf/RazorContextMenu.vsct.de.xlf          |  5 +++
 .../xlf/RazorContextMenu.vsct.es.xlf          |  5 +++
 .../xlf/RazorContextMenu.vsct.fr.xlf          |  5 +++
 .../xlf/RazorContextMenu.vsct.it.xlf          |  5 +++
 .../xlf/RazorContextMenu.vsct.ja.xlf          |  5 +++
 .../xlf/RazorContextMenu.vsct.ko.xlf          |  5 +++
 .../xlf/RazorContextMenu.vsct.pl.xlf          |  5 +++
 .../xlf/RazorContextMenu.vsct.pt-BR.xlf       |  5 +++
 .../xlf/RazorContextMenu.vsct.ru.xlf          |  5 +++
 .../xlf/RazorContextMenu.vsct.tr.xlf          |  5 +++
 .../xlf/RazorContextMenu.vsct.zh-Hans.xlf     |  5 +++
 .../xlf/RazorContextMenu.vsct.zh-Hant.xlf     |  5 +++
 ...stGeneratedDocumentContentsEndpointTest.cs | 40 +++++++++++++++++--
 21 files changed, 145 insertions(+), 9 deletions(-)

diff --git a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/GeneratedDocumentContents/CohostGeneratedDocumentContentsEndpoint.cs b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/GeneratedDocumentContents/CohostGeneratedDocumentContentsEndpoint.cs
index df0415c7f017f..8e9dfc8f9665a 100644
--- a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/GeneratedDocumentContents/CohostGeneratedDocumentContentsEndpoint.cs
+++ b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/GeneratedDocumentContents/CohostGeneratedDocumentContentsEndpoint.cs
@@ -36,9 +36,13 @@ internal sealed class CohostGeneratedDocumentContentsEndpoint(
     {
         var response = request.Kind switch
         {
-            GeneratedDocumentKind.CSharp => await _remoteServiceInvoker.TryInvokeAsync<IRemoteDevToolsService, string>(
+            GeneratedDocumentKind.CSharp => await _remoteServiceInvoker.TryInvokeAsync<IRemoteDevToolsService, string?>(
                 razorDocument.Project.Solution,
-                (service, solutionInfo, cancellationToken) => service.GetCSharpDocumentTextAsync(solutionInfo, razorDocument.Id, cancellationToken),
+                (service, solutionInfo, cancellationToken) => service.GetCSharpDocumentTextAsync(solutionInfo, razorDocument.Id, declarationDocument: false, cancellationToken),
+                cancellationToken).ConfigureAwait(false),
+            GeneratedDocumentKind.CSharpDeclaration => await _remoteServiceInvoker.TryInvokeAsync<IRemoteDevToolsService, string?>(
+                razorDocument.Project.Solution,
+                (service, solutionInfo, cancellationToken) => service.GetCSharpDocumentTextAsync(solutionInfo, razorDocument.Id, declarationDocument: true, cancellationToken),
                 cancellationToken).ConfigureAwait(false),
             GeneratedDocumentKind.Html => await _remoteServiceInvoker.TryInvokeAsync<IRemoteDevToolsService, string>(
                 razorDocument.Project.Solution,
diff --git a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DevTools/GeneratedDocumentKind.cs b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DevTools/GeneratedDocumentKind.cs
index f1d7dbc0fd36b..17550b031d5a8 100644
--- a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DevTools/GeneratedDocumentKind.cs
+++ b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DevTools/GeneratedDocumentKind.cs
@@ -6,6 +6,7 @@ namespace Microsoft.CodeAnalysis.Razor.Protocol.DevTools;
 internal enum GeneratedDocumentKind
 {
     CSharp,
+    CSharpDeclaration,
     Html,
     Formatting
 }
diff --git a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteDevToolsService.cs b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteDevToolsService.cs
index b2ccb72bdb7b8..77206e778e4f2 100644
--- a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteDevToolsService.cs
+++ b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteDevToolsService.cs
@@ -9,7 +9,7 @@ namespace Microsoft.CodeAnalysis.Razor.Remote;
 
 internal interface IRemoteDevToolsService
 {
-    ValueTask<string> GetCSharpDocumentTextAsync(RazorSolutionWrapper solutionInfo, DocumentId razorDocumentId, CancellationToken cancellationToken);
+    ValueTask<string?> GetCSharpDocumentTextAsync(RazorSolutionWrapper solutionInfo, DocumentId razorDocumentId, bool declarationDocument, CancellationToken cancellationToken);
 
     ValueTask<string> GetHtmlDocumentTextAsync(RazorSolutionWrapper solutionInfo, DocumentId razorDocumentId, CancellationToken cancellationToken);
 
diff --git a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DevTools/RemoteDevToolsService.cs b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DevTools/RemoteDevToolsService.cs
index 723c5145438c4..cb8f05fe87765 100644
--- a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DevTools/RemoteDevToolsService.cs
+++ b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DevTools/RemoteDevToolsService.cs
@@ -28,9 +28,10 @@ protected override IRemoteDevToolsService CreateService(in ServiceArgs args)
         WriteIndented = true
     };
 
-    public ValueTask<string> GetCSharpDocumentTextAsync(
+    public ValueTask<string?> GetCSharpDocumentTextAsync(
         RazorSolutionWrapper solutionInfo,
         DocumentId razorDocumentId,
+        bool declarationDocument,
         CancellationToken cancellationToken)
         => RunServiceAsync(
             solutionInfo,
@@ -38,7 +39,9 @@ public ValueTask<string> GetCSharpDocumentTextAsync(
             async context =>
             {
                 var codeDocument = await context.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-                return codeDocument.GetCSharpSourceText().ToString();
+                var csharpDocument = codeDocument.GetCSharpDocument(declarationDocument);
+
+                return csharpDocument?.Text.ToString();
             },
             cancellationToken);
 
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/RazorContextMenu.vsct b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/RazorContextMenu.vsct
index 961edb8f340eb..dcefaa9194e0c 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/RazorContextMenu.vsct
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/RazorContextMenu.vsct
@@ -22,6 +22,7 @@
       <IDSymbol name="cmdIdShowInScopeTagHelpers" value="0x0114" />
       <IDSymbol name="cmdIdShowReferencedTagHelpers" value="0x0115" />
       <IDSymbol name="cmdidShowFormattingDocument" value="0x0116" />
+      <IDSymbol name="cmdidShowGeneratedDeclarationCode" value="0x0117" />
     </GuidSymbol>
 
     <!-- Command set GUID for Razor nested file commands -->
@@ -95,6 +96,13 @@
         </Strings>
       </Button>
 
+      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdidShowGeneratedDeclarationCode" priority="0x202" type="Button">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
+        <Strings>
+          <ButtonText>Show Generated C# Declaration</ButtonText>
+        </Strings>
+      </Button>
+
       <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdidShowGeneratedHtml" priority="0x202" type="Button">
         <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
         <Strings>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerControl.xaml.cs b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerControl.xaml.cs
index 2917d122461da..fe4d840f5cf1c 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerControl.xaml.cs
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerControl.xaml.cs
@@ -143,6 +143,21 @@ public void ShowGeneratedCode()
         }
     }
 
+    public void ShowGeneratedDeclarationCode()
+    {
+        if (_activeWpfTextView is null)
+        {
+            return;
+        }
+
+        EnsureInitialized();
+
+        if (_fileUriProvider.TryGet(_activeWpfTextView.TextBuffer, out var hostDocumentUri))
+        {
+            ShowGeneratedCode(_activeWpfTextView.TextBuffer, hostDocumentUri, GeneratedDocumentKind.CSharpDeclaration);
+        }
+    }
+
     private void OpenVirtualDocuments<T>(ITextBuffer hostDocumentBuffer) where T : VirtualDocumentSnapshot
     {
         EnsureInitialized();
@@ -204,6 +219,7 @@ private void ShowGeneratedCode(ITextBuffer textBuffer, Uri hostDocumentUri, Gene
         var extension = kind switch
         {
             GeneratedDocumentKind.CSharp => ".g.cs",
+            GeneratedDocumentKind.CSharpDeclaration => ".decl.g.cs",
             GeneratedDocumentKind.Html => ".g.html",
             GeneratedDocumentKind.Formatting => ".formatting.cs",
             _ => null
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerToolWindow.cs b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerToolWindow.cs
index 5362270903a32..d1e4604a5f80f 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerToolWindow.cs
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerToolWindow.cs
@@ -31,6 +31,7 @@ internal class SyntaxVisualizerToolWindow : ToolWindowPane
     private const int CmdIdShowInScopeTagHelpers = 0x0114;
     private const int CmdIdShowReferencedTagHelpers = 0x0115;
     private const int CmdidShowFormattingDocument = 0x0116;
+    private const int CmdIdShowGeneratedDeclarationCode = 0x0117;
 
     private SyntaxVisualizerControl _visualizerControl => (SyntaxVisualizerControl)Content;
 
@@ -77,6 +78,7 @@ internal void InitializeCommands(IMenuCommandService mcs, Guid guidSyntaxVisuali
 
         mcs.AddCommand(new MenuCommand(ShowFormattingDocument, new CommandID(guidSyntaxVisualizerMenuCmdSet, CmdidShowFormattingDocument)));
         mcs.AddCommand(new MenuCommand(ShowGeneratedCode, new CommandID(guidSyntaxVisualizerMenuCmdSet, CmdIdShowGeneratedCode)));
+        mcs.AddCommand(new MenuCommand(ShowGeneratedDeclarationCode, new CommandID(guidSyntaxVisualizerMenuCmdSet, CmdIdShowGeneratedDeclarationCode)));
         mcs.AddCommand(new MenuCommand(ShowGeneratedHtml, new CommandID(guidSyntaxVisualizerMenuCmdSet, CmdIdShowGeneratedHtml)));
         mcs.AddCommand(new MenuCommand(ShowAllTagHelpers, new CommandID(guidSyntaxVisualizerMenuCmdSet, CmdIdShowAllTagHelpers)));
         mcs.AddCommand(new MenuCommand(ShowInScopeTagHelpers, new CommandID(guidSyntaxVisualizerMenuCmdSet, CmdIdShowInScopeTagHelpers)));
@@ -93,6 +95,11 @@ private void ShowGeneratedCode(object sender, EventArgs e)
         _visualizerControl.ShowGeneratedCode();
     }
 
+    private void ShowGeneratedDeclarationCode(object sender, EventArgs e)
+    {
+        _visualizerControl.ShowGeneratedDeclarationCode();
+    }
+
     private void ShowGeneratedHtml(object sender, EventArgs e)
     {
         _visualizerControl.ShowGeneratedHtml();
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.cs.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.cs.xlf
index 92922221bed41..4197fa8b3a9f0 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.cs.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.cs.xlf
@@ -97,6 +97,11 @@
         <target state="translated">Zobrazit vygenerovaný kód v jazyku C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">Zobrazit vygenerovaný kód HTML</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.de.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.de.xlf
index c7d57982ad0aa..88061e0f30f2c 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.de.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.de.xlf
@@ -97,6 +97,11 @@
         <target state="translated">Generiertes C anzeigen #</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">Generiertes HTML anzeigen</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.es.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.es.xlf
index 4759074508633..6e05090e50be3 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.es.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.es.xlf
@@ -97,6 +97,11 @@
         <target state="translated">Mostrar C# generado</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">Mostrar HTML generado</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.fr.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.fr.xlf
index 926529c5d7280..82e821ea7170a 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.fr.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.fr.xlf
@@ -97,6 +97,11 @@
         <target state="translated">Afficher les C générés #</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">Afficher le code HTML généré</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.it.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.it.xlf
index 1395cc31cd397..77a14f51d498e 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.it.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.it.xlf
@@ -97,6 +97,11 @@
         <target state="translated">Mostra C# generato</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">Mostra HTML generato</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ja.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ja.xlf
index a60f7d3032d11..db79f9a041e0a 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ja.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ja.xlf
@@ -97,6 +97,11 @@
         <target state="translated">生成された C# を表示</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">生成された HTML を表示</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ko.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ko.xlf
index c14f0eb87ade9..398694b6ba7ba 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ko.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ko.xlf
@@ -97,6 +97,11 @@
         <target state="translated">생성된 C# 표시</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">생성된 HTML 표시</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pl.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pl.xlf
index ceea2834af2f0..85c88539ef560 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pl.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pl.xlf
@@ -97,6 +97,11 @@
         <target state="translated">Pokaż wygenerowany język C #</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">Pokaż wygenerowany kod HTML</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pt-BR.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pt-BR.xlf
index 81f0029e07899..81c74d6b2bfad 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pt-BR.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pt-BR.xlf
@@ -97,6 +97,11 @@
         <target state="translated">Mostrar C# gerado</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">Mostrar HTML Gerado</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ru.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ru.xlf
index 10a3124a23c80..ab7ba1e570701 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ru.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ru.xlf
@@ -97,6 +97,11 @@
         <target state="translated">Показать созданный C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">Показать созданный HTML</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.tr.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.tr.xlf
index 78511dd5549de..3b3d7765ecdd8 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.tr.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.tr.xlf
@@ -97,6 +97,11 @@
         <target state="translated">Oluşturan C# Dilini Göster</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">Oluşturan HTML’yi Göster</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hans.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hans.xlf
index 7075761164f8b..1d8f4fe0f6b18 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hans.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hans.xlf
@@ -97,6 +97,11 @@
         <target state="translated">显示生成的 C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">显示生成的 HTML</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hant.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hant.xlf
index 5aa249f01b79a..f2596213332aa 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hant.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hant.xlf
@@ -97,6 +97,11 @@
         <target state="translated">顯示已產生的 C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidShowGeneratedDeclarationCode|ButtonText">
+        <source>Show Generated C# Declaration</source>
+        <target state="new">Show Generated C# Declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidShowGeneratedHtml|ButtonText">
         <source>Show Generated HTML</source>
         <target state="translated">顯示已產生的 HTML</target>
diff --git a/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs b/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs
index 127a0f6447f4e..581a35963a6e9 100644
--- a/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs
+++ b/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.CodeAnalysis.Razor.Protocol.DevTools;
 using Xunit;
@@ -24,6 +25,30 @@ public async Task CSharp()
         await VerifyGeneratedDocumentContentsAsync(input, GeneratedDocumentKind.CSharp, """var message = "Hello World";""");
     }
 
+    [Fact]
+    public async Task CSharpDeclaration()
+    {
+        var input = """
+                <h1>@Title</h1>
+
+                @code {
+                    private string Title { get; set; } = "Hello World";
+                }
+                """;
+
+        await VerifyGeneratedDocumentContentsAsync(input, GeneratedDocumentKind.CSharpDeclaration, """private string Title { get; set; } = "Hello World";""");
+    }
+
+    [Fact]
+    public async Task CSharpDeclaration_ReturnsNullIfDocumentDoesNotExist()
+    {
+        var input = """
+                <h1>Hello World</h1>
+                """;
+
+        await VerifyGeneratedDocumentContentsAsync(input, GeneratedDocumentKind.CSharpDeclaration, expectedContentSubstring: null, RazorFileKind.Legacy);
+    }
+
     [Fact]
     public async Task Html()
     {
@@ -51,9 +76,9 @@ public async Task Formatting()
         await VerifyGeneratedDocumentContentsAsync(input, GeneratedDocumentKind.Formatting, "class @code{");
     }
 
-    private async Task VerifyGeneratedDocumentContentsAsync(string input, GeneratedDocumentKind kind, string expectedContentSubstring)
+    private async Task VerifyGeneratedDocumentContentsAsync(string input, GeneratedDocumentKind kind, string? expectedContentSubstring, RazorFileKind? fileKind = null)
     {
-        var razorDocument = CreateProjectAndRazorDocument(input);
+        var razorDocument = CreateProjectAndRazorDocument(input, fileKind);
         var endpoint = new CohostGeneratedDocumentContentsEndpoint(IncompatibleProjectService, RemoteServiceInvoker);
 
         var request = new DocumentContentsRequest
@@ -64,7 +89,14 @@ private async Task VerifyGeneratedDocumentContentsAsync(string input, GeneratedD
 
         var result = await endpoint.GetTestAccessor().HandleRequestAsync(request, razorDocument, DisposalToken);
 
-        Assert.NotNull(result);
-        Assert.Contains(expectedContentSubstring, result);
+        if (expectedContentSubstring is null)
+        {
+            Assert.Null(result);
+        }
+        else
+        {
+            Assert.NotNull(result);
+            Assert.Contains(expectedContentSubstring, result);
+        }
     }
 }

From 75cd008c3d5af9a4de06c9eb8bcb3dfe127a9872 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Wed, 17 Jun 2026 16:46:48 +1000
Subject: [PATCH 2/4] Rename generated C# document kind

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../CohostGeneratedDocumentContentsEndpoint.cs                | 2 +-
 .../Protocol/DevTools/GeneratedDocumentKind.cs                | 2 +-
 .../SyntaxVisualizer/SyntaxVisualizerControl.xaml.cs          | 4 ++--
 .../Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/GeneratedDocumentContents/CohostGeneratedDocumentContentsEndpoint.cs b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/GeneratedDocumentContents/CohostGeneratedDocumentContentsEndpoint.cs
index 8e9dfc8f9665a..9259bc3ee8b54 100644
--- a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/GeneratedDocumentContents/CohostGeneratedDocumentContentsEndpoint.cs
+++ b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/GeneratedDocumentContents/CohostGeneratedDocumentContentsEndpoint.cs
@@ -36,7 +36,7 @@ internal sealed class CohostGeneratedDocumentContentsEndpoint(
     {
         var response = request.Kind switch
         {
-            GeneratedDocumentKind.CSharp => await _remoteServiceInvoker.TryInvokeAsync<IRemoteDevToolsService, string?>(
+            GeneratedDocumentKind.CSharpImplementation => await _remoteServiceInvoker.TryInvokeAsync<IRemoteDevToolsService, string?>(
                 razorDocument.Project.Solution,
                 (service, solutionInfo, cancellationToken) => service.GetCSharpDocumentTextAsync(solutionInfo, razorDocument.Id, declarationDocument: false, cancellationToken),
                 cancellationToken).ConfigureAwait(false),
diff --git a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DevTools/GeneratedDocumentKind.cs b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DevTools/GeneratedDocumentKind.cs
index 17550b031d5a8..88c3cdd54f1ec 100644
--- a/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DevTools/GeneratedDocumentKind.cs
+++ b/src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DevTools/GeneratedDocumentKind.cs
@@ -5,7 +5,7 @@ namespace Microsoft.CodeAnalysis.Razor.Protocol.DevTools;
 
 internal enum GeneratedDocumentKind
 {
-    CSharp,
+    CSharpImplementation,
     CSharpDeclaration,
     Html,
     Formatting
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerControl.xaml.cs b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerControl.xaml.cs
index fe4d840f5cf1c..16dacf912b3f2 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerControl.xaml.cs
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerControl.xaml.cs
@@ -139,7 +139,7 @@ public void ShowGeneratedCode()
 
         if (_fileUriProvider.TryGet(_activeWpfTextView.TextBuffer, out var hostDocumentUri))
         {
-            ShowGeneratedCode(_activeWpfTextView.TextBuffer, hostDocumentUri, GeneratedDocumentKind.CSharp);
+            ShowGeneratedCode(_activeWpfTextView.TextBuffer, hostDocumentUri, GeneratedDocumentKind.CSharpImplementation);
         }
     }
 
@@ -218,7 +218,7 @@ private void ShowGeneratedCode(ITextBuffer textBuffer, Uri hostDocumentUri, Gene
 
         var extension = kind switch
         {
-            GeneratedDocumentKind.CSharp => ".g.cs",
+            GeneratedDocumentKind.CSharpImplementation => ".g.cs",
             GeneratedDocumentKind.CSharpDeclaration => ".decl.g.cs",
             GeneratedDocumentKind.Html => ".g.html",
             GeneratedDocumentKind.Formatting => ".formatting.cs",
diff --git a/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs b/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs
index 581a35963a6e9..cbfba48529632 100644
--- a/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs
+++ b/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs
@@ -13,7 +13,7 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 public class CohostGeneratedDocumentContentsEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper)
 {
     [Fact]
-    public async Task CSharp()
+    public async Task CSharpImplementation()
     {
         var input = """
                 @{
@@ -22,7 +22,7 @@ public async Task CSharp()
                 <div>@message</div>
                 """;
 
-        await VerifyGeneratedDocumentContentsAsync(input, GeneratedDocumentKind.CSharp, """var message = "Hello World";""");
+        await VerifyGeneratedDocumentContentsAsync(input, GeneratedDocumentKind.CSharpImplementation, """var message = "Hello World";""");
     }
 
     [Fact]

From a2ffdd179101cf3d41d80ae96a272ade7af7d9df Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Wed, 17 Jun 2026 18:26:07 +1000
Subject: [PATCH 3/4] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs b/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs
index cbfba48529632..089b182827957 100644
--- a/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs
+++ b/src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostGeneratedDocumentContentsEndpointTest.cs
@@ -46,7 +46,7 @@ public async Task CSharpDeclaration_ReturnsNullIfDocumentDoesNotExist()
                 <h1>Hello World</h1>
                 """;
 
-        await VerifyGeneratedDocumentContentsAsync(input, GeneratedDocumentKind.CSharpDeclaration, expectedContentSubstring: null, RazorFileKind.Legacy);
+        await VerifyGeneratedDocumentContentsAsync(input, GeneratedDocumentKind.CSharpDeclaration, expectedContentSubstring: null, fileKind: RazorFileKind.Legacy);
     }
 
     [Fact]

From 1b8f1ea1580207a9b997fa3d1cf316eacfa529c0 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Thu, 18 Jun 2026 08:57:51 +1000
Subject: [PATCH 4/4] Group Razor syntax visualizer toolbar commands

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../RazorContextMenu.vsct                     | 54 ++++++++++++++-----
 .../xlf/RazorContextMenu.vsct.cs.xlf          | 10 ++++
 .../xlf/RazorContextMenu.vsct.de.xlf          | 10 ++++
 .../xlf/RazorContextMenu.vsct.es.xlf          | 10 ++++
 .../xlf/RazorContextMenu.vsct.fr.xlf          | 10 ++++
 .../xlf/RazorContextMenu.vsct.it.xlf          | 10 ++++
 .../xlf/RazorContextMenu.vsct.ja.xlf          | 10 ++++
 .../xlf/RazorContextMenu.vsct.ko.xlf          | 10 ++++
 .../xlf/RazorContextMenu.vsct.pl.xlf          | 10 ++++
 .../xlf/RazorContextMenu.vsct.pt-BR.xlf       | 10 ++++
 .../xlf/RazorContextMenu.vsct.ru.xlf          | 10 ++++
 .../xlf/RazorContextMenu.vsct.tr.xlf          | 10 ++++
 .../xlf/RazorContextMenu.vsct.zh-Hans.xlf     | 10 ++++
 .../xlf/RazorContextMenu.vsct.zh-Hant.xlf     | 10 ++++
 14 files changed, 170 insertions(+), 14 deletions(-)

diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/RazorContextMenu.vsct b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/RazorContextMenu.vsct
index dcefaa9194e0c..d3421dc9811d5 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/RazorContextMenu.vsct
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/RazorContextMenu.vsct
@@ -12,8 +12,12 @@
     <GuidSymbol name="guidSyntaxVisualizerMenuCmdSet" value="{a3a603a2-2b17-4ce2-bd21-cbb8ccc084ec}">
       <IDSymbol name="cmdidRazorSyntaxVisualizer" value="0x0101" />
       <IDSymbol name="menuidToolWindowToolbar" value="0x0102" />
+      <IDSymbol name="menuidShowGenerated" value="0x0103" />
+      <IDSymbol name="menuidShowTagHelpers" value="0x0104" />
 
       <IDSymbol name="grpidRazorSyntaxVisualizer" value="0x1000" />
+      <IDSymbol name="grpidShowGenerated" value="0x1001" />
+      <IDSymbol name="grpidShowTagHelpers" value="0x1002" />
 
       <!-- Top level commands in the tool window -->
       <IDSymbol name="cmdidShowGeneratedCode" value="0x0111" />
@@ -57,6 +61,14 @@
         <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="menuidToolWindowToolbar"/>
       </Group>
 
+      <Group guid="guidSyntaxVisualizerMenuCmdSet" id="grpidShowGenerated" priority="0x0100">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="menuidShowGenerated"/>
+      </Group>
+
+      <Group guid="guidSyntaxVisualizerMenuCmdSet" id="grpidShowTagHelpers" priority="0x0100">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="menuidShowTagHelpers"/>
+      </Group>
+
       <!-- Nested file group parented to Solution Explorer item context menu -->
       <Group guid="guidRazorNestedFilesCmdSet" id="grpidRazorNestedFiles" priority="0x0310">
         <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_ITEMNODE"/>
@@ -76,6 +88,20 @@
           <ButtonText>Razor Syntax Visualizer</ButtonText>
         </Strings>
       </Menu>
+
+      <Menu guid="guidSyntaxVisualizerMenuCmdSet" id="menuidShowGenerated" priority="0x0200" type="Menu">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
+        <Strings>
+          <ButtonText>Show Generated File</ButtonText>
+        </Strings>
+      </Menu>
+
+      <Menu guid="guidSyntaxVisualizerMenuCmdSet" id="menuidShowTagHelpers" priority="0x0300" type="Menu">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
+        <Strings>
+          <ButtonText>Show Tag Helpers</ButtonText>
+        </Strings>
+      </Menu>
     </Menus>
 
     <Buttons>
@@ -89,50 +115,50 @@
         </Strings>
       </Button>
 
-      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdidShowGeneratedCode" priority="0x202" type="Button">
-        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
+      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdidShowGeneratedCode" priority="0x0100" type="Button">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidShowGenerated" />
         <Strings>
           <ButtonText>Show Generated C#</ButtonText>
         </Strings>
       </Button>
 
-      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdidShowGeneratedDeclarationCode" priority="0x202" type="Button">
-        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
+      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdidShowGeneratedDeclarationCode" priority="0x0101" type="Button">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidShowGenerated" />
         <Strings>
           <ButtonText>Show Generated C# Declaration</ButtonText>
         </Strings>
       </Button>
 
-      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdidShowGeneratedHtml" priority="0x202" type="Button">
-        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
+      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdidShowGeneratedHtml" priority="0x0102" type="Button">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidShowGenerated" />
         <Strings>
           <ButtonText>Show Generated HTML</ButtonText>
         </Strings>
       </Button>
 
-      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdidShowFormattingDocument" priority="0x202" type="Button">
-        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
+      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdidShowFormattingDocument" priority="0x0103" type="Button">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidShowGenerated" />
         <Strings>
           <ButtonText>Show Formatting Document</ButtonText>
         </Strings>
       </Button>
 
-      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdIdShowAllTagHelpers" priority="0x203" type="Button">
-        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
+      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdIdShowAllTagHelpers" priority="0x0100" type="Button">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidShowTagHelpers" />
         <Strings>
           <ButtonText>Show All Tag Helpers</ButtonText>
         </Strings>
       </Button>
 
-      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdIdShowInScopeTagHelpers" priority="0x204" type="Button">
-        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
+      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdIdShowInScopeTagHelpers" priority="0x0101" type="Button">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidShowTagHelpers" />
         <Strings>
           <ButtonText>Show In Scope Tag Helpers</ButtonText>
         </Strings>
       </Button>
 
-      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdIdShowReferencedTagHelpers" priority="0x205" type="Button">
-        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidRazorSyntaxVisualizer" />
+      <Button guid="guidSyntaxVisualizerMenuCmdSet" id="cmdIdShowReferencedTagHelpers" priority="0x0102" type="Button">
+        <Parent guid="guidSyntaxVisualizerMenuCmdSet" id="grpidShowTagHelpers" />
         <Strings>
           <ButtonText>Show Referenced Tag Helpers</ButtonText>
         </Strings>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.cs.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.cs.xlf
index 4197fa8b3a9f0..55a6b6c1d0ea4 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.cs.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.cs.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.de.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.de.xlf
index 88061e0f30f2c..fd42c2110c411 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.de.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.de.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor-Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.es.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.es.xlf
index 6e05090e50be3..7ab70c9c8d7a1 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.es.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.es.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.fr.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.fr.xlf
index 82e821ea7170a..fcaa7980ea123 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.fr.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.fr.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.it.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.it.xlf
index 77a14f51d498e..8aa00d5a8ce4b 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.it.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.it.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ja.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ja.xlf
index db79f9a041e0a..c95b9c25c1be8 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ja.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ja.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ko.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ko.xlf
index 398694b6ba7ba..fe75e8b860ccc 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ko.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ko.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pl.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pl.xlf
index 85c88539ef560..e52c6958333a5 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pl.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pl.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Syntax Visualizer Razor</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pt-BR.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pt-BR.xlf
index 81c74d6b2bfad..12f214393521c 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pt-BR.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.pt-BR.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ru.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ru.xlf
index ab7ba1e570701..d1f007ec8dc49 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ru.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.ru.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.tr.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.tr.xlf
index 3b3d7765ecdd8..91ac6f279f6cc 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.tr.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.tr.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hans.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hans.xlf
index 1d8f4fe0f6b18..6d3b8529adc29 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hans.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hans.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>
diff --git a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hant.xlf b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hant.xlf
index f2596213332aa..a463d495e9d45 100644
--- a/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hant.xlf
+++ b/src/Razor/src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/RazorContextMenu.vsct.zh-Hant.xlf
@@ -122,6 +122,16 @@
         <target state="translated">ViewPageEditor</target>
         <note />
       </trans-unit>
+      <trans-unit id="menuidShowGenerated|ButtonText">
+        <source>Show Generated File</source>
+        <target state="new">Show Generated File</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="menuidShowTagHelpers|ButtonText">
+        <source>Show Tag Helpers</source>
+        <target state="new">Show Tag Helpers</target>
+        <note />
+      </trans-unit>
       <trans-unit id="menuidToolWindowToolbar|ButtonText">
         <source>Razor Syntax Visualizer</source>
         <target state="translated">Razor Syntax Visualizer</target>