Naming fixes and simplified promoted method string generation

Author: marcarro

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

@@ -40,13 +40,13 @@ public Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeAct
             return SpecializedTasks.EmptyImmutableArray<RazorVSInternalCodeAction>();
         }
 
-        var syntaxTree = context.CodeDocument.GetSyntaxTree();
-        if (!IsSelectionValid(context, syntaxTree))
+        if (!TryGetNamespace(context.CodeDocument, out var @namespace))
         {
             return SpecializedTasks.EmptyImmutableArray<RazorVSInternalCodeAction>();
         }
 
-        if (!TryGetNamespace(context.CodeDocument, out var @namespace))
+        var syntaxTree = context.CodeDocument.GetSyntaxTree();
+        if (!IsSelectionValid(context, syntaxTree))
         {
             return SpecializedTasks.EmptyImmutableArray<RazorVSInternalCodeAction>();
         }
@@ -93,6 +93,10 @@ private static bool IsSelectionValid(RazorCodeActionContext context, RazorSyntax
 
     private static bool IsInsideProperHtmlContent(RazorCodeActionContext context, SyntaxNode owner)
     {
+        // The selection could start either in a MarkupElement or MarkupTagHelperElement.
+        // Both of these have the necessary properties to do this check, but not the base MarkupSyntaxNode.
+        // The workaround for this is to try to cast to the specific types and then do the check.
+
         var tryMakeMarkupElement = owner.FirstAncestorOrSelf<MarkupElementSyntax>();
         var tryMakeMarkupTagHelperElement = owner.FirstAncestorOrSelf<MarkupTagHelperElementSyntax>();
 

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

@@ -178,7 +178,7 @@ internal sealed record SelectionAnalysisResult
         public required bool Success;
         public int ExtractStart;
         public int ExtractEnd;
-        public HashSet<string>? ComponentDependencies;
+        public HashSet<string>? UsingDirectives;
         public HashSet<string>? TentativeVariableDependencies;
     }
 
@@ -205,15 +205,15 @@ private static SelectionAnalysisResult TryAnalyzeSelection(RazorCodeDocument cod
         }
 
         var dependencyScanRoot = FindNearestCommonAncestor(startElementNode, endElementNode) ?? startElementNode;
-        var componentDependencies = AddComponentDependenciesInRange(dependencyScanRoot, extractStart, extractEnd);
+        var componentDependencies = AddUsingDirectivesInRange(dependencyScanRoot, extractStart, extractEnd);
         var variableDependencies = AddVariableDependenciesInRange(dependencyScanRoot, extractStart, extractEnd);
 
         return new SelectionAnalysisResult
         {
             Success = success,
             ExtractStart = extractStart,
             ExtractEnd = extractEnd,
-            ComponentDependencies = componentDependencies,
+            UsingDirectives = componentDependencies,
             TentativeVariableDependencies = variableDependencies,
         };
     }
@@ -439,21 +439,21 @@ private static bool IsValidNode(SyntaxNode node, bool isCodeBlock)
         return node is MarkupElementSyntax or MarkupTagHelperElementSyntax || (isCodeBlock && node is CSharpCodeBlockSyntax);
     }
 
-    private static HashSet<string> AddComponentDependenciesInRange(SyntaxNode root, int extractStart, int extractEnd)
+    private static HashSet<string> AddUsingDirectivesInRange(SyntaxNode root, int extractStart, int extractEnd)
     {
-        var dependencies = new HashSet<string>();
+        var usings = new HashSet<string>();
         var extractSpan = new TextSpan(extractStart, extractEnd - extractStart);
 
         // Only analyze nodes within the extract span
         foreach (var node in root.DescendantNodes().Where(node => extractSpan.Contains(node.Span)))
         {
             if (node is MarkupTagHelperElementSyntax { TagHelperInfo: { } tagHelperInfo })
             {
-                AddDependenciesFromTagHelperInfo(tagHelperInfo, dependencies);
+                AddUsingFromTagHelperInfo(tagHelperInfo, usings);
             }
         }
 
-        return dependencies;
+        return usings;
     }
 
     private static HashSet<string> AddVariableDependenciesInRange(SyntaxNode root, int extractStart, int extractEnd)
@@ -478,7 +478,7 @@ private static HashSet<string> AddVariableDependenciesInRange(SyntaxNode root, i
         return dependencies;
     }
 
-    private static void AddDependenciesFromTagHelperInfo(TagHelperInfo tagHelperInfo, HashSet<string> dependencies)
+    private static void AddUsingFromTagHelperInfo(TagHelperInfo tagHelperInfo, HashSet<string> dependencies)
     {
         foreach (var descriptor in tagHelperInfo.BindingResult.Descriptors)
         {
@@ -508,9 +508,9 @@ private static void AddDependenciesFromTagHelperInfo(TagHelperInfo tagHelperInfo
 
         var inst = PooledStringBuilder.GetInstance();
         var newFileContentBuilder = inst.Builder;
-        if (selectionAnalysis.ComponentDependencies is not null)
+        if (selectionAnalysis.UsingDirectives is not null)
         {
-            foreach (var dependency in selectionAnalysis.ComponentDependencies)
+            foreach (var dependency in selectionAnalysis.UsingDirectives)
             {
                 newFileContentBuilder.AppendLine($"@using {dependency}");
             }
@@ -750,40 +750,34 @@ private static string GeneratePromotedMethods(HashSet<MethodSymbolicInfo> method
             builder.AppendLine($"/// Delegate for the '{method.Name}' method.");
             builder.AppendLine("/// </summary>");
             builder.AppendLine("[Parameter]");
-            builder.Append("public ");
 
-            if (method.ReturnType == "void")
-            {
-                builder.Append("Action");
-            }
-            else
-            {
-                builder.Append("Func<");
-            }
+            // Start building delegate type
+            builder.Append("public ");
+            builder.Append(method.ReturnType == "void" ? "Action" : "Func");
 
-            if (method.ParameterTypes.Count() > 0)
+            // If delegate type is Action, only add generic parameters if needed. 
+            if (method.ParameterTypes.Length > 0 || method.ReturnType != "void")
             {
-                if (method.ReturnType == "void")
-                {
-                    builder.Append('<');
-                }
-
+                builder.Append("<");
                 builder.Append(string.Join(", ", method.ParameterTypes));
+
                 if (method.ReturnType != "void")
                 {
-                    builder.Append(", ");
+                    if (method.ParameterTypes.Length > 0)
+                    {
+                        // Add one last comma in the list of generic parameters for the result: "<..., TResult>"
+                        builder.Append(", ");
+                    }
+                    builder.Append(method.ReturnType);
                 }
-            }
 
-            if (method.ReturnType != "void")
-            {
-                builder.Append(method.ReturnType);
+                builder.Append('>');
             }
 
-            builder.Append($"{(method.ReturnType == "void" ? (method.ParameterTypes.Count() > 0 ? ">" : "") : ">")}? " +
-                           $"Parameter{(parameterCount > 0 ? parameterCount : "")} {{ get; set; }}");
+            builder.Append($"Parameter{(parameterCount > 0 ? parameterCount : "")} {{ get; set; }}");
             if (parameterCount < totalMethods - 1)
             {
+                // Space between methods except for the last method.
                 builder.AppendLine();
                 builder.AppendLine();
             }

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

@@ -1315,6 +1315,7 @@ private async Task ValidateExtractComponentCodeActionAsync(
         string? expected,
         string codeAction,
         int childActionIndex = 0,
+        IEnumerable<(string filePath, string contents)>? additionalRazorFiles = null,
         IRazorCodeActionProvider[]? razorCodeActionProviders = null,
         Func<string, RazorCodeDocument, IRazorFormattingService, IClientConnection, RazorLSPOptionsMonitor?, IRazorCodeActionResolver[]>? codeActionResolversCreator = null,
         RazorLSPOptionsMonitor? optionsMonitor = null,
@@ -1327,7 +1328,7 @@ private async Task ValidateExtractComponentCodeActionAsync(
         var codeDocument = CreateCodeDocument(input, filePath: razorFilePath);
         var sourceText = codeDocument.GetSourceText();
         var uri = new Uri(razorFilePath);
-        var languageServer = await CreateLanguageServerAsync(codeDocument, razorFilePath);
+        var languageServer = await CreateLanguageServerAsync(codeDocument, razorFilePath, additionalRazorFiles);
         var documentContext = CreateDocumentContext(uri, codeDocument);
         var requestContext = new RazorRequestContext(documentContext, null!, "lsp/method", uri: null);