Skip to content

Don't cancel on disposal of CancellationScope #1776

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
merged 1 commit into from
Apr 27, 2022
Merged

Don't cancel on disposal of CancellationScope #1776

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/PowerShellEditorServices/Services/PowerShell/Utility/CancellationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation.
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System;
Expand Down Expand Up @@ -109,8 +109,10 @@ internal CancellationScope(

public void Dispose()
{
// TODO: This is whack. It used to call `Cancel` on the cancellation source, but we
// shouldn't do that!
_cancellationSource.Dispose();
_cancellationStack.TryPop(out CancellationScope _);
_cancellationSource.Cancel();
}
}
}