Fix cancellation for completions and add Hover cancellation

src/PowerShellEditorServices/PowerShellEditorServices.csproj

@@ -39,7 +39,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.16.0-*" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.16.0" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
     <PackageReference Include="Serilog" Version="2.9.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
@@ -49,7 +49,7 @@
     <PackageReference Include="System.Security.Principal" Version="4.3.0" />
     <PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
     <PackageReference Include="UnixConsoleEcho" Version="0.1.0" />
-    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.16.0-*" />
+    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.16.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -62,6 +62,7 @@ public async Task<CommandOrCodeActionContainer> Handle(CodeActionParams request,
         {
             if (cancellationToken.IsCancellationRequested)
             {
+                _logger.LogDebug("CodeAction request canceled at range: {0}", request.Range);
                 return Array.Empty<CommandOrCodeAction>();
             }
 

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

@@ -25,6 +25,7 @@ internal class CompletionHandler : ICompletionHandler, ICompletionResolveHandler
     {
         const int DefaultWaitTimeoutMilliseconds = 5000;
         private readonly SemaphoreSlim _completionLock = AsyncUtils.CreateSimpleLockingSemaphore();
+        private readonly SemaphoreSlim _completionResolveLock = AsyncUtils.CreateSimpleLockingSemaphore();
 
         private readonly ILogger _logger;
         private readonly PowerShellContextService _powerShellContextService;
@@ -67,7 +68,15 @@ public async Task<CompletionList> Handle(CompletionParams request, CancellationT
 
             ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
 
-            await _completionLock.WaitAsync().ConfigureAwait(false);
+            try
+            {
+                await _completionLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                _logger.LogDebug("Completion request canceled for file: {0}", request.TextDocument.Uri);
+                return Array.Empty<CompletionItem>();
+            }
 
             try
             {
@@ -116,22 +125,39 @@ public async Task<CompletionItem> Handle(CompletionItem request, CancellationTok
                 return request;
             }
 
-            // Get the documentation for the function
-            CommandInfo commandInfo =
-                await CommandHelpers.GetCommandInfoAsync(
-                    request.Label,
-                    _powerShellContextService).ConfigureAwait(false);
+            try
+            {
+                await _completionResolveLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                _logger.LogDebug("CompletionItemResolve request canceled for item: {0}", request.Label);
+                return request;
+            }
 
-            if (commandInfo != null)
+            try
             {
-                request.Documentation =
-                    await CommandHelpers.GetCommandSynopsisAsync(
-                        commandInfo,
+                // Get the documentation for the function
+                CommandInfo commandInfo =
+                    await CommandHelpers.GetCommandInfoAsync(
+                        request.Label,
                         _powerShellContextService).ConfigureAwait(false);
-            }
 
-            // Send back the updated CompletionItem
-            return request;
+                if (commandInfo != null)
+                {
+                    request.Documentation =
+                        await CommandHelpers.GetCommandSynopsisAsync(
+                            commandInfo,
+                            _powerShellContextService).ConfigureAwait(false);
+                }
+
+                // Send back the updated CompletionItem
+                return request;
+            }
+            finally
+            {
+                _completionResolveLock.Release();
+            }
         }
 
         public void SetCapability(CompletionCapability capability)

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

@@ -43,6 +43,7 @@ public Task<Container<FoldingRange>> Handle(FoldingRangeRequestParam request, Ca
         {
             if (cancellationToken.IsCancellationRequested)
             {
+                _logger.LogDebug("FoldingRange request canceled for file: {0}", request.TextDocument.Uri);
                 return Task.FromResult(new Container<FoldingRange>());
             }
 

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

@@ -48,6 +48,12 @@ public HoverRegistrationOptions GetRegistrationOptions()
 
         public async Task<Hover> Handle(HoverParams request, CancellationToken cancellationToken)
         {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                _logger.LogDebug("Hover request canceled for file: {0}", request.TextDocument.Uri);
+                return new Hover();
+            }
+
             ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
 
             SymbolDetails symbolDetails =
@@ -56,21 +62,21 @@ await _symbolsService.FindSymbolDetailsAtLocationAsync(
                         (int) request.Position.Line + 1,
                         (int) request.Position.Character + 1).ConfigureAwait(false);
 
-            List<MarkedString> symbolInfo = new List<MarkedString>();
-            Range symbolRange = null;
-
-            if (symbolDetails != null)
+            if (symbolDetails == null)
             {
-                symbolInfo.Add(new MarkedString("PowerShell", symbolDetails.DisplayString));
+                return new Hover();
+            }
 
-                if (!string.IsNullOrEmpty(symbolDetails.Documentation))
-                {
-                    symbolInfo.Add(new MarkedString("markdown", symbolDetails.Documentation));
-                }
+            List<MarkedString> symbolInfo = new List<MarkedString>();
+            symbolInfo.Add(new MarkedString("PowerShell", symbolDetails.DisplayString));
 
-                symbolRange = GetRangeFromScriptRegion(symbolDetails.SymbolReference.ScriptRegion);
+            if (!string.IsNullOrEmpty(symbolDetails.Documentation))
+            {
+                symbolInfo.Add(new MarkedString("markdown", symbolDetails.Documentation));
             }
 
+            Range symbolRange = GetRangeFromScriptRegion(symbolDetails.SymbolReference.ScriptRegion);
+
             return new Hover
             {
                 Contents = new MarkedStringsOrMarkupContent(symbolInfo),

test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj

@@ -10,7 +10,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.16.0-*" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.16.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>