Some of the PR feedback that wasn't deferred to the next one, and added tests

Author: marcarro

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/ExtractToComponentCodeActionProvider.cs

@@ -261,7 +261,10 @@ private static (SyntaxNode? Start, SyntaxNode? End) FindContainingSiblingPair(Sy
     {
         var current = node1;
 
-        while (current is MarkupElementSyntax && current is not null)
+        while (current is MarkupElementSyntax or
+                MarkupTagHelperAttributeSyntax or
+                MarkupBlockSyntax &&
+            current is not null)
         {
             if (current.Span.Contains(node2.Span))
             {
@@ -279,51 +282,28 @@ private static void AddComponentDependenciesInRange(SyntaxNode root, int extract
         var components = new HashSet<string>();
         var extractSpan = new TextSpan(extractStart, extractEnd - extractStart);
 
-        foreach (var node in root.DescendantNodes())
+        foreach (var node in root.DescendantNodes().Where(node => extractSpan.Contains(node.Span)))
         {
-            if (IsMarkupTagHelperElement(node, extractSpan))
+            if (node is MarkupTagHelperElementSyntax { TagHelperInfo: { } tagHelperInfo })
             {
-                var tagHelperInfo = GetTagHelperInfo(node);
-                if (tagHelperInfo is not null)
-                {
-                    AddDependenciesFromTagHelperInfo(tagHelperInfo, components, actionParams);
-                }
+                AddDependenciesFromTagHelperInfo(tagHelperInfo, components, actionParams);
             }
         }
     }
 
-    private static bool IsMarkupTagHelperElement(SyntaxNode node, TextSpan extractSpan)
-    {
-        return node is MarkupTagHelperElementSyntax markupElement &&
-                extractSpan.Contains(markupElement.Span);
-    }
-
-    private static TagHelperInfo? GetTagHelperInfo(SyntaxNode node)
-    {
-        if (node is MarkupTagHelperElementSyntax markupElement)
-        {
-            return markupElement.TagHelperInfo;
-        }
-
-        return null;
-    }
-
     private static void AddDependenciesFromTagHelperInfo(TagHelperInfo tagHelperInfo, HashSet<string> components, ExtractToComponentCodeActionParams actionParams)
     {
         foreach (var descriptor in tagHelperInfo.BindingResult.Descriptors)
         {
-            if (descriptor is not null)
+            if (descriptor is null)
+            {
+                continue;
+            }
+
+            var typeNamespace = descriptor.GetTypeNamespace();
+            if (components.Add(typeNamespace))
             {
-                foreach (var metadata in descriptor.Metadata)
-                {
-                    if (metadata.Key == TagHelperMetadata.Common.TypeNamespace &&
-                        metadata.Value is not null &&
-                        !components.Contains(metadata.Value))
-                    {
-                        components.Add(metadata.Value);
-                        actionParams.Dependencies.Add($"@using {metadata.Value}");
-                    }
-                }
+                actionParams.Dependencies.Add($"@using {typeNamespace}");
             }
         }
     }

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndToEndTest.NetFx.cs

@@ -61,10 +61,9 @@ private GenerateMethodCodeActionResolver[] CreateRazorCodeActionResolvers(
                     razorFormattingService)
             ];
 
-    // TODO: Make this func
-    private ExtractToComponentCodeActionResolver[] CreateExtractComponentCodeActionResolvers(string filePath, RazorCodeDocument codeDocument)
+
+    private ExtractToComponentCodeActionResolver[] CreateExtractComponentCodeActionResolver(string filePath, RazorCodeDocument codeDocument)
     {
-        var emptyDocumentContextFactory = new TestDocumentContextFactory();
         return [
                 new ExtractToComponentCodeActionResolver(
                     new GenerateMethodResolverDocumentContextFactory(filePath, codeDocument),
@@ -1019,7 +1018,7 @@ await ValidateCodeActionAsync(input,
     }
 
     [Fact]
-    public async Task Handle_ExtractComponent()
+    public async Task Handle_ExtractComponent_SingleElement_ReturnsResult()
     {
         var input = """
             <[||]div id="a">
@@ -1045,7 +1044,75 @@ await ValidateExtractComponentCodeActionAsync(
             expectedRazorComponent,
             ExtractToComponentTitle,
             razorCodeActionProviders: [new ExtractToComponentCodeActionProvider(LoggerFactory)],
-            codeActionResolversCreator: CreateExtractComponentCodeActionResolvers);
+            codeActionResolversCreator: CreateExtractComponentCodeActionResolver);
+    }
+
+    [Fact]
+    public async Task Handle_ExtractComponent_SiblingElement_ReturnsResult()
+    {
+        var input = """
+            <[|div id="a">
+                <h1>Div a title</h1>
+                <Book Title="To Kill a Mockingbird" Author="Harper Lee" Year="Long ago" />
+                <p>Div a par</p>
+            </div>
+            <div id="b">
+                <Movie Title="Aftersun" Director="Charlotte Wells" Year="2022" />
+            </div|]>
+            """;
+
+        var expectedRazorComponent = """
+            <div id="a">
+                <h1>Div a title</h1>
+                <Book Title="To Kill a Mockingbird" Author="Harper Lee" Year="Long ago" />
+                <p>Div a par</p>
+            </div>
+            <div id="b">
+                <Movie Title="Aftersun" Director="Charlotte Wells" Year="2022" />
+            </div>
+            """;
+
+        await ValidateExtractComponentCodeActionAsync(
+            input,
+            expectedRazorComponent,
+            ExtractToComponentTitle,
+            razorCodeActionProviders: [new ExtractToComponentCodeActionProvider(LoggerFactory)],
+            codeActionResolversCreator: CreateExtractComponentCodeActionResolver);
+    }
+
+    [Fact]
+    public async Task Handle_ExtractComponent_StartNodeContainsEndNode_ReturnsResult()
+    {
+        var input = """
+            <[|div id="parent">
+                <div>
+                    <div>
+                        <div>
+                            <p>Deeply nested par</p|]>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            """;
+
+        var expectedRazorComponent = """
+            <div id="parent">
+                <div>
+                    <div>
+                        <div>
+                            <p>Deeply nested par</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            """;
+
+        await ValidateExtractComponentCodeActionAsync(
+            input,
+            expectedRazorComponent,
+            ExtractToComponentTitle,
+            razorCodeActionProviders: [new ExtractToComponentCodeActionProvider(LoggerFactory)],
+            codeActionResolversCreator: CreateExtractComponentCodeActionResolver);
     }
 
     #endregion
@@ -1196,19 +1263,20 @@ private async Task ValidateExtractComponentCodeActionAsync(
         string? expected,
         string codeAction,
         int childActionIndex = 0,
+        IEnumerable<(string filePath, string contents)>? additionalRazorDocuments = null,
         IRazorCodeActionProvider[]? razorCodeActionProviders = null,
         Func<string, RazorCodeDocument, IRazorCodeActionResolver[]>? codeActionResolversCreator = null,
         RazorLSPOptionsMonitor? optionsMonitor = null,
         Diagnostic[]? diagnostics = null)
     {
         TestFileMarkupParser.GetSpan(input, out input, out var textSpan);
 
-        var razorFilePath = "C:/path/test.razor";
-        var componentFilePath = "C:/path/Component.razor";
+        var razorFilePath = "C:/path/to/test.razor";
+        var componentFilePath = "C:/path/to/Component.razor";
         var codeDocument = CreateCodeDocument(input, filePath: razorFilePath);
         var sourceText = codeDocument.Source.Text;
         var uri = new Uri(razorFilePath);
-        var languageServer = await CreateLanguageServerAsync(codeDocument, razorFilePath);
+        var languageServer = await CreateLanguageServerAsync(codeDocument, razorFilePath, additionalRazorDocuments);
         var documentContext = CreateDocumentContext(uri, codeDocument);
         var requestContext = new RazorRequestContext(documentContext, null!, "lsp/method", uri: null);
 
@@ -1239,15 +1307,9 @@ private async Task ValidateExtractComponentCodeActionAsync(
             languageServer,
             codeActionResolversCreator?.Invoke(razorFilePath, codeDocument) ?? []);
 
-        var edits = new List<TextChange>();
-
-        // Only get changes made in the new component file
-        foreach (var change in changes.Where(e => e.TextDocument.Uri.AbsolutePath == componentFilePath))
-        {
-            edits.AddRange(change.Edits.Select(sourceText.GetTextChange));
-        }
+        var edits = changes.Where(change => change.TextDocument.Uri.AbsolutePath == componentFilePath).Single();
+        var actual = edits.Edits.Select(edit => edit.NewText).Single();
 
-        var actual = sourceText.WithChanges(edits).ToString();
         AssertEx.EqualOrDiff(expected, actual);
     }