Bump Roslyn libs to 4.13.0 (#220)

* Update Roslyn libs to 4.13.0

* Update MSBuildLocatorPackageVersion to 1.9.1

* Update MSBuildPackageVersion to 17.3.9

Author: razzmatazz

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+* Upgrade Roslyn to 4.13.0
+  - https://github.com/razzmatazz/csharp-language-server/pull/220
 * csharp-ls will now use and require .NET 8 runtime/SDK
   - PR by @lapponiandevil in https://github.com/razzmatazz/csharp-language-server/pull/222
 * Upgrade Ionide.LanguageServerProtocol to 0.7.0:

Directory.Packages.props

@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <RoslynPackageVersion>4.12.0</RoslynPackageVersion>
-    <MSBuildPackageVersion>17.12.6</MSBuildPackageVersion>
-    <MSBuildLocatorPackageVersion>1.7.8</MSBuildLocatorPackageVersion>
+    <MSBuildPackageVersion>17.13.9</MSBuildPackageVersion>
+    <RoslynPackageVersion>4.13.0</RoslynPackageVersion>
+    <MSBuildLocatorPackageVersion>1.9.1</MSBuildLocatorPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/CSharpLanguageServer/RoslynHelpers.fs

@@ -149,65 +149,69 @@ type PickMembersServiceInterceptor (_logMessage) =
                 NotImplementedException(string invocation.Method) |> raise
 
 type ExtractClassOptionsServiceInterceptor (_logMessage) =
-    interface IInterceptor with
-        member __.Intercept(invocation: IInvocation) =
 
-            match invocation.Method.Name with
-            | "GetExtractClassOptionsAsync" ->
-                let _argDocument = invocation.Arguments[0] :?> Document
-                let argOriginalType = invocation.Arguments[1] :?> INamedTypeSymbol
-                let _argSelectedMembers = invocation.Arguments[2] :?> ImmutableArray<ISymbol>
+    let getExtractClassOptionsImpl(argOriginalType: INamedTypeSymbol): Object =
+        let featuresAssembly = Assembly.Load("Microsoft.CodeAnalysis.Features")
 
-                let featuresAssembly = Assembly.Load("Microsoft.CodeAnalysis.Features")
-                let extractClassOptionsType = featuresAssembly.GetType("Microsoft.CodeAnalysis.ExtractClass.ExtractClassOptions")
+        let typeName = "Base" + argOriginalType.Name
+        let fileName = typeName + ".cs"
+        let sameFile = box true
 
-                let typeName = "Base" + argOriginalType.Name
-                let fileName = typeName + ".cs"
-                let sameFile = box true
+        let immArrayType = typeof<ImmutableArray>
+        let extractClassMemberAnalysisResultType = featuresAssembly.GetType("Microsoft.CodeAnalysis.ExtractClass.ExtractClassMemberAnalysisResult")
 
-                let immArrayType = typeof<ImmutableArray>
-                let extractClassMemberAnalysisResultType = featuresAssembly.GetType("Microsoft.CodeAnalysis.ExtractClass.ExtractClassMemberAnalysisResult")
+        let resultListType = typedefof<List<_>>.MakeGenericType(extractClassMemberAnalysisResultType)
+        let resultList = Activator.CreateInstance(resultListType)
 
-                let resultListType = typedefof<List<_>>.MakeGenericType(extractClassMemberAnalysisResultType)
-                let resultList = Activator.CreateInstance(resultListType)
+        let memberFilter (m: ISymbol) =
+            match m with
+            | :? IMethodSymbol as ms -> ms.MethodKind = MethodKind.Ordinary
+            | :? IFieldSymbol as fs -> not fs.IsImplicitlyDeclared
+            | _ -> m.Kind = SymbolKind.Property || m.Kind = SymbolKind.Event
 
-                let memberFilter (m: ISymbol) =
-                    match m with
-                    | :? IMethodSymbol as ms -> ms.MethodKind = MethodKind.Ordinary
-                    | :? IFieldSymbol as fs -> not fs.IsImplicitlyDeclared
-                    | _ -> m.Kind = SymbolKind.Property || m.Kind = SymbolKind.Event
+        let selectedMembersToAdd =
+            argOriginalType.GetMembers()
+            |> Seq.filter memberFilter
 
-                let selectedMembersToAdd =
-                    argOriginalType.GetMembers()
-                    |> Seq.filter memberFilter
+        for memberToAdd in selectedMembersToAdd do
+            let memberAnalysisResult =
+                Activator.CreateInstance(extractClassMemberAnalysisResultType, memberToAdd, false)
 
-                for memberToAdd in selectedMembersToAdd do
-                    let memberAnalysisResult =
-                        Activator.CreateInstance(extractClassMemberAnalysisResultType, memberToAdd, false)
+            resultListType.GetMethod("Add").Invoke(resultList, [| memberAnalysisResult |])
+            |> ignore
 
-                    resultListType.GetMethod("Add").Invoke(resultList, [| memberAnalysisResult |])
-                    |> ignore
+        let resultListAsArray =
+            resultListType.GetMethod("ToArray").Invoke(resultList, null)
 
-                let resultListAsArray =
-                    resultListType.GetMethod("ToArray").Invoke(resultList, null)
+        let immArrayCreateFromArray =
+            immArrayType.GetMethods()
+            |> Seq.filter (fun m -> m.GetParameters().Length = 1 && (m.GetParameters()[0]).ParameterType.IsArray)
+            |> Seq.head
 
-                let immArrayCreateFromArray =
-                    immArrayType.GetMethods()
-                    |> Seq.filter (fun m -> m.GetParameters().Length = 1 && (m.GetParameters()[0]).ParameterType.IsArray)
-                    |> Seq.head
+        let emptyMemberAnalysisResults =
+            immArrayCreateFromArray.MakeGenericMethod([| extractClassMemberAnalysisResultType |]).Invoke(null, [| resultListAsArray |])
 
-                let emptyMemberAnalysisResults =
-                    immArrayCreateFromArray.MakeGenericMethod([| extractClassMemberAnalysisResultType |]).Invoke(null, [| resultListAsArray |])
+        let extractClassOptionsType = featuresAssembly.GetType("Microsoft.CodeAnalysis.ExtractClass.ExtractClassOptions")
 
-                let extractClassOptionsValue =
-                    Activator.CreateInstance(
-                        extractClassOptionsType, fileName, typeName, sameFile, emptyMemberAnalysisResults)
+        Activator.CreateInstance(
+            extractClassOptionsType, fileName, typeName, sameFile, emptyMemberAnalysisResults)
+
+    interface IInterceptor with
+        member __.Intercept(invocation: IInvocation) =
+
+            match invocation.Method.Name with
+            | "GetExtractClassOptionsAsync" ->
+                let argOriginalType = invocation.Arguments[1] :?> INamedTypeSymbol
+                let extractClassOptionsValue = getExtractClassOptionsImpl(argOriginalType)
 
                 let fromResultMethod = typeof<Task>.GetMethod("FromResult")
-                let typedFromResultMethod = fromResultMethod.MakeGenericMethod([| extractClassOptionsType |])
+                let typedFromResultMethod = fromResultMethod.MakeGenericMethod([| extractClassOptionsValue.GetType() |])
 
-                invocation.ReturnValue <-
-                    typedFromResultMethod.Invoke(null, [| extractClassOptionsValue |])
+                invocation.ReturnValue <- typedFromResultMethod.Invoke(null, [| extractClassOptionsValue |])
+
+            | "GetExtractClassOptions" ->
+                let argOriginalType = invocation.Arguments[1] :?> INamedTypeSymbol
+                invocation.ReturnValue <- getExtractClassOptionsImpl(argOriginalType)
 
             | _ ->
                 NotImplementedException(string invocation.Method) |> raise
@@ -221,7 +225,6 @@ type ExtractInterfaceOptionsServiceInterceptor (logMessage) =
                 let argExtractableMembers = invocation.Arguments[2] :?> List<ISymbol>
                 let argDefaultInterfaceName = invocation.Arguments[3] :?> string
 
-                let isCancelled = false
                 let fileName = sprintf "%s.cs" argDefaultInterfaceName
 
                 let featuresAssembly = Assembly.Load("Microsoft.CodeAnalysis.Features")