Bump version to 7.8.5

Author: TheAngryByrd

release/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 7.8.5 - 26.07.2023
+* [Disable GCHeapCount and GCNoAffinitize for net6.0](https://github.com/ionide/ionide-vscode-fsharp/pull/1900) (Thanks @TheAngryByrd!)
+
 ### 7.8.4 - 22.07.2023
 * [Adds GCNoAffinitize setting](https://github.com/ionide/ionide-vscode-fsharp/pull/1898) (Thanks @TheAngryByrd!)
 

release/package.json

@@ -557,9 +557,9 @@
             "FSharp.fsac.gc.server"
           ]
         },
-        "Fsharp.fsac.gc.noAffinitize" : {
-          "default" : true,
-          "type" : "boolean",
+        "Fsharp.fsac.gc.noAffinitize": {
+          "default": true,
+          "type": "boolean",
           "markdownDescription": "Specifies whether to [affinitize](https://learn.microsoft.com/en-us/dotnet/core/runtime-config/garbage-collector#affinitize) garbage collection threads with processors. To affinitize a GC thread means that it can only run on its specific CPU.. Applies to server garbage collection only. See [GCNoAffinitize](https://learn.microsoft.com/en-us/dotnet/framework/configure-apps/file-schema/runtime/gcnoaffinitize-element#remarks) for more details. [Only available on .NET 7 or higher](https://github.com/ionide/ionide-vscode-fsharp/issues/1899#issuecomment-1649009462). Requires restart.",
           "required": [
             "FSharp.fsac.gc.server"
@@ -1747,5 +1747,5 @@
     "type": "git",
     "url": "https://github.com/ionide/ionide-vscode-fsharp.git"
   },
-  "version": "7.8.4"
-}
+  "version": "7.8.5"
+}

src/Core/LanguageService.fs

@@ -41,6 +41,7 @@ module LanguageService =
 
     let private logger =
         ConsoleAndOutputChannelLogger(Some "LanguageService", Level.DEBUG, Some defaultOutputChannel, Some Level.DEBUG)
+
     module Types =
         open Fable.Import.VSCode.Vscode
         type PlainNotification = { content: string }
@@ -605,7 +606,7 @@ Consider:
 
             let mutable initFails = 0
 
-            let initializationFailureHandler (error:  U3<ResponseError,Exception,obj option>) =
+            let initializationFailureHandler (error: U3<ResponseError, Exception, obj option>) =
                 if initFails < 5 then
                     logger.Error($"Initialization failed: %%", error)
                     initFails <- initFails + 1
@@ -615,25 +616,30 @@ Consider:
 
 
             let restarts = new ResizeArray<_>()
-            let errorHandling = {
 
-                new ErrorHandler with
-                    member this.closed(): CloseAction =
-                        restarts.Add(1)
-                        if restarts |> Seq.length < 5 then
-                            CloseAction.Restart
-                        else
+            let errorHandling =
+                {
 
-                            logger.Error("Server closed")
-                            CloseAction.DoNotRestart
-                    member this.error(error: Exception, message: Message, count: float): ErrorAction =
-                        logger.Error($"Error from server: {error} {message} {count}")
-                        if count < 3.0 then
-                            ErrorAction.Continue
-                        else
-                            ErrorAction.Shutdown
+                  new ErrorHandler with
+                      member this.closed() : CloseAction =
+                          restarts.Add(1)
 
-            }
+                          if restarts |> Seq.length < 5 then
+                              CloseAction.Restart
+                          else
+
+                              logger.Error("Server closed")
+                              CloseAction.DoNotRestart
+
+                      member this.error(error: Exception, message: Message, count: float) : ErrorAction =
+                          logger.Error($"Error from server: {error} {message} {count}")
+
+                          if count < 3.0 then
+                              ErrorAction.Continue
+                          else
+                              ErrorAction.Shutdown
+
+                }
 
             let initOpts = createObj [ "AutomaticWorkspaceInit" ==> false ]
 
@@ -650,7 +656,7 @@ Consider:
             // Worth keeping around for debug purposes
             // opts.traceOutputChannel <- Some defaultOutputChannel
             // opts.outputChannel <- Some defaultOutputChannel
-            opts.initializationFailedHandler <- Some (!! initializationFailureHandler)
+            opts.initializationFailedHandler <- Some(!!initializationFailureHandler)
 
             opts.initializationOptions <- Some !^(Some initOpts)
             opts?markdown <- createObj [ "isTrusted" ==> true; "supportHtml" ==> true ]
@@ -862,14 +868,17 @@ Consider:
                     // Only set DOTNET_GCHeapCount if we're on .NET 7 or higher
                     // .NET 6 has some issues with this env var on linux
                     // https://github.com/ionide/ionide-vscode-fsharp/issues/1899
-                    let versionSupportingEnvVars = (semver.parse (Some (U2.Case1 "7.0.0"))).Value
-                    let isNet7orHigher = semver.cmp(U2.Case2 sdkVersion, Operator.GTE, U2.Case2 versionSupportingEnvVars)
+                    let versionSupportingEnvVars = (semver.parse (Some(U2.Case1 "7.0.0"))).Value
+
+                    let isNet7orHigher =
+                        semver.cmp (U2.Case2 sdkVersion, Operator.GTE, U2.Case2 versionSupportingEnvVars)
+
                     let fsacEnvVars =
                         [ yield! fsacEnvVars
                           if isNet7orHigher then
-                            // it doesn't really make sense to set GCNoAffinitize without setting GCHeapCount
-                            yield "DOTNET_GCNoAffinitize", box (boolToInt gcNoAffinitize) // https://learn.microsoft.com/en-us/dotnet/core/runtime-config/garbage-collector#affinitize
-                            yield "DOTNET_GCHeapCount", box (gcHeapCount.ToString("X")) // Requires hexadecimal value https://learn.microsoft.com/en-us/dotnet/core/runtime-config/garbage-collector#heap-count
+                              // it doesn't really make sense to set GCNoAffinitize without setting GCHeapCount
+                              yield "DOTNET_GCNoAffinitize", box (boolToInt gcNoAffinitize) // https://learn.microsoft.com/en-us/dotnet/core/runtime-config/garbage-collector#affinitize
+                              yield "DOTNET_GCHeapCount", box (gcHeapCount.ToString("X")) // Requires hexadecimal value https://learn.microsoft.com/en-us/dotnet/core/runtime-config/garbage-collector#heap-count
 
                           yield "DOTNET_GCConserveMemory", box gcConserveMemory //https://learn.microsoft.com/en-us/dotnet/core/runtime-config/garbage-collector#conserve-memory
                           yield "DOTNET_GCServer", box (boolToInt gcServer) // https://learn.microsoft.com/en-us/dotnet/core/runtime-config/garbage-collector#workstation-vs-server
@@ -978,7 +987,7 @@ Consider:
         promise {
             try
                 let! startOpts = getOptions c
-                logger.Debug ("F# language server options: %%",startOpts)
+                logger.Debug("F# language server options: %%", startOpts)
                 let cl = createClient startOpts
                 registerCustomNotifications cl
                 let started = cl.start ()

src/Core/Logging.fs

@@ -68,7 +68,7 @@ module Logging =
 
         out.appendLine (formattedLogLine)
 
-    let private writeToFile level source template  args =
+    let private writeToFile level source template args =
         let formattedMessage = Util.format (template, args)
 
         let formattedLogLine =
@@ -94,7 +94,7 @@ module Logging =
         if source = Some "IONIDE-FSAC" then
             try
                 if string args.[0] <> "parse" then
-                    writeToFile level source template  args
+                    writeToFile level source template args
             with _ ->
                 () // Do nothing
 

src/fsharp.fs

@@ -39,6 +39,7 @@ let activate (context: ExtensionContext) : JS.Promise<Api> =
         let progressOpts = createEmpty<ProgressOptions>
         progressOpts.location <- U2.Case1 ProgressLocation.Window
         logger.Debug "Activating features"
+
         window.withProgress (
             progressOpts,
             (fun p ctok ->