fix-mem2

Author: dsyme

RELEASE_NOTES.md

@@ -1,3 +1,7 @@
+#### 1.4.0.9 - 
+* FSharpType.Format fix
+* Disable maximum-memory trigger by default until use case ironed out
+
 #### 1.4.0.8 - 
 * FSharpType.Format now prettifies type variables.  If necessary, FSharpType.Prettify can also be called
 * Add maximum-memory trigger to downsize FCS caches. Defaults to 1.7GB of allocaed memory in the system 

src/fsharp/NicePrint.fs

@@ -1061,14 +1061,16 @@ module private PrintTypes =
         nameL ^^ wordL ":" ^^ tauL
 
 
-    let layoutPrettyTypeWithPrec prec denv typ = 
+
+    let layoutPrettyType denv typ = 
         let _,typ,cxs = PrettyTypes.PrettifyTypes1 denv.g typ
         let env = SimplifyTypes.CollectInfo true [typ] cxs
         let cxsL = layoutConstraintsWithInfo denv env env.postfixConstraints
-        layoutTypeWithInfoAndPrec denv env prec typ  --- cxsL
+        layoutTypeWithInfoAndPrec denv env 2 typ  --- cxsL
 
-    let layoutPrettyType denv typ = layoutPrettyTypeWithPrec 2 denv typ
-    let layoutPrettyTypeHighPrec denv typ = layoutPrettyTypeWithPrec 5 denv typ
+    let layoutPrettyTypeNoCx denv typ = 
+        let _,typ,_cxs = PrettyTypes.PrettifyTypes1 denv.g typ
+        layoutTypeWithInfoAndPrec denv SimplifyTypes.typeSimplificationInfo0 5 typ  
 
 /// Printing TAST objects
 module private PrintTastMemberOrVals = 
@@ -1881,7 +1883,7 @@ let isGeneratedExceptionField pos f     = TastDefinitionPrinting.isGeneratedExce
 let stringOfTyparConstraint denv tpc  = stringOfTyparConstraints denv [tpc]
 let stringOfTy              denv x    = x |> PrintTypes.layoutType denv |> showL
 let prettyStringOfTy        denv x    = x |> PrintTypes.layoutPrettyType denv |> showL
-let prettyStringOfTyHighPrec denv x    = x |> PrintTypes.layoutPrettyTypeHighPrec denv |> showL
+let prettyStringOfTyNoCx    denv x    = x |> PrintTypes.layoutPrettyTypeNoCx denv |> showL
 let stringOfRecdField       denv x    = x |> TastDefinitionPrinting.layoutRecdField false denv |> showL
 let stringOfUnionCase       denv x    = x |> TastDefinitionPrinting.layoutUnionCase denv (wordL "|")  |> showL
 let stringOfExnDef          denv x    = x |> TastDefinitionPrinting.layoutExnDefn denv |> showL

src/fsharp/vs/Symbols.fs

@@ -1848,11 +1848,11 @@ and FSharpType(cenv, typ:TType) =
 
     member x.Format(denv: FSharpDisplayContext) = 
        protect <| fun () -> 
-        NicePrint.prettyStringOfTyHighPrec (denv.Contents cenv.g) typ 
+        NicePrint.prettyStringOfTyNoCx (denv.Contents cenv.g) typ 
 
     override x.ToString() = 
        protect <| fun () -> 
-        "type " + NicePrint.prettyStringOfTyHighPrec (DisplayEnv.Empty(cenv.g)) typ 
+        "type " + NicePrint.prettyStringOfTyNoCx (DisplayEnv.Empty(cenv.g)) typ 
 
     static member Prettify(typ: FSharpType) = 
         let t = PrettyTypes.PrettifyTypes1 typ.cenv.g typ.V  |> p23

src/fsharp/vs/service.fs

@@ -62,7 +62,8 @@ module EnvMisc =
 
     let projectCacheSizeDefault   = GetEnvInteger "mFSharp_ProjectCacheSizeDefault" 3
     let frameworkTcImportsCacheStrongSize = GetEnvInteger "mFSharp_frameworkTcImportsCacheStrongSizeDefault" 8
-    let maxMBDefault = GetEnvInteger "mFSharp_maxMB" (if sizeof<int> = 4 then 1700 else 3400)
+    let maxMBDefault = 1000000 // a million MB = 1TB = disabled
+    //let maxMBDefault = GetEnvInteger "mFSharp_maxMB" (if sizeof<int> = 4 then 1700 else 3400)
 
 //----------------------------------------------------------------------------
 // Methods