Merge fsharp-editor to net6

vsintegration/src/FSharp.Editor/Common/FSharpOptionsPanels.fs

@@ -41,8 +41,12 @@ type FSharpSettingsPanel() =
         widget.EntryCompilerPath.Text <- if use_default || prop_compiler_path = "" then default_compiler_path else prop_compiler_path
         widget.EntryCompilerPath.Sensitive <- not use_default
 
-    override x.Dispose() =
-        if widget <> null then widget.Dispose()
+    override x.Dispose (disposing:bool) =
+        if widget <> null then
+            widget.Dispose()
+            widget <- null
+
+        base.Dispose (disposing)
 
     override x.CreatePanelWidget() =
         widget <- new FSharpSettingsWidget()
@@ -118,11 +122,16 @@ type CodeGenerationPanel() =
         | 3 -> "Itanium"
         | _ -> "anycpu"
 
-    override x.Dispose () =
+    override x.Dispose (disposing:bool) =
         if widget <> null then
             widget.Dispose ()
+            widget <- null
+
         if debugCheckedHandler <> null then
             debugCheckedHandler.Dispose()
+            widget <- null
+
+        base.Dispose(disposing) 
 
     override x.CreatePanelWidget() =
         widget <- new FSharpCompilerOptionsWidget ()

vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerProvider.fs

@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor
 open System
 open System.ComponentModel.Composition
 open System.Diagnostics
+open System.Reflection
 open Microsoft.CodeAnalysis
 open FSharp.Compiler
 open FSharp.Compiler.SourceCodeServices
@@ -64,6 +65,12 @@ type internal FSharpCheckerProvider
                     enableBackgroundItemKeyStoreAndSemanticClassification = false) // This option crashes on Mono due to MemoryMappedFile usage
                     //enablePartialTypeChecking = true)
 
+            // HACK: VSMAC - Set MaxMemoryReached flag to true to prevent repeated calls to GC.GetTotalMemory in service.fs CheckMaxMemoryReached which can be slow on Mono
+            // We can remove this hack once we have migrated to dotnet
+            let field = checker.GetType().GetField("maxMemoryReached", BindingFlags.NonPublic ||| BindingFlags.Instance)
+            field.SetValue(checker, true);
+
+
             // This is one half of the bridge between the F# background builder and the Roslyn analysis engine.
             // When the F# background builder refreshes the background semantic build context for a file,
             // we request Roslyn to reanalyze that individual file.