Make completionItem/resolve cancellable

Author: andyleejordan

src/PowerShellEditorServices/Services/PowerShell/Utility/CommandHelpers.cs

@@ -64,7 +64,8 @@ internal static class CommandHelpers
         public static async Task<CommandInfo> GetCommandInfoAsync(
             string commandName,
             IRunspaceInfo currentRunspace,
-            IInternalPowerShellExecutionService executionService)
+            IInternalPowerShellExecutionService executionService,
+            CancellationToken cancellationToken = default)
         {
             // This mechanism only works in-process
             if (currentRunspace.RunspaceOrigin != RunspaceOrigin.Local)
@@ -98,7 +99,7 @@ public static async Task<CommandInfo> GetCommandInfoAsync(
                 .AddParameter("ErrorAction", "Ignore");
 
             IReadOnlyList<CommandInfo> results = await executionService
-                .ExecutePSCommandAsync<CommandInfo>(command, CancellationToken.None)
+                .ExecutePSCommandAsync<CommandInfo>(command, cancellationToken)
                 .ConfigureAwait(false);
 
             CommandInfo commandInfo = results.Count > 0 ? results[0] : null;
@@ -120,7 +121,8 @@ public static async Task<CommandInfo> GetCommandInfoAsync(
         /// <returns>The synopsis.</returns>
         public static async Task<string> GetCommandSynopsisAsync(
             CommandInfo commandInfo,
-            IInternalPowerShellExecutionService executionService)
+            IInternalPowerShellExecutionService executionService,
+            CancellationToken cancellationToken = default)
         {
             Validate.IsNotNull(nameof(commandInfo), commandInfo);
             Validate.IsNotNull(nameof(executionService), executionService);
@@ -151,7 +153,7 @@ public static async Task<string> GetCommandSynopsisAsync(
                 .AddParameter("ErrorAction", "Ignore");
 
             IReadOnlyList<PSObject> results = await executionService
-                .ExecutePSCommandAsync<PSObject>(command, CancellationToken.None)
+                .ExecutePSCommandAsync<PSObject>(command, cancellationToken)
                 .ConfigureAwait(false);
 
             // Extract the synopsis string from the object

src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs

@@ -80,30 +80,32 @@ public static bool CanResolve(CompletionItem value)
         // Handler for "completionItem/resolve". In VSCode this is fired when a completion item is highlighted in the completion list.
         public async Task<CompletionItem> Handle(CompletionItem request, CancellationToken cancellationToken)
         {
-            // We currently only support this request for anything that returns a CommandInfo: functions, cmdlets, aliases.
-            if (request.Kind != CompletionItemKind.Function)
-            {
-                return request;
-            }
-
-            // No details means the module hasn't been imported yet and Intellisense shouldn't import the module to get this info.
-            if (request.Detail is null)
+            // We currently only support this request for anything that returns a CommandInfo:
+            // functions, cmdlets, aliases. No detail means the module hasn't been imported yet and
+            // IntelliSense shouldn't import the module to get this info.
+            if (request.Kind is not CompletionItemKind.Function || request.Detail is null)
             {
                 return request;
             }
 
             // Get the documentation for the function
-            CommandInfo commandInfo = await CommandHelpers.GetCommandInfoAsync(request.Label, _runspaceContext.CurrentRunspace, _executionService).ConfigureAwait(false);
+            CommandInfo commandInfo = await CommandHelpers.GetCommandInfoAsync(
+                request.Label,
+                _runspaceContext.CurrentRunspace,
+                _executionService,
+                cancellationToken).ConfigureAwait(false);
 
             if (commandInfo is not null)
             {
-                request = request with
+                return request with
                 {
-                    Documentation = await CommandHelpers.GetCommandSynopsisAsync(commandInfo, _executionService).ConfigureAwait(false)
+                    Documentation = await CommandHelpers.GetCommandSynopsisAsync(
+                        commandInfo,
+                        _executionService,
+                        cancellationToken).ConfigureAwait(false)
                 };
             }
 
-            // Send back the updated CompletionItem
             return request;
         }