From 141a25b0814720ca256d4090bb7aa5a49a91b7bf Mon Sep 17 00:00:00 2001
From: David Barbet <dabarbet@microsoft.com>
Date: Tue, 1 Nov 2022 18:32:08 -0700
Subject: [PATCH] Use new roslyn packages to fix option reading exceptions

---
 server/Directory.Packages.props                             | 6 ++++--
 .../LanguageServer/ServerCapabilitiesProvider.cs            | 3 +++
 .../Microsoft.CodeAnalysis.LanguageServer.csproj            | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/server/Directory.Packages.props b/server/Directory.Packages.props
index 9d4d8cd03..2f4548809 100644
--- a/server/Directory.Packages.props
+++ b/server/Directory.Packages.props
@@ -2,9 +2,11 @@
 
   <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>
@@ -12,6 +14,6 @@
     <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>
\ No newline at end of file
diff --git a/server/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/ServerCapabilitiesProvider.cs b/server/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/ServerCapabilitiesProvider.cs
index 1fdbff346..1acb470f2 100644
--- 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
index 1b670cb5b..b7c2ca78c 100644
--- 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)" />