PR feedback from #12415 which accidentally didn't get pushed (#12424)

Author: ToddGrun

src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Hover/CohostHoverEndpoint.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.Collections.Immutable;
 using System.Composition;
 using System.Threading;
@@ -97,41 +98,43 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
             static markupContent => markupContent.Value
         );
 
-        if (htmlStringResponse is not null)
+        if (htmlStringResponse is null)
         {
-            // This logic is to prepend HTML hover content to the razor hover content if both exist.
-            // The razor content comes through as a ContainerElement, while the html content comes
-            // through as MarkupContent. We need to extract the html content and insert it at the
-            // start of the combined ContainerElement.
-            if (razorHover is VSInternalHover razorVsInternalHover
-                && razorVsInternalHover.RawContent is ContainerElement razorContainerElement)
-            {
-                var htmlStringClassifiedTextElement = ClassifiedTextElement.CreatePlainText(htmlStringResponse);
-                var verticalSpacingTextElement = ClassifiedTextElement.CreatePlainText(string.Empty);
-                var htmlContainerElement = new ContainerElement(
-                    ContainerElementStyle.Stacked,
-                    [htmlStringClassifiedTextElement, verticalSpacingTextElement]);
-
-                // Modify the existing hover's RawContent to prepend the HTML content.
-                razorVsInternalHover.RawContent = new ContainerElement(razorContainerElement.Style, [htmlContainerElement, .. razorContainerElement.Elements]);
-            }
-            else
+            return razorHover;
+        }
+
+        // This logic is to prepend HTML hover content to the razor hover content if both exist.
+        // The razor content comes through as a ContainerElement, while the html content comes
+        // through as MarkupContent. We need to extract the html content and insert it at the
+        // start of the combined ContainerElement.
+        if (razorHover is VSInternalHover razorVsInternalHover
+            && razorVsInternalHover.RawContent is ContainerElement razorContainerElement)
+        {
+            var htmlStringClassifiedTextElement = ClassifiedTextElement.CreatePlainText(htmlStringResponse);
+            var verticalSpacingTextElement = ClassifiedTextElement.CreatePlainText(string.Empty);
+            var htmlContainerElement = new ContainerElement(
+                ContainerElementStyle.Stacked,
+                [htmlStringClassifiedTextElement, verticalSpacingTextElement]);
+
+            // Modify the existing hover's RawContent to prepend the HTML content.
+            razorVsInternalHover.RawContent = new ContainerElement(razorContainerElement.Style, [htmlContainerElement, .. razorContainerElement.Elements]);
+        }
+        else
+        {
+            var razorStringResponse = razorHover.Contents.Match(
+                static s => s,
+                static markedString => throw new NotImplementedException(),
+                static stringOrMarkedStringArray => throw new NotImplementedException(),
+                static markupContent => markupContent.Value
+            );
+
+            if (razorStringResponse is not null)
             {
-                var razorStringResponse = razorHover.Contents.Match(
-                    static s => s,
-                    static markedString => null,
-                    static stringOrMarkedStringArray => null,
-                    static markupContent => markupContent.Value
-                );
-
-                if (razorStringResponse is not null)
+                razorHover.Contents = new MarkupContent()
                 {
-                    razorHover.Contents = new MarkupContent()
-                    {
-                        Kind = MarkupKind.Markdown,
-                        Value = htmlStringResponse + "\n\n---\n\n" + razorStringResponse
-                    };
-                }
+                    Kind = MarkupKind.Markdown,
+                    Value = htmlStringResponse + "\n\n---\n\n" + razorStringResponse
+                };
             }
         }
 

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/HoverAssertions.cs

@@ -94,4 +94,7 @@ public static Action<ClassifiedTextRun> Type(string text)
 
     public static Action<ClassifiedTextRun> WhiteSpace(string text)
         => Run(text, ClassificationTypeNames.WhiteSpace);
+
+    public static Action<object?> HorizontalRule
+        => o => { };
 }

src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostHoverEndpointTest.cs

@@ -106,8 +106,7 @@ await VerifyHoverAsync(code, RazorFileKind.Legacy, htmlResponse, async (hover, d
                     Container(
                         ClassifiedText(
                             Text(BodyDescription)),
-                        ClassifiedText(
-                            Text(string.Empty))),
+                        HorizontalRule),
                     Container(
                         Image,
                         ClassifiedText(

src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/HoverAssertions.cs

@@ -12,14 +12,7 @@ public static void VerifyContents(this LspHover hover, object expected)
     {
         var markup = hover.Contents.Fourth;
 
-        var actual = markup.Value.TrimEnd('\r', '\n');
-        if (markup.Kind == MarkupKind.Markdown)
-        {
-            // Remove any horizontal rules we may have added to separate HTML and Razor content
-            actual = actual.Replace("\n\n---\n\n", string.Empty);
-        }
-
-        AssertEx.EqualOrDiff(expected.ToString(), actual);
+        AssertEx.EqualOrDiff(expected.ToString(), markup.Value.TrimEnd('\r', '\n'));
     }
 
     // Our VS Code test only produce plain text hover content, so these methods are complete overkill,
@@ -61,4 +54,7 @@ public static string Type(string text)
 
     public static string WhiteSpace(string text)
         => text;
+
+    public static string HorizontalRule
+        => "\n\n---\n\n";
 }