Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable CSharpGoToBase.GoToBaseFromMetadataAsSource #60458

Merged
merged 3 commits into from
Mar 30, 2022
Merged

Enable CSharpGoToBase.GoToBaseFromMetadataAsSource #60458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37f946e
Enable CSharpGoToBase.GoToBaseFromMetadataAsSource
sharwell Mar 29, 2022
71449b6
Update light bulb workaround version
sharwell Mar 29, 2022
462d5ee
Handle CompletedWithoutData state for light bulb
sharwell Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...lStudio/IntegrationTest/IntegrationTests/CSharp/CSharpRenameFileToMatchTypeRefactoring.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpCodeActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class Program
await TestServices.EditorVerifier.CodeActionAsync("using System;", cancellationToken: HangMitigatingCancellationToken);
}

[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60460"), Trait(Traits.Feature, Traits.Features.CodeActionsAddImport)]
[IdeFact, Trait(Traits.Feature, Traits.Features.CodeActionsAddImport)]
public async Task FastDoubleInvoke()
{
// We want to invoke the first smart tag and then *immediately* try invoking the next.
Expand Down Expand Up @@ -462,7 +462,7 @@ await TestServices.EditorVerifier.CodeActionAsync(
AssertEx.EqualOrDiff(expectedSecondFile, await TestServices.Editor.GetTextAsync(HangMitigatingCancellationToken));
}

[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60461"), Trait(Traits.Feature, Traits.Features.CodeActionsGenerateMethod)]
[IdeFact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateMethod)]
public async Task ClassificationInPreviewPane()
{
await SetUpEditorAsync(@"
Expand Down Expand Up @@ -538,7 +538,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
await TestServices.EditorVerifier.TextContainsAsync("using System.IO;", cancellationToken: HangMitigatingCancellationToken);
}

[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60461"), Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
[IdeFact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
public async Task GFUFuzzyMatchAfterRenameTrackingAndAfterGenerateType()
{
await SetUpEditorAsync(@"
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public CSharpGoToBase()
{
}

[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60386")]
[IdeFact]
public async Task GoToBaseFromMetadataAsSource()
{
await TestServices.SolutionExplorer.AddFileAsync(ProjectName, "C.cs", cancellationToken: HangMitigatingCancellationToken);
Expand Down
2 changes: 1 addition & 1 deletion ...ualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpdateProjectToAllowUnsafe.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public async Task CPSProject_GeneralPropertyGroupUpdated()
VerifyPropertyOutsideConfiguration(await GetProjectFileElementAsync(project, HangMitigatingCancellationToken), "AllowUnsafeBlocks", "true");
}

[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60461")]
[IdeFact]
public async Task LegacyProject_AllConfigurationsUpdated()
{
var project = ProjectName;
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpgradeProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -88,7 +90,7 @@ public static async Task<IEnumerable<SuggestedActionSet>> WaitForItemsAsync(Test
catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
{
var version = await testServices.Shell.GetVersionAsync(cancellationToken);
if (Version.Parse("17.2.32210.308") >= version)
if (Version.Parse("17.2.32314.265") >= version)
{
// Unexpected cancellation can occur when the editor dismisses the light bulb without request
return null;
Expand Down
2 changes: 2 additions & 0 deletions src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"));

Expand Down