Preemptively added suggestions from previous PR feedback

Author: marcarro

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

@@ -39,6 +39,7 @@
 using ICSharpCode.Decompiler.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using System.Reflection.Metadata.Ecma335;
+using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
 
@@ -117,7 +118,7 @@ internal sealed class ExtractToComponentCodeActionResolver(
         }.Uri;
 
         var componentName = Path.GetFileNameWithoutExtension(componentPath);
-        var newComponentResult = await GenerateNewComponentAsync(selectionAnalysis, codeDocument, actionParams.Uri, newComponentUri, documentContext, removeRange, cancellationToken).ConfigureAwait(false);
+        var newComponentResult = await GenerateNewComponentAsync(selectionAnalysis, codeDocument, actionParams.Uri, documentContext, removeRange, cancellationToken).ConfigureAwait(false);
 
         if (newComponentResult is null)
         {
@@ -164,6 +165,7 @@ internal sealed class ExtractToComponentCodeActionResolver(
             DocumentChanges = documentChanges,
         };
     }
+
     private static ExtractToComponentCodeActionParams? DeserializeActionParams(JsonElement data)
     {
         return data.ValueKind == JsonValueKind.Undefined
@@ -445,13 +447,9 @@ private static HashSet<string> AddComponentDependenciesInRange(SyntaxNode root,
         // Only analyze nodes within the extract span
         foreach (var node in root.DescendantNodes().Where(node => extractSpan.Contains(node.Span)))
         {
-            if (node is MarkupTagHelperElementSyntax)
+            if (node is MarkupTagHelperElementSyntax { TagHelperInfo: { } tagHelperInfo })
             {
-                var tagHelperInfo = GetTagHelperInfo(node);
-                if (tagHelperInfo is not null)
-                {
-                    AddDependenciesFromTagHelperInfo(tagHelperInfo, ref dependencies);
-                }
+                AddDependenciesFromTagHelperInfo(tagHelperInfo, dependencies);
             }
         }
 
@@ -480,40 +478,24 @@ private static HashSet<string> AddVariableDependenciesInRange(SyntaxNode root, i
         return dependencies;
     }
 
-    private static TagHelperInfo? GetTagHelperInfo(SyntaxNode node)
-    {
-        if (node is MarkupTagHelperElementSyntax markupElement)
-        {
-            return markupElement.TagHelperInfo;
-        }
-
-        return null;
-    }
-
-    private static void AddDependenciesFromTagHelperInfo(TagHelperInfo tagHelperInfo, ref HashSet<string> dependencies)
+    private static void AddDependenciesFromTagHelperInfo(TagHelperInfo tagHelperInfo, HashSet<string> dependencies)
     {
         foreach (var descriptor in tagHelperInfo.BindingResult.Descriptors)
         {
-            if (descriptor is not null)
+            if (descriptor is null)
             {
-                foreach (var metadata in descriptor.Metadata)
-                {
-                    if (metadata.Key == TagHelperMetadata.Common.TypeNamespace &&
-                        metadata.Value is not null &&
-                        !dependencies.Contains($"@using {metadata.Value}"))
-                    {
-                        dependencies.Add($"@using {metadata.Value}");
-                    }
-                }
+                continue;
             }
+
+            var typeNamespace = descriptor.GetTypeNamespace();
+            dependencies.Add(typeNamespace);
         }
     }
 
     private async Task<NewRazorComponentInfo?> GenerateNewComponentAsync(
         SelectionAnalysisResult selectionAnalysis,
         RazorCodeDocument razorCodeDocument,
         Uri componentUri,
-        Uri newComponentUri,
         DocumentContext documentContext,
         Range relevantRange,
         CancellationToken cancellationToken)
@@ -524,31 +506,48 @@ metadata.Value is not null &&
             return null;
         }
 
-        var dependencies = selectionAnalysis.ComponentDependencies is not null
-        ? string.Join(Environment.NewLine, selectionAnalysis.ComponentDependencies)
-        : string.Empty;
+        var inst = PooledStringBuilder.GetInstance();
+        var newFileContentBuilder = inst.Builder;
+        if (selectionAnalysis.ComponentDependencies is not null)
+        {
+            foreach (var dependency in selectionAnalysis.ComponentDependencies)
+            {
+                newFileContentBuilder.AppendLine($"@using {dependency}");
+            }
 
-        var extractedContents = contents.GetSubTextString(new CodeAnalysis.Text.TextSpan(selectionAnalysis.ExtractStart, selectionAnalysis.ExtractEnd - selectionAnalysis.ExtractStart)).Trim();
-        var newFileContent = $"{dependencies}{(dependencies.Length > 0 ? Environment.NewLine + Environment.NewLine : "")}{extractedContents}";
+            if (newFileContentBuilder.Length > 0)
+            {
+                newFileContentBuilder.AppendLine();
+            }
+        }
+
+        var extractedContents = contents.GetSubTextString(
+                    new TextSpan(selectionAnalysis.ExtractStart,
+                    selectionAnalysis.ExtractEnd - selectionAnalysis.ExtractStart))
+                .Trim();
+
+        newFileContentBuilder.Append(extractedContents);
 
         // Get CSharpStatements within component
         var syntaxTree = razorCodeDocument.GetSyntaxTree();
         var cSharpCodeBlocks = GetCSharpCodeBlocks(syntaxTree, selectionAnalysis.ExtractStart, selectionAnalysis.ExtractEnd);
 
         var result = new NewRazorComponentInfo
         {
-            NewContents = newFileContent,
+            NewContents = newFileContentBuilder.ToString(),
             Methods = []
         };
 
         // Only make the Roslyn call if there is valid CSharp in the selected code.
         if (cSharpCodeBlocks.Count == 0)
         {
+            inst.Free();
             return result;
         }
 
         if (!_documentVersionCache.TryGetDocumentVersion(documentContext.Snapshot, out var version))
         {
+            inst.Free();
             return result;
         }
 
@@ -586,11 +585,6 @@ metadata.Value is not null &&
             {
                 Uri = componentUri
             },
-            NewDocument = new TextDocumentIdentifier
-            {
-                Uri = newComponentUri
-            },
-            NewContents = newFileContent,
             HostDocumentVersion = version.Value,
             IntersectingRangesInGeneratedMappings = intersectingGeneratedRanges
         };
@@ -610,18 +604,21 @@ metadata.Value is not null &&
 
         if (componentInfo is null)
         {
+            inst.Free();
             return result;
         }
 
         var codeBlockAtEnd = GetCodeBlockAtEnd(syntaxTree);
         if (codeBlockAtEnd is null)
         {
+            inst.Free();
             return result;
         }
 
         var identifiersInCodeBlock = GetIdentifiersInContext(codeBlockAtEnd, cSharpCodeBlocks);
         if (componentInfo.Methods is null)
         {
+            inst.Free();
             return result;
         }
 
@@ -635,12 +632,13 @@ metadata.Value is not null &&
 
         var newFileCodeBlock = GenerateNewFileCodeBlock(promotedMethods, forwardedFields);
 
-        newFileContent = ReplaceMethodInvocations(newFileContent, methodsInContext);
-        newFileContent += newFileCodeBlock;
+        ReplaceMethodInvocations(newFileContentBuilder, methodsInContext);
+        newFileContentBuilder.Append(newFileCodeBlock);
 
-        result.NewContents = newFileContent;
+        result.NewContents = newFileContentBuilder.ToString();
         result.Methods = methodsInContext;
 
+        inst.Free();
         return result;
     }
 
@@ -852,17 +850,15 @@ private static string GenerateNewFileCodeBlock(string promotedMethods, string ca
         return builder.ToString();
     }
 
-    // Method invocations in the new file must be replaced with their respective parameter name. This is simply a case of replacing each string.
-    private static string ReplaceMethodInvocations(string newFileContent, HashSet<MethodSymbolicInfo> methods)
+    // Method invocations in the new file must be replaced with their respective parameter name.
+    private static void ReplaceMethodInvocations(StringBuilder newFileContentBuilder, HashSet<MethodSymbolicInfo> methods)
     {
         var parameterCount = 0;
         foreach (var method in methods)
         {
-            newFileContent = newFileContent.Replace(method.Name, $"Parameter{(parameterCount > 0 ? parameterCount : "")}");
+            newFileContentBuilder.Replace(method.Name, $"Parameter{(parameterCount > 0 ? parameterCount : "")}");
             parameterCount++;
         }
-
-        return newFileContent;
     }
 
     private static string GenerateComponentNameAndParameters(HashSet<MethodSymbolicInfo>? methods, string componentName)

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/CodeActions/GetSymbolicInfoParams.cs

@@ -15,10 +15,6 @@ internal record GetSymbolicInfoParams
     [JsonPropertyName("document")]
     public required TextDocumentIdentifier Document { get; set; }
 
-    [DataMember(Name = "newDocument")]
-    [JsonPropertyName("newDocument")]
-    public required TextDocumentIdentifier NewDocument { get; set; }
-
     [DataMember(Name = "project")]
     [JsonPropertyName("project")]
     public required TextDocumentIdentifier Project { get; set; }
@@ -27,10 +23,6 @@ internal record GetSymbolicInfoParams
     [JsonPropertyName("hostDocumentVersion")]
     public required int HostDocumentVersion { get; set; }
 
-    [DataMember(Name = "newContents")]
-    [JsonPropertyName("newContents")]
-    public required string NewContents { get; set; }
-
     [DataMember(Name = "intersectingRangesInGeneratedMappings")]
     [JsonPropertyName("intersectingRangesInGeneratedMappings")]