Fix wrapping attributes on self-closing input tags

Author: davidwengier

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/WrapAttributesCodeActionProvider.cs

@@ -31,11 +31,6 @@ public Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeAct
         }
 
         var owner = syntaxTree.Root.FindNode(TextSpan.FromBounds(context.StartAbsoluteIndex, context.EndAbsoluteIndex));
-        if (owner is null)
-        {
-            return SpecializedTasks.EmptyImmutableArray<RazorVSInternalCodeAction>();
-        }
-
         var attributes = FindAttributes(owner);
         if (attributes.Count == 0)
         {
@@ -100,8 +95,24 @@ public Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeAct
         return Task.FromResult<ImmutableArray<RazorVSInternalCodeAction>>([action]);
     }
 
-    private AspNetCore.Razor.Language.Syntax.SyntaxList<RazorSyntaxNode> FindAttributes(AspNetCore.Razor.Language.Syntax.SyntaxNode owner)
+    private static AspNetCore.Razor.Language.Syntax.SyntaxList<RazorSyntaxNode> FindAttributes(AspNetCore.Razor.Language.Syntax.SyntaxNode? owner)
     {
+        // Sometimes FindNode will find the start tag, sometimes the element. We always start from the start tag to make searching
+        // easier, and since we are concerned with attributes, things without start tags wouldn't be applicalbe anyway
+        if (owner is MarkupElementSyntax element)
+        {
+            owner = element.StartTag;
+        }
+        else if (owner is MarkupTagHelperElementSyntax tagHelperElement)
+        {
+            owner = tagHelperElement.StartTag;
+        }
+
+        if (owner is null)
+        {
+            return [];
+        }
+
         foreach (var node in owner.AncestorsAndSelf())
         {
             if (node is MarkupStartTagSyntax startTag)

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CodeActions/CohostCodeActionsEndpointTestBase.cs

@@ -89,10 +89,14 @@ private protected async Task VerifyCodeActionAsync(TestCode input, string? expec
             }
         }
 
+        var range = input.HasSpans
+            ? inputText.GetRange(input.Span)
+            : inputText.GetRange(input.Position, input.Position);
+
         var request = new VSCodeActionParams
         {
             TextDocument = new VSTextDocumentIdentifier { Uri = document.CreateUri() },
-            Range = inputText.GetRange(input.Span),
+            Range = range,
             Context = new VSInternalCodeActionContext() { Diagnostics = diagnostics.ToArray() }
         };
 

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CodeActions/WrapAttributeTests.cs

@@ -101,4 +101,31 @@ await VerifyCodeActionAsync(
             expected: null,
             codeActionName: LanguageServerConstants.CodeActions.WrapAttributes);
     }
+
+    [Fact]
+    public async Task SelfClosing()
+    {
+        await VerifyCodeActionAsync(
+            input: """
+                @if (true)
+                {
+                    <div>
+                        <in[||]put bar="Baz" Zip="Zap" checked @onclick="foo" Pop="Pap" />
+                    </div>
+                }
+                """,
+            expected: """
+                @if (true)
+                {
+                    <div>
+                        <input bar="Baz"
+                               Zip="Zap"
+                               checked
+                               @onclick="foo"
+                               Pop="Pap" />
+                    </div>
+                }
+                """,
+            codeActionName: LanguageServerConstants.CodeActions.WrapAttributes);
+    }
 }