From 538475eb80b05e6706f9622993ffe40019616419 Mon Sep 17 00:00:00 2001 From: Justin Chen Date: Tue, 4 Aug 2020 10:41:44 -0700 Subject: [PATCH 1/5] change to v0.17.3 --- .../PowerShellEditorServices.csproj | 2 +- .../Handlers/GetVersionHandler.cs | 2 +- .../TextDocument/Handlers/FoldingRangeHandler.cs | 2 +- .../Handlers/PsesSemanticTokensHandler.cs | 15 ++++++--------- .../PowerShellEditorServices.Test.csproj | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/PowerShellEditorServices/PowerShellEditorServices.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj index 5d180bf26..e8eab39d5 100644 --- a/src/PowerShellEditorServices/PowerShellEditorServices.csproj +++ b/src/PowerShellEditorServices/PowerShellEditorServices.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs index b61e32798..452a7c95c 100644 --- a/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs +++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs @@ -91,7 +91,7 @@ private async Task CheckPackageManagement() if (_powerShellContextService.CurrentRunspace.Runspace.SessionStateProxy.LanguageMode != PSLanguageMode.FullLanguage) { - _languageServer.Window.ShowWarning("You have an older version of PackageManagement known to cause issues with the PowerShell extension. Please run the following command in a new Windows PowerShell session and then restart the PowerShell extension: `Install-Module PackageManagement -Force -AllowClobber -MinimumVersion 1.4.6`"); + _languageServer.Window.LogWarning("You have an older version of PackageManagement known to cause issues with the PowerShell extension. Please run the following command in a new Windows PowerShell session and then restart the PowerShell extension: `Install-Module PackageManagement -Force -AllowClobber -MinimumVersion 1.4.6`"); return; } diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/FoldingRangeHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/FoldingRangeHandler.cs index 1a9da9eae..6ec951691 100644 --- a/src/PowerShellEditorServices/Services/TextDocument/Handlers/FoldingRangeHandler.cs +++ b/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 { diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs index 4d2d2870b..50e01b663 100644 --- a/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs +++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs @@ -12,26 +12,23 @@ 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( - isSupported: true, - new SemanticTokensDocumentProviderOptions - { - Edits = true - }), - RangeProvider = true + Full = new SemanticTokensCapabilityRequestFull() { + Delta = true + }, + Range = true }; private readonly ILogger _logger; diff --git a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj index a344b349e..01648070f 100644 --- a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj +++ b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj @@ -28,7 +28,7 @@ - + From 5163d2cf2a232256eec5b95af5b8f36465694e3d Mon Sep 17 00:00:00 2001 From: Justin Chen Date: Tue, 4 Aug 2020 11:50:39 -0700 Subject: [PATCH 2/5] fixed E2E tests --- .../LanguageServerProtocolMessageTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs index a6047542f..4e2cfb0bc 100644 --- a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs +++ b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs @@ -1147,7 +1147,7 @@ public async Task CanSendSemanticTokenRequest() SemanticTokens result = await PsesLanguageClient .SendRequest( - "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, 8, 1, 0 //function token: line 0, index 0, length 8, type 1 = keyword, no modifiers }; Assert.Equal(expectedArr, result.Data.ToArray()); From 47a19c1f2baee4b37020c1c65b9098d4963190a7 Mon Sep 17 00:00:00 2001 From: Justin Chen Date: Tue, 4 Aug 2020 12:30:00 -0700 Subject: [PATCH 3/5] changed from hard code length --- .../LanguageServerProtocolMessageTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs index 4e2cfb0bc..5a15aac66 100644 --- a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs +++ b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs @@ -1162,7 +1162,7 @@ await PsesLanguageClient var expectedArr = new int[5] { // line, index, token length, token type, token modifiers - 0, 0, 8, 1, 0 //function token: line 0, index 0, length 8, type 1 = 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()); From 6c5ad6e6a0214345ebb733ee4a5f0593be8ffd74 Mon Sep 17 00:00:00 2001 From: Justin Chen Date: Wed, 5 Aug 2020 11:55:57 -0700 Subject: [PATCH 4/5] bumped version to 0.17.4 --- src/PowerShellEditorServices/PowerShellEditorServices.csproj | 2 +- .../Services/PowerShellContext/Handlers/GetVersionHandler.cs | 2 +- .../PowerShellEditorServices.Test.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PowerShellEditorServices/PowerShellEditorServices.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj index e8eab39d5..3a98eb3e0 100644 --- a/src/PowerShellEditorServices/PowerShellEditorServices.csproj +++ b/src/PowerShellEditorServices/PowerShellEditorServices.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs index 452a7c95c..b61e32798 100644 --- a/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs +++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs @@ -91,7 +91,7 @@ private async Task CheckPackageManagement() if (_powerShellContextService.CurrentRunspace.Runspace.SessionStateProxy.LanguageMode != PSLanguageMode.FullLanguage) { - _languageServer.Window.LogWarning("You have an older version of PackageManagement known to cause issues with the PowerShell extension. Please run the following command in a new Windows PowerShell session and then restart the PowerShell extension: `Install-Module PackageManagement -Force -AllowClobber -MinimumVersion 1.4.6`"); + _languageServer.Window.ShowWarning("You have an older version of PackageManagement known to cause issues with the PowerShell extension. Please run the following command in a new Windows PowerShell session and then restart the PowerShell extension: `Install-Module PackageManagement -Force -AllowClobber -MinimumVersion 1.4.6`"); return; } diff --git a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj index 01648070f..906a42319 100644 --- a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj +++ b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj @@ -28,7 +28,7 @@ - + From 9f32556629e024aa48779967cee35f4ec7beb060 Mon Sep 17 00:00:00 2001 From: Justin Chen Date: Fri, 7 Aug 2020 10:44:06 -0700 Subject: [PATCH 5/5] Update src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs Co-authored-by: Tyler James Leonhardt --- .../TextDocument/Handlers/PsesSemanticTokensHandler.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs index 50e01b663..eacd4665e 100644 --- a/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs +++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs @@ -25,7 +25,8 @@ internal class PsesSemanticTokensHandler : SemanticTokensHandlerBase { DocumentSelector = LspUtils.PowerShellDocumentSelector, Legend = new SemanticTokensLegend(), - Full = new SemanticTokensCapabilityRequestFull() { + Full = new SemanticTokensCapabilityRequestFull + { Delta = true }, Range = true