From 16c8bb5ee6c0a94fa9417d30ad7a2320279e6011 Mon Sep 17 00:00:00 2001 From: akhera99 Date: Tue, 24 May 2022 16:08:52 -0700 Subject: [PATCH 1/3] update versioning to use languageserver.client.implementation --- eng/Versions.props | 7 +++-- ...crosoft.CodeAnalysis.EditorFeatures.csproj | 3 ++ .../Lsif/GeneratorTest/FoldingRangeTests.vb | 31 +++++++++++++------ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 60d35f7e61081..a1f010b6f5320 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,10 +25,10 @@ 0.1.132-beta 4.2.0-2.final - 17.2.3194 + 17.3.37-preview 5.0.0-alpha1.19409.1 5.0.0-preview.1.20112.8 - 17.3.5 + 17.3.2017 17.2.32505.113 16.5.0 Microsoft.CodeAnalysis.EditorFeatures.Common true @@ -39,6 +41,7 @@ + diff --git a/src/Features/Lsif/GeneratorTest/FoldingRangeTests.vb b/src/Features/Lsif/GeneratorTest/FoldingRangeTests.vb index 1955bed51b060..a5280374c5337 100644 --- a/src/Features/Lsif/GeneratorTest/FoldingRangeTests.vb +++ b/src/Features/Lsif/GeneratorTest/FoldingRangeTests.vb @@ -13,6 +13,19 @@ Namespace Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests Public NotInheritable Class FoldingRangeTests Private Const TestProjectAssemblyName As String = "TestProject" + ' Expected 'FoldingRangeKind' argument would likely change for some of the tests when + ' https://github.com/dotnet/roslyn/projects/45#card-20049168 is implemented. + + + + Public Async Function TestFoldingRangesImports(code As String) As Task + Await TestFoldingRanges(code, rangeKind:=FoldingRangeKind.Imports) + End Function + ' Expected 'FoldingRangeKind' argument would likely change for some of the tests when ' https://github.com/dotnet/roslyn/projects/45#card-20049168 is implemented. @@ -30,19 +43,17 @@ class C{|foldingRange: M(); }|} }|} -}|}", Nothing)> +}|}")> - - +#endregion|}")> +// Comment Line 2|}")> + Public Async Function TestFoldingRangesStandard(code As String) As Task + Await TestFoldingRanges(code, rangeKind:=Nothing) + End Function + Public Async Function TestFoldingRanges(code As String, rangeKind As FoldingRangeKind?) As Task Using workspace = TestWorkspace.CreateWorkspace( @@ -67,7 +78,7 @@ using System.Linq;|}", FoldingRangeKind.Imports)> Private Shared Function CreateFoldingRange(kind As FoldingRangeKind?, range As Range) As FoldingRange Return New FoldingRange() With { - .Kind = kind, + .kind = kind, .StartCharacter = range.Start.Character, .EndCharacter = range.End.Character, .StartLine = range.Start.Line, From c0e2ecb81a7e314d9a942f6b5a50707e455c0008 Mon Sep 17 00:00:00 2001 From: akhera99 Date: Tue, 24 May 2022 16:43:31 -0700 Subject: [PATCH 2/3] fix --- src/Features/Lsif/GeneratorTest/FoldingRangeTests.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Features/Lsif/GeneratorTest/FoldingRangeTests.vb b/src/Features/Lsif/GeneratorTest/FoldingRangeTests.vb index 37c55c4896933..745aabc7c760f 100644 --- a/src/Features/Lsif/GeneratorTest/FoldingRangeTests.vb +++ b/src/Features/Lsif/GeneratorTest/FoldingRangeTests.vb @@ -78,4 +78,4 @@ using System.Linq;|}", "imports")> Return foldingRange End Function End Class -End Namespace \ No newline at end of file +End Namespace From ac5bd25c2306e5b99c1ebc8d35ec8679c24a7362 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Wed, 25 May 2022 15:43:42 -0700 Subject: [PATCH 3/3] Simplify LSP reference update --- eng/Versions.props | 7 ++++--- .../Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj | 1 + .../Core/Microsoft.CodeAnalysis.EditorFeatures.csproj | 11 +---------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1f010b6f5320..22dc4926a7d55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,6 +28,7 @@ 17.3.37-preview 5.0.0-alpha1.19409.1 5.0.0-preview.1.20112.8 + 17.3.2062-preview 17.3.2017 17.2.32505.113 16.5.0 @@ -149,12 +150,12 @@ $(VisualStudioEditorPackagesVersion) 15.8.27812-alpha $(VisualStudioEditorPackagesVersion) - 17.0.491 + $(VisualStudioEditorPackagesVersion) $(MicrosoftVisualStudioLanguageServerProtocolPackagesVersion) $(MicrosoftVisualStudioLanguageServerProtocolPackagesVersion) $(MicrosoftVisualStudioLanguageServerProtocolPackagesVersion) - 17.3.2062-preview - 17.3.2062-preview + $(MicrosoftVisualStudioLanguageServerClientPackagesVersion) + $(MicrosoftVisualStudioLanguageServerClientPackagesVersion) $(VisualStudioEditorPackagesVersion) 2.18.6 3.0.6 diff --git a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj index e84bbb5b2e54b..ad0ccef2273e9 100644 --- a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj +++ b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj @@ -37,6 +37,7 @@ + diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj index 42296f990832e..b1114118fa386 100644 --- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj +++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj @@ -9,8 +9,6 @@ $(DefineConstants);EDITOR_FEATURES full - $(NoWarn);NU1701; - Microsoft.CodeAnalysis.EditorFeatures.Common true @@ -39,14 +37,7 @@ There is a test to ensure this doesn't regress in src\EditorFeatures\Test\AssemblyReferenceTests.cs --> - - - - - - - - +