Merge pull request dotnet#57 from dibarbet/enable_more_lsp

Enable more LSP features
dibarbet · Nov 10, 2022 · 2e5b6e8 · 2e5b6e8
2 parents b874d8a + cb934f5
commit 2e5b6e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/src/Features/LanguageServer/Directory.Packages.props b/src/Features/LanguageServer/Directory.Packages.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <MicrosoftBuildLocatorVersion>1.5.5</MicrosoftBuildLocatorVersion>
-    <MicrosoftCodeAnalysisVersion>4.5.0-2.22552.19</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisVersion>4.5.0-2.22559.13</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisCSharpFeaturesVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisCSharpFeaturesVersion>
     <MicrosoftCodeAnalysisLanguageServerProtocolVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisLanguageServerProtocolVersion>
     <MicrosoftCodeAnalysisCSharpLanguageServerProtocolVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisCSharpLanguageServerProtocolVersion>
@@ -13,6 +13,7 @@
     <MicrosoftExtensionsLoggingAbstractionsVersion>6.0.2</MicrosoftExtensionsLoggingAbstractionsVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingVersion)</MicrosoftExtensionsLoggingConsoleVersion>
     <MicrosoftVisualStudioCompositionVersion>17.2.41</MicrosoftVisualStudioCompositionVersion>
+    <MicrosoftVisualStudioLanguageServerProtocolVersion>17.4.1012</MicrosoftVisualStudioLanguageServerProtocolVersion>
     <NerdbankStreamsVersion>2.9.112</NerdbankStreamsVersion>
     <StreamJsonRpcVersion>2.13.21-alpha</StreamJsonRpcVersion>
   </PropertyGroup>

diff --git a/...Server/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/ServerCapabilitiesProvider.cs b/...Server/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/ServerCapabilitiesProvider.cs
@@ -18,20 +18,6 @@ public ServerCapabilitiesProvider(ExperimentalCapabilitiesProvider roslynCapabil
     public ServerCapabilities GetCapabilities(ClientCapabilities clientCapabilities)
     {
         var roslynCapabilities = _roslynCapabilities.GetCapabilities(clientCapabilities);
-        return new()
-        {
-            TextDocumentSync = new TextDocumentSyncOptions
-            {
-                Change = TextDocumentSyncKind.Incremental,
-                OpenClose = true,
-            },
-            DefinitionProvider = roslynCapabilities.DefinitionProvider,
-            FoldingRangeProvider = roslynCapabilities.FoldingRangeProvider,
-            DocumentHighlightProvider = roslynCapabilities.DocumentHighlightProvider,
-            SignatureHelpProvider = roslynCapabilities.SignatureHelpProvider,
-            DocumentFormattingProvider = roslynCapabilities.DocumentFormattingProvider,
-            DocumentRangeFormattingProvider = roslynCapabilities.DocumentRangeFormattingProvider,
-            DocumentOnTypeFormattingProvider = roslynCapabilities.DocumentOnTypeFormattingProvider,
-        };
+        return roslynCapabilities;
     }
 }
diff --git a/...Server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/...Server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
@@ -19,6 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
     <PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol" Version="$(MicrosoftVisualStudioLanguageServerProtocolVersion)" />
 
     <!-- Dlls we don't directly reference but need to include to build the MEF composition -->
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpFeaturesVersion)" />