Add cancellation token support

PowerShell · Oct 13, 2021 · 1eab605 · 1eab605
1 parent 4617938
commit 1eab605
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/PSReadLine/ReadLine.cs b/PSReadLine/ReadLine.cs
@@ -44,7 +44,9 @@ public partial class PSConsoleReadLine : IPSConsoleReadLineMockableMethods
 
         private static readonly CancellationToken _defaultCancellationToken = new CancellationTokenSource().Token;
 
-        private static Action _handleIdleOverride;
+        // This exists for PowerShell Editor Services (the backend of the PowerShell VSCode extension)
+        // so that it can call PSReadLine from a delegate and not hit nested pipeline issues
+        private static Action<CancellationToken> _handleIdleOverride;
 
         private bool _delayedOneTimeInitCompleted;
 
@@ -203,9 +205,9 @@ internal static PSKeyInfo ReadKey()
                     if (handleId != WaitHandle.WaitTimeout && handleId != EventProcessingRequested)
                         break;
 
-                    if (_handleIdleOverride != null)
+                    if (_handleIdleOverride is not null)
                     {
-                        _handleIdleOverride();
+                        _handleIdleOverride(_singleton._cancelReadCancellationToken);
                         continue;
                     }