Merge pull request #57171 from CyrusNajmabadi/addUsingPriority17.0-b

Ensure low-pri fixes go in the right async lightbulb bucket.

Author: CyrusNajmabadi

src/EditorFeatures/Core.Wpf/Suggestions/AsyncSuggestedActionsSource.cs

@@ -97,6 +97,8 @@ private async Task GetSuggestedActionsWorkerAsync(
                     // items should be pushed higher up, and less important items shouldn't take up that much space.
                     var currentActionCount = 0;
 
+                    using var _ = ArrayBuilder<SuggestedActionSet>.GetInstance(out var lowPrioritySets);
+
                     // Collectors are in priority order.  So just walk them from highest to lowest.
                     foreach (var collector in collectors)
                     {
@@ -122,8 +124,27 @@ private async Task GetSuggestedActionsWorkerAsync(
 
                             await foreach (var set in allSets)
                             {
-                                currentActionCount += set.Actions.Count();
-                                collector.Add(set);
+                                if (priority == CodeActionRequestPriority.High && set.Priority == SuggestedActionSetPriority.Low)
+                                {
+                                    // if we're processing the high pri bucket, but we get action sets for lower pri
+                                    // groups, then keep track of them and add them in later when we get to that group.
+                                    lowPrioritySets.Add(set);
+                                }
+                                else
+                                {
+                                    currentActionCount += set.Actions.Count();
+                                    collector.Add(set);
+                                }
+                            }
+
+                            if (priority == CodeActionRequestPriority.Normal)
+                            {
+                                // now, add any low pri items we've been waiting on to the final group.
+                                foreach (var set in lowPrioritySets)
+                                {
+                                    currentActionCount += set.Actions.Count();
+                                    collector.Add(set);
+                                }
                             }
                         }
 

src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpCodeActions.cs

@@ -4,8 +4,6 @@
 
 #nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
@@ -19,7 +17,6 @@
 using Microsoft.VisualStudio.IntegrationTest.Utilities.Input;
 using Roslyn.Test.Utilities;
 using Xunit;
-using Xunit.Abstractions;
 using ProjectUtils = Microsoft.VisualStudio.IntegrationTest.Utilities.Common.ProjectUtils;
 
 namespace Roslyn.VisualStudio.IntegrationTests.CSharp
@@ -486,7 +483,7 @@ public class P2 { }");
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
-        public void GFUFuzzyMatchAfterRenameTracking()
+        public void GFUFuzzyMatchAfterRenameTrackingAndAfterGenerateType()
         {
             SetUpEditor(@"
 namespace N
@@ -511,12 +508,12 @@ static void Main(string[] args)
             var expectedItems = new[]
             {
                 "Rename 'P2' to 'Foober'",
-                "Goober - using N;",
                 "Generate type 'Foober'",
                 "Generate class 'Foober' in new file",
                 "Generate class 'Foober'",
                 "Generate nested class 'Foober'",
                 "Generate new type...",
+                "Goober - using N;",
                 "Suppress or Configure issues",
                 "Suppress CS0168",
                 "in Source",