Skip to content

Remove obsolete attribute and fix test #8365

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

Merged
davidwengier merged 2 commits into from
Mar 6, 2023
Merged

Remove obsolete attribute and fix test #8365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed5d166
Remove obsolete attribute and fix test
davidwengier Mar 1, 2023
ad5720a
Merge branch 'main' into RemoveObsolete
davidwengier Mar 5, 2023
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
4 changes: 1 addition & 3 deletions src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractRazorEditorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ public override async Task InitializeAsync()
await TestServices.Editor.PlaceCaretAsync("</PageTitle>", charsOffset: 1, ControlledHangMitigatingCancellationToken);
await TestServices.Editor.WaitForComponentClassificationAsync(ControlledHangMitigatingCancellationToken, count: 3);

#pragma warning disable CS0618
// Close the file we opened, just in case, so the test can start with a clean slate
await TestServices.Editor.CloseDocumentWindowAsync(ControlledHangMitigatingCancellationToken);
#pragma warning restore CS0618
await TestServices.Editor.CloseCodeFileAsync(RazorProjectConstants.BlazorProjectName, RazorProjectConstants.IndexRazorFile, saveFile: false, ControlledHangMitigatingCancellationToken);
}

private static void EnsureLSPEditorEnabled()
Expand Down
3 changes: 1 addition & 2 deletions .../test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Commands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ public async Task CloseCodeFileAsync(string projectName, string relativeFilePath
await CloseFileAsync(projectName, relativeFilePath, VSConstants.LOGVIEWID.Code_guid, saveFile, cancellationToken);
}

[Obsolete($"This method will close ANY window currently in focus, including things like 'Output'. You probably want {nameof(CloseCodeFileAsync)}.")]
public async Task CloseDocumentWindowAsync(CancellationToken cancellationToken)
public async Task CloseCurrentlyFocusedWindowAsync(CancellationToken cancellationToken)
{
await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);

Expand Down