From d71cbd0c0bb0f530977f04db00a7a362c838c93d Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 11 Jun 2020 10:33:21 -0700 Subject: [PATCH 1/4] Update Roslyn to 3.7.0-4.20311.4 --- CHANGELOG.md | 5 ++++- build/Packages.props | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86240d45e9..fc31a9e1b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,14 @@ # Changelog All changes to the project will be documented in this file. -## [1.35.3] - not yet released +## [1.35.4] - Not yet released + +## [1.35.3] - 2020-06-11 * Added LSP handler for `textDocument/codeAction` request. (PR: [#1795](https://github.com/OmniSharp/omnisharp-roslyn/pull/1795)) * Expose a custom LSP `omnisharp/client/findReferences` command via code lens (meant to be handled by LSP client). (PR: [#1807](https://github.com/OmniSharp/omnisharp-roslyn/pull/1807)) * Added `DirectoryDelete` option to `FileChangeType` allowing clients to report deleted directories that need to be removed (along all the files) from the workspace (PR: [#1821](https://github.com/OmniSharp/omnisharp-roslyn/pull/1821)) * Do not crash when plugin assembly cannot be loaded ([#1307](https://github.com/OmniSharp/omnisharp-roslyn/issues/1307), PR: [#1827](https://github.com/OmniSharp/omnisharp-roslyn/pull/1827)) +* Update to Roslyn `3.7.0-4.20311.4` (PR: [#1832](https://github.com/OmniSharp/omnisharp-roslyn/pull/1832)) ## [1.35.2] - 2020-05-20 * Added support for `WarningsAsErrors` in csproj files (PR: [#1779](https://github.com/OmniSharp/omnisharp-roslyn/pull/1779)) diff --git a/build/Packages.props b/build/Packages.props index 304087d321..8c92b72f45 100644 --- a/build/Packages.props +++ b/build/Packages.props @@ -5,7 +5,7 @@ 16.5.0 5.2.0 - 3.7.0-2.20269.10 + 3.7.0-4.20311.4 2.4.0 From 75b827815d950f3ceabe8b77af4a80c362871ae5 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 11 Jun 2020 13:18:16 -0700 Subject: [PATCH 2/4] Update ImplementInterface equivalence key --- tests/OmniSharp.Roslyn.CSharp.Tests/ImplementTypeFacts.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/ImplementTypeFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/ImplementTypeFacts.cs index da5795efbf..fad4f71ea9 100644 --- a/tests/OmniSharp.Roslyn.CSharp.Tests/ImplementTypeFacts.cs +++ b/tests/OmniSharp.Roslyn.CSharp.Tests/ImplementTypeFacts.cs @@ -120,7 +120,7 @@ private async Task VerifyImplementType(string code, string expectedChange, Dicti Column = point.Offset, FileName = testFile.FileName, Buffer = testFile.Content.Code, - Identifier = "False;False;True:AssemblyName;global::IFoo;Microsoft.CodeAnalysis.ImplementInterface.AbstractImplementInterfaceService+ImplementInterfaceCodeAction", + Identifier = "False;False;True:global::IFoo;AssemblyName;Microsoft.CodeAnalysis.ImplementInterface.AbstractImplementInterfaceService+ImplementInterfaceCodeAction;", WantsTextChanges = true, WantsAllCodeActionOperations = true }; From 20af39540ee68d82bd48c254f1802259f45b56dc Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 11 Jun 2020 13:18:55 -0700 Subject: [PATCH 3/4] Looks for public Create SymbolKey method --- src/OmniSharp.Roslyn/BaseExternalSourceService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OmniSharp.Roslyn/BaseExternalSourceService.cs b/src/OmniSharp.Roslyn/BaseExternalSourceService.cs index 88eab24331..a912e8892d 100644 --- a/src/OmniSharp.Roslyn/BaseExternalSourceService.cs +++ b/src/OmniSharp.Roslyn/BaseExternalSourceService.cs @@ -55,7 +55,7 @@ public Document FindDocumentInCache(string fileName) public async Task GetExternalSymbolLocation(ISymbol symbol, Document metadataDocument, CancellationToken cancellationToken = new CancellationToken()) { - var symbolKeyCreateMethod = _symbolKey.GetMethod(Create, BindingFlags.Static | BindingFlags.NonPublic); + var symbolKeyCreateMethod = _symbolKey.GetMethod(Create, BindingFlags.Static | BindingFlags.Public); var symboldId = symbolKeyCreateMethod.InvokeStatic(new object[] { symbol, cancellationToken }); return await _getLocationInGeneratedSourceAsync.InvokeStatic>(new object[] { symboldId, metadataDocument, cancellationToken }); From 453a516b8b19541dbe5f1640873d2c5b683c5b09 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 11 Jun 2020 13:19:32 -0700 Subject: [PATCH 4/4] Cake SymbolLocation now returns Structure --- tests/OmniSharp.Roslyn.CSharp.Tests/FindSymbolsFacts.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/FindSymbolsFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/FindSymbolsFacts.cs index d82bebc99a..401c0744d4 100644 --- a/tests/OmniSharp.Roslyn.CSharp.Tests/FindSymbolsFacts.cs +++ b/tests/OmniSharp.Roslyn.CSharp.Tests/FindSymbolsFacts.cs @@ -161,7 +161,7 @@ public async Task Returns_struct_kind(string filename) var usages = await FindSymbolsAsync(code, filename); var symbols = usages.QuickFixes.Cast().Select(q => q.Kind); - Assert.Equal("Struct", symbols.First()); + Assert.Equal("Structure", symbols.First()); } [Theory] @@ -182,12 +182,12 @@ public async Task Returns_delegate_kind(string filename) public async Task Finds_partial_method_with_body(string filename) { const string code = @" -public partial class MyClass +public partial class MyClass { partial void Method(); } -public partial class MyClass +public partial class MyClass { partial void Method() { @@ -330,7 +330,8 @@ private async Task FindSymbolsWithFilterAsync(string code, str SharedOmniSharpTestHost.AddFilesToWorkspace(testFile); var requestHandler = GetRequestHandler(SharedOmniSharpTestHost); - return await requestHandler.Handle(new FindSymbolsRequest { + return await requestHandler.Handle(new FindSymbolsRequest + { Filter = filter, MinFilterLength = minFilterLength, MaxItemsToReturn = maxItemsToReturn