More PR Feedback

Author: marcarro

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Models/ExtractToComponentCodeActionParams.cs

@@ -23,12 +23,6 @@ internal sealed class ExtractToComponentCodeActionParams
     [JsonPropertyName("namespace")]
     public required string Namespace { get; set; }
 
-    [JsonPropertyName("dependencies")]
-    public required List<string> Dependencies { get; set; }
-
-    [JsonPropertyName("usedIdentifiers")]
-    public required HashSet<string> UsedIdentifiers { get; set; }
-
-    [JsonPropertyName("usedMembers")]
-    public required HashSet<string> UsedMembers { get; set; }
+    [JsonPropertyName("usingDirectives")]
+    public required List<string> usingDirectives { get; set; }
 }

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

@@ -78,7 +78,6 @@ public Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeAct
                                         actionParams.ExtractStart,
                                         actionParams.ExtractEnd,
                                         actionParams);
-        GetUsedIdentifiers(utilityScanRoot, syntaxTree.Root, actionParams);
 
         var resolutionParams = new RazorCodeActionResolutionParams()
         {
@@ -156,9 +155,7 @@ private static ExtractToComponentCodeActionParams CreateInitialActionParams(Razo
             ExtractStart = startElementNode.Span.Start,
             ExtractEnd = startElementNode.Span.End,
             Namespace = @namespace,
-            Dependencies = [],
-            UsedIdentifiers = [],
-            UsedMembers = [],
+            usingDirectives = []
         };
     }
 
@@ -303,36 +300,8 @@ private static void AddDependenciesFromTagHelperInfo(TagHelperInfo tagHelperInfo
             var typeNamespace = descriptor.GetTypeNamespace();
             if (components.Add(typeNamespace))
             {
-                actionParams.Dependencies.Add($"@using {typeNamespace}");
+                actionParams.usingDirectives.Add($"@using {typeNamespace}");
             }
         }
     }
-
-    private static void GetUsedIdentifiers(SyntaxNode divNode, SyntaxNode documentRoot, ExtractToComponentCodeActionParams actionParams)
-    {
-        HashSet<string> identifiersInScope = [];
-        HashSet<string> identifiersInBlock = [];
-
-        HashSet<SyntaxNode> nodesInScope = [];
-        HashSet<SyntaxNode> nodesInBlock = [];
-
-        foreach (var node in divNode.DescendantNodes().Where(static node => node.Kind is SyntaxKind.Identifier))
-        {
-            identifiersInScope.Add(node.GetContent());
-            nodesInScope.Add(node);
-        }
-
-        foreach (var codeBlock in documentRoot.DescendantNodes().Where(static node => node.Kind is SyntaxKind.RazorDirective))
-        {
-            foreach (var node in codeBlock.DescendantNodes().Where(static node => node.Kind is SyntaxKind.Identifier))
-            {
-                identifiersInBlock.Add(node.GetContent());
-                nodesInBlock.Add(node);
-            }
-        }
-
-        nodesInBlock.IntersectWith(nodesInScope);
-        identifiersInBlock.IntersectWith(identifiersInScope);
-        actionParams.UsedIdentifiers = identifiersInBlock;
-    }
 }

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

@@ -93,8 +93,8 @@ internal sealed class ExtractToComponentCodeActionResolver
         var componentName = Path.GetFileNameWithoutExtension(componentPath);
         var newComponentContent = string.Empty;
 
-        newComponentContent += string.Join(Environment.NewLine, actionParams.Dependencies);
-        if (actionParams.Dependencies.Count > 0)
+        newComponentContent += string.Join(Environment.NewLine, actionParams.usingDirectives);
+        if (actionParams.usingDirectives.Count > 0)
         {
             newComponentContent += Environment.NewLine + Environment.NewLine; // Ensure there's a newline after the dependencies if any exist.
         }