Updated Semantic Handler to work with new LSP (#1343)

* change to v0.17.3

* fixed E2E tests

* changed from hard code length

* bumped version to 0.17.4

* Update src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs

Co-authored-by: Tyler James Leonhardt <[email protected]>

Co-authored-by: Justin Chen <[email protected]>
Co-authored-by: Tyler James Leonhardt <[email protected]>

Author: 3 people

src/PowerShellEditorServices/PowerShellEditorServices.csproj

@@ -39,7 +39,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.6" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.17.2" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.17.4" />
     <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.17.2" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
     <PackageReference Include="Serilog" Version="2.9.0" />

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

@@ -12,7 +12,7 @@
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using OmniSharp.Extensions.LanguageServer.Server;
+using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {

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

@@ -12,26 +12,24 @@
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Utility;
-using OmniSharp.Extensions.LanguageServer.Protocol;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Document.Proposals;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models.Proposals;
 
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {
-    internal class PsesSemanticTokensHandler : SemanticTokensHandler
+    internal class PsesSemanticTokensHandler : SemanticTokensHandlerBase
     {
         private static readonly SemanticTokensRegistrationOptions s_registrationOptions = new SemanticTokensRegistrationOptions
         {
             DocumentSelector = LspUtils.PowerShellDocumentSelector,
             Legend = new SemanticTokensLegend(),
-            DocumentProvider = new Supports<SemanticTokensDocumentProviderOptions>(
-                isSupported: true,
-                new SemanticTokensDocumentProviderOptions
-                {
-                    Edits = true
-                }),
-            RangeProvider = true
+            Full = new SemanticTokensCapabilityRequestFull
+            {
+                Delta = true
+            },
+            Range = true
         };
 
         private readonly ILogger _logger;

test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs

@@ -1147,7 +1147,7 @@ public async Task CanSendSemanticTokenRequest()
             SemanticTokens result =
                 await PsesLanguageClient
                     .SendRequest<SemanticTokensParams>(
-                        "textDocument/semanticTokens",
+                        "textDocument/semanticTokens/full",
                         new SemanticTokensParams
                         {
                             TextDocument = new TextDocumentIdentifier
@@ -1162,7 +1162,7 @@ await PsesLanguageClient
             var expectedArr = new int[5]
                 {
                     // line, index, token length, token type, token modifiers
-                    0, 0, scriptContent.Length, 2, 0 //function token: line 0, index 0, length, type 2 = keyword, no modifiers
+                    0, 0, scriptContent.Length, 1, 0 //function token: line 0, index 0, length of script, type 1 = keyword, no modifiers
                 };
 
             Assert.Equal(expectedArr, result.Data.ToArray());

test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

@@ -28,7 +28,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1-pre.build.4059" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.17.2" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.17.4" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />
   </ItemGroup>
   <ItemGroup>