Handle CompletedWithoutData state for light bulb

Closes dotnet#60463
sharwell · Mar 29, 2022 · 462d5ee · 462d5ee
1 parent 71449b6
commit 462d5ee
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/...lStudio/IntegrationTest/IntegrationTests/CSharp/CSharpRenameFileToMatchTypeRefactoring.cs b/...lStudio/IntegrationTest/IntegrationTests/CSharp/CSharpRenameFileToMatchTypeRefactoring.cs
@@ -24,7 +24,7 @@ public CSharpRenameFileToMatchTypeRefactoring(VisualStudioInstanceFactory instan
         {
         }
 
-        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/60463"), Trait(Traits.Feature, Traits.Features.CodeActionsMoveType)]
+        [WpfFact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveType)]
         public void RenameFileToMatchType_ExistingCode()
         {
             var project = new ProjectUtils.Project(ProjectName);

diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpgradeProject.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpgradeProject.cs
@@ -47,7 +47,7 @@ public async Task CPSProject_GeneralPropertyGroupUpdated()
             VerifyPropertyOutsideConfiguration(await GetProjectFileElementAsync(project, HangMitigatingCancellationToken), "LangVersion", "latest");
         }
 
-        [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60463")]
+        [IdeFact]
         public async Task LegacyProject_AllConfigurationsUpdated()
         {
             var project = ProjectName;

diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs
@@ -61,6 +61,8 @@ public static async Task<IEnumerable<SuggestedActionSet>> WaitForItemsAsync(Test
 
                 if (e.Status == QuerySuggestedActionCompletionStatus.Completed)
                     tcs.SetResult(e.ActionSets.ToList());
+                else if (e.Status == QuerySuggestedActionCompletionStatus.CompletedWithoutData)
+                    tcs.SetResult(new List<SuggestedActionSet>());
                 else if (e.Status == QuerySuggestedActionCompletionStatus.Canceled)
                     tcs.TrySetCanceled();
                 else

diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs b/src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs
@@ -65,6 +65,8 @@ public static async Task<IEnumerable<SuggestedActionSet>> WaitForItemsAsync(ILig
 
                 if (e.Status == QuerySuggestedActionCompletionStatus.Completed)
                     tcs.SetResult(e.ActionSets.ToList());
+                else if (e.Status == QuerySuggestedActionCompletionStatus.CompletedWithoutData)
+                    tcs.SetResult(new List<SuggestedActionSet>());
                 else
                     tcs.SetException(new InvalidOperationException($"Light bulb transitioned to non-complete state: {e.Status}"));