PR Feedback

Author: marcarro

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

@@ -135,12 +135,12 @@ private static bool IsInsideProperHtmlContent(RazorCodeActionContext context, Ma
         }
 
         // Correct selection to include the current node if the selection ends immediately after a closing tag.
-        if (string.IsNullOrWhiteSpace(endOwner.ToFullString()) && endOwner.TryGetPreviousSibling(out var previousSibling))
+        if (endOwner is MarkupTextLiteralSyntax && string.IsNullOrWhiteSpace(endOwner.ToFullString()) && endOwner.TryGetPreviousSibling(out var previousSibling))
         {
             endOwner = previousSibling;
         }
 
-        return endOwner?.FirstAncestorOrSelf<MarkupElementSyntax>();
+        return endOwner.FirstAncestorOrSelf<MarkupElementSyntax>();
     }
 
     private static ExtractToNewComponentCodeActionParams CreateInitialActionParams(RazorCodeActionContext context, MarkupElementSyntax startElementNode, string @namespace)
@@ -168,11 +168,13 @@ private static void ProcessMultiPointSelection(MarkupElementSyntax startElementN
             return;
         }
 
-        // Check if the start element is an ancestor of the end element
-        var selectionStartHasParentElement = endElementNode.Ancestors().Any(node => node == startElementNode);
+        var startNodeContainsEndNode = endElementNode.Ancestors().Any(node => node == startElementNode);
 
         // If the start element is an ancestor, keep the original end; otherwise, use the end of the end element
-        actionParams.ExtractEnd = selectionStartHasParentElement ? actionParams.ExtractEnd : endElementNode.Span.End;
+        if (!startNodeContainsEndNode)
+        {
+            actionParams.ExtractEnd = endElementNode.Span.End;
+        }
 
         // If the start element is not an ancestor of the end element, we need to find a common parent
         // This conditional handles cases where the user's selection spans across different levels of the DOM.
@@ -187,7 +189,7 @@ private static void ProcessMultiPointSelection(MarkupElementSyntax startElementN
         //     Selected text ends here <span></span>
         //   </div>
         // In this case, we need to find the smallest set of complete elements that covers the entire selection.
-        if (!selectionStartHasParentElement)
+        if (!startNodeContainsEndNode)
         {
             // Find the closest containing sibling pair that encompasses both the start and end elements
             var (extractStart, extractEnd) = FindContainingSiblingPair(startElementNode, endElementNode);

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToNewComponentCodeActionProviderTest.cs

@@ -173,7 +173,7 @@ public async Task Handle_MultiPointSelection_ReturnsNotEmpty()
     }
 
     [Fact]
-    public async Task Handle_MultiPointSelectionWithEndAfterElement_ReturnsCurrentElement()
+    public async Task Handle_MultiPointSelection_WithEndAfterElement_ReturnsCurrentElement()
     {
         // Arrange
         var documentPath = "c:/Test.razor";