From d066c7b4a3fd6bcdb629c555e4f28646f22aab65 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 14 May 2019 16:20:15 -0500 Subject: [PATCH] Update cancellation token when AllowCancellation changes --- .../EncapsulateField/AbstractEncapsulateFieldCommandHandler.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/EditorFeatures/Core/Implementation/EncapsulateField/AbstractEncapsulateFieldCommandHandler.cs b/src/EditorFeatures/Core/Implementation/EncapsulateField/AbstractEncapsulateFieldCommandHandler.cs index 44cca64c295..ae6f86aa732 100644 --- a/src/EditorFeatures/Core/Implementation/EncapsulateField/AbstractEncapsulateFieldCommandHandler.cs +++ b/src/EditorFeatures/Core/Implementation/EncapsulateField/AbstractEncapsulateFieldCommandHandler.cs @@ -80,6 +80,7 @@ private bool Execute(EncapsulateFieldCommandArgs args, IUIThreadOperationScope w } waitScope.AllowCancellation = false; + cancellationToken = waitScope.Context.UserCancellationToken; var finalSolution = result.GetSolutionAsync(cancellationToken).WaitAndGetResult(cancellationToken); -- GitLab