Merge pull request dotnet#52 from dibarbet/use_new_roslyn

Use new roslyn to fix options exceptions
dibarbet · Nov 7, 2022 · 319aa51 · 319aa51
2 parents 5ff458c + 141a25b
commit 319aa51
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/server/Directory.Packages.props b/server/Directory.Packages.props
@@ -2,16 +2,18 @@
 
   <PropertyGroup>
     <MicrosoftBuildLocatorVersion>1.5.5</MicrosoftBuildLocatorVersion>
-    <MicrosoftCodeAnalysisVersion>4.5.0-1.22524.1</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisVersion>4.5.0-2.22552.19</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisCSharpFeaturesVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisCSharpFeaturesVersion>
     <MicrosoftCodeAnalysisLanguageServerProtocolVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisLanguageServerProtocolVersion>
+    <MicrosoftCodeAnalysisCSharpLanguageServerProtocolVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisCSharpLanguageServerProtocolVersion>
+    <MicrosoftCodeAnalysisVisualBasicLanguageServerProtocolVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVisualBasicLanguageServerProtocolVersion>
     <MicrosoftCodeAnalysisWorkspacesDesktopVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisWorkspacesDesktopVersion>
     <MicrosoftCodeAnalysisWorkspacesMSBuildVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
     <MicrosoftExtensionsLoggingVersion>6.0.0</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsLoggingAbstractionsVersion>6.0.2</MicrosoftExtensionsLoggingAbstractionsVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingVersion)</MicrosoftExtensionsLoggingConsoleVersion>
     <MicrosoftVisualStudioCompositionVersion>17.2.41</MicrosoftVisualStudioCompositionVersion>
     <NerdbankStreamsVersion>2.9.112</NerdbankStreamsVersion>
-    <StreamJsonRpcVersion>2.12.27</StreamJsonRpcVersion>
+    <StreamJsonRpcVersion>2.13.21-alpha</StreamJsonRpcVersion>
   </PropertyGroup>
 </Project>
diff --git a/server/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/ServerCapabilitiesProvider.cs b/server/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/ServerCapabilitiesProvider.cs
@@ -29,6 +29,9 @@ public ServerCapabilities GetCapabilities(ClientCapabilities clientCapabilities)
             FoldingRangeProvider = roslynCapabilities.FoldingRangeProvider,
             DocumentHighlightProvider = roslynCapabilities.DocumentHighlightProvider,
             SignatureHelpProvider = roslynCapabilities.SignatureHelpProvider,
+            DocumentFormattingProvider = roslynCapabilities.DocumentFormattingProvider,
+            DocumentRangeFormattingProvider = roslynCapabilities.DocumentRangeFormattingProvider,
+            DocumentOnTypeFormattingProvider = roslynCapabilities.DocumentOnTypeFormattingProvider,
         };
     }
 }
diff --git a/server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
@@ -10,6 +10,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="$(MicrosoftCodeAnalysisLanguageServerProtocolVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.LanguageServer.Protocol" Version="$(MicrosoftCodeAnalysisCSharpLanguageServerProtocolVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.LanguageServer.Protocol" Version="$(MicrosoftCodeAnalysisVisualBasicLanguageServerProtocolVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Desktop" Version="$(MicrosoftCodeAnalysisWorkspacesDesktopVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />