Cleanup (dotnet#13113)

* cleanup * split files * rename * split infos.fs and SymbolHelpres.fs * split infos.fs and SymbolHelpres.fs * fix code formating * rename autobox --> LowerLocalMutables * adjust names * block --> ImmutableArray * format * Error --> SRDiagnostic * Error --> SRDiagnostic * this -> _ * rename and cleanup * rename Diagnostic --> FormattedDiagnostic * format sigs * format sigs * fix build * fix build
vzarytovskii · May 10, 2022 · ff0deda · ff0deda
1 parent 3814613
commit ff0deda
Show file tree

Hide file tree

Showing 183 changed files with 3,483 additions and 2,946 deletions.
diff --git a/src/fsharp/AccessibilityLogic.fs b/src/fsharp/AccessibilityLogic.fs
@@ -6,12 +6,13 @@ module internal FSharp.Compiler.AccessibilityLogic
 open Internal.Utilities.Library
 open FSharp.Compiler 
 open FSharp.Compiler.AbstractIL.IL 
-open FSharp.Compiler.ErrorLogger
+open FSharp.Compiler.DiagnosticsLogger
 open FSharp.Compiler.Infos
 open FSharp.Compiler.TcGlobals
 open FSharp.Compiler.TypedTree
 open FSharp.Compiler.TypedTreeBasics
 open FSharp.Compiler.TypedTreeOps
+open FSharp.Compiler.TypeHierarchy
 
 #if !NO_TYPEPROVIDERS
 open FSharp.Compiler.TypeProviders

diff --git a/src/fsharp/AttributeChecking.fs b/src/fsharp/AttributeChecking.fs
@@ -9,12 +9,14 @@ open System.Collections.Generic
 open Internal.Utilities.Library
 open FSharp.Compiler.AbstractIL.IL 
 open FSharp.Compiler 
-open FSharp.Compiler.ErrorLogger
+open FSharp.Compiler.DiagnosticsLogger
+open FSharp.Compiler.Import
 open FSharp.Compiler.Infos
 open FSharp.Compiler.TcGlobals
 open FSharp.Compiler.Text
 open FSharp.Compiler.TypedTree
 open FSharp.Compiler.TypedTreeOps
+open FSharp.Compiler.TypeHierarchy
 
 #if !NO_TYPEPROVIDERS
 open FSharp.Compiler.TypeProviders
@@ -87,7 +89,7 @@ type AttribInfo =
          match x with 
          | FSAttribInfo(_g, Attrib(tcref, _, _, _, _, _, _)) -> tcref
          | ILAttribInfo (g, amap, scoref, a, m) -> 
-             let ty = ImportILType scoref amap m [] a.Method.DeclaringType
+             let ty = RescopeAndImportILType scoref amap m [] a.Method.DeclaringType
              tcrefOfAppTy g ty
 
     member x.ConstructorArguments = 
@@ -101,7 +103,7 @@ type AttribInfo =
          | ILAttribInfo (_g, amap, scoref, cattr, m) -> 
               let parms, _args = decodeILAttribData cattr 
               [ for argTy, arg in Seq.zip cattr.Method.FormalArgTypes parms ->
-                    let ty = ImportILType scoref amap m [] argTy
+                    let ty = RescopeAndImportILType scoref amap m [] argTy
                     let obj = evalILAttribElem arg
                     ty, obj ]
 
@@ -116,7 +118,7 @@ type AttribInfo =
          | ILAttribInfo (_g, amap, scoref, cattr, m) -> 
               let _parms, namedArgs = decodeILAttribData cattr 
               [ for nm, argTy, isProp, arg in namedArgs ->
-                    let ty = ImportILType scoref amap m [] argTy
+                    let ty = RescopeAndImportILType scoref amap m [] argTy
                     let obj = evalILAttribElem arg
                     let isField = not isProp 
                     ty, nm, isField, obj ]

diff --git a/src/fsharp/AttributeChecking.fsi b/src/fsharp/AttributeChecking.fsi
@@ -7,7 +7,7 @@ module internal FSharp.Compiler.AttributeChecking
 open System.Collections.Generic
 open FSharp.Compiler.AbstractIL.IL
 open FSharp.Compiler
-open FSharp.Compiler.ErrorLogger
+open FSharp.Compiler.DiagnosticsLogger
 open FSharp.Compiler.Infos
 open FSharp.Compiler.TcGlobals
 open FSharp.Compiler.Text

diff --git a/src/fsharp/AugmentWithHashCompare.fs b/src/fsharp/AugmentWithHashCompare.fs
@@ -5,15 +5,15 @@ module internal FSharp.Compiler.AugmentWithHashCompare
 
 open Internal.Utilities.Library
 open FSharp.Compiler.AbstractIL.IL
-open FSharp.Compiler.ErrorLogger
-open FSharp.Compiler.Infos
+open FSharp.Compiler.DiagnosticsLogger
 open FSharp.Compiler.Syntax
 open FSharp.Compiler.SyntaxTrivia
 open FSharp.Compiler.Xml
 open FSharp.Compiler.TcGlobals
 open FSharp.Compiler.TypedTree
 open FSharp.Compiler.TypedTreeBasics
 open FSharp.Compiler.TypedTreeOps
+open FSharp.Compiler.TypeHierarchy
 
 let mkIComparableCompareToSlotSig (g: TcGlobals) = 
     TSlotSig("CompareTo", g.mk_IComparable_ty, [], [], [[TSlotParam(Some("obj"), g.obj_ty, false, false, false, [])]], Some g.int_ty)
@@ -175,7 +175,7 @@ let mkEqualsTestConjuncts g m exprs =
         List.foldBack (fun e acc -> mkCond DebugPointAtBinding.NoneAtSticky m g.bool_ty e acc (mkFalse g m)) a b
 
 let mkMinimalTy (g: TcGlobals) (tcref: TyconRef) = 
-    if tcref.Deref.IsExceptionDecl then [], g.exn_ty 
+    if tcref.Deref.IsFSharpException then [], g.exn_ty 
     else generalizeTyconRef g tcref
 
 // check for nulls
@@ -679,7 +679,7 @@ let isTrueFSharpStructTycon _g (tycon: Tycon) =
 let canBeAugmentedWithEquals g (tycon: Tycon) = 
     tycon.IsUnionTycon ||
     tycon.IsRecordTycon ||
-    (tycon.IsExceptionDecl && isNominalExnc tycon) ||
+    (tycon.IsFSharpException && isNominalExnc tycon) ||
     isTrueFSharpStructTycon g tycon
 
 let canBeAugmentedWithCompare g (tycon: Tycon) = 
@@ -918,7 +918,7 @@ let MakeValsForEqualsAugmentation g (tcref: TyconRef) =
     let tps = tcref.Typars m
 
     let objEqualsVal = mkValSpec g tcref ty vis (Some(mkEqualsSlotSig g)) "Equals" (tps +-> (mkEqualsObjTy g ty)) unaryArg
-    let nocEqualsVal = mkValSpec g tcref ty vis (if tcref.Deref.IsExceptionDecl then None else Some(mkGenericIEquatableEqualsSlotSig g ty)) "Equals" (tps +-> (mkEqualsTy g ty)) unaryArg
+    let nocEqualsVal = mkValSpec g tcref ty vis (if tcref.Deref.IsFSharpException then None else Some(mkGenericIEquatableEqualsSlotSig g ty)) "Equals" (tps +-> (mkEqualsTy g ty)) unaryArg
     objEqualsVal, nocEqualsVal
 
 let MakeValsForEqualityWithComparerAugmentation g (tcref: TyconRef) =
@@ -1032,7 +1032,7 @@ let MakeBindingsForEqualityWithComparerAugmentation (g: TcGlobals) (tycon: Tycon
              (mkCompGenBind withcEqualsVal.Deref withcEqualsExpr)] 
     if tycon.IsUnionTycon then mkStructuralEquatable mkUnionHashWithComparer mkUnionEqualityWithComparer
     elif (tycon.IsRecordTycon || tycon.IsStructOrEnumTycon) then mkStructuralEquatable mkRecdHashWithComparer mkRecdEqualityWithComparer
-    elif tycon.IsExceptionDecl then mkStructuralEquatable mkExnHashWithComparer mkExnEqualityWithComparer
+    elif tycon.IsFSharpException then mkStructuralEquatable mkExnHashWithComparer mkExnEqualityWithComparer
     else []
 
 let MakeBindingsForEqualsAugmentation (g: TcGlobals) (tycon: Tycon) = 
@@ -1066,7 +1066,7 @@ let MakeBindingsForEqualsAugmentation (g: TcGlobals) (tycon: Tycon) =
 
           [ mkCompGenBind nocEqualsVal.Deref nocEqualsExpr
             mkCompGenBind objEqualsVal.Deref objEqualsExpr   ] 
-    if tycon.IsExceptionDecl then mkEquals mkExnEquality 
+    if tycon.IsFSharpException then mkEquals mkExnEquality 
     elif tycon.IsUnionTycon then mkEquals mkUnionEquality 
     elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkEquals mkRecdEquality 
     else []

diff --git a/src/fsharp/BuildGraph.fs b/src/fsharp/BuildGraph.fs
@@ -7,20 +7,20 @@ open System.Threading
 open System.Threading.Tasks
 open System.Diagnostics
 open System.Globalization
-open FSharp.Compiler.ErrorLogger
+open FSharp.Compiler.DiagnosticsLogger
 open Internal.Utilities.Library
 
 [<NoEquality;NoComparison>]
 type NodeCode<'T> = Node of Async<'T>
 
 let wrapThreadStaticInfo computation =
     async {
-        let errorLogger = CompileThreadStatic.ErrorLogger
+        let errorLogger = CompileThreadStatic.DiagnosticsLogger
         let phase = CompileThreadStatic.BuildPhase
         try
             return! computation 
         finally
-            CompileThreadStatic.ErrorLogger <- errorLogger
+            CompileThreadStatic.DiagnosticsLogger <- errorLogger
             CompileThreadStatic.BuildPhase <- phase 
     }
 
@@ -72,7 +72,7 @@ type NodeCodeBuilder() =
     member _.Using(value: CompilationGlobalsScope, binder: CompilationGlobalsScope -> NodeCode<'U>) =
         Node(
             async {
-                CompileThreadStatic.ErrorLogger <- value.ErrorLogger
+                CompileThreadStatic.DiagnosticsLogger <- value.DiagnosticsLogger
                 CompileThreadStatic.BuildPhase <- value.BuildPhase
                 try
                     return! binder value |> Async.AwaitNodeCode
@@ -90,19 +90,19 @@ type NodeCode private () =
         Node(wrapThreadStaticInfo Async.CancellationToken)
 
     static member RunImmediate (computation: NodeCode<'T>, ct: CancellationToken) =
-        let errorLogger = CompileThreadStatic.ErrorLogger
+        let errorLogger = CompileThreadStatic.DiagnosticsLogger
         let phase = CompileThreadStatic.BuildPhase
         try
             try
                 let work =
                     async {
-                        CompileThreadStatic.ErrorLogger <- errorLogger
+                        CompileThreadStatic.DiagnosticsLogger <- errorLogger
                         CompileThreadStatic.BuildPhase <- phase
                         return! computation |> Async.AwaitNodeCode
                     }
                 Async.StartImmediateAsTask(work, cancellationToken=ct).Result
             finally
-                CompileThreadStatic.ErrorLogger <- errorLogger
+                CompileThreadStatic.DiagnosticsLogger <- errorLogger
                 CompileThreadStatic.BuildPhase <- phase
         with
         | :? AggregateException as ex when ex.InnerExceptions.Count = 1 ->
@@ -112,18 +112,18 @@ type NodeCode private () =
         NodeCode.RunImmediate(computation, CancellationToken.None)
 
     static member StartAsTask_ForTesting (computation: NodeCode<'T>, ?ct: CancellationToken) =
-        let errorLogger = CompileThreadStatic.ErrorLogger
+        let errorLogger = CompileThreadStatic.DiagnosticsLogger
         let phase = CompileThreadStatic.BuildPhase
         try
             let work =
                 async {
-                    CompileThreadStatic.ErrorLogger <- errorLogger
+                    CompileThreadStatic.DiagnosticsLogger <- errorLogger
                     CompileThreadStatic.BuildPhase <- phase
                     return! computation |> Async.AwaitNodeCode
                 }
             Async.StartAsTask(work, cancellationToken=defaultArg ct CancellationToken.None)
         finally
-            CompileThreadStatic.ErrorLogger <- errorLogger
+            CompileThreadStatic.DiagnosticsLogger <- errorLogger
             CompileThreadStatic.BuildPhase <- phase
 
     static member CancellationToken = cancellationToken

diff --git a/src/fsharp/BuildGraph.fsi b/src/fsharp/BuildGraph.fsi
@@ -5,7 +5,7 @@ module internal FSharp.Compiler.BuildGraph
 open System
 open System.Threading
 open System.Threading.Tasks
-open FSharp.Compiler.ErrorLogger
+open FSharp.Compiler.DiagnosticsLogger
 open Internal.Utilities.Library
 
 /// Represents code that can be run as part of the build graph.

diff --git a/src/fsharp/CheckComputationExpressions.fs b/src/fsharp/CheckComputationExpressions.fs
@@ -9,7 +9,7 @@ open FSharp.Compiler.AccessibilityLogic
 open FSharp.Compiler.AttributeChecking
 open FSharp.Compiler.CheckExpressions
 open FSharp.Compiler.ConstraintSolver
-open FSharp.Compiler.ErrorLogger
+open FSharp.Compiler.DiagnosticsLogger
 open FSharp.Compiler.Features
 open FSharp.Compiler.Infos
 open FSharp.Compiler.InfoReader

diff --git a/src/fsharp/CheckDeclarations.fs b/src/fsharp/CheckDeclarations.fs
@@ -18,7 +18,7 @@ open FSharp.Compiler.CheckExpressions
 open FSharp.Compiler.CheckComputationExpressions
 open FSharp.Compiler.CompilerGlobalState
 open FSharp.Compiler.ConstraintSolver
-open FSharp.Compiler.ErrorLogger
+open FSharp.Compiler.DiagnosticsLogger
 open FSharp.Compiler.Features
 open FSharp.Compiler.Infos
 open FSharp.Compiler.InfoReader
@@ -35,6 +35,7 @@ open FSharp.Compiler.TcGlobals
 open FSharp.Compiler.TypedTree
 open FSharp.Compiler.TypedTreeBasics
 open FSharp.Compiler.TypedTreeOps
+open FSharp.Compiler.TypeHierarchy
 open FSharp.Compiler.TypeRelations
 
 #if !NO_TYPEPROVIDERS
@@ -374,7 +375,7 @@ let ImplicitlyOpenOwnNamespace tcSink g amap scopem enclosingNamespacePath (env:
 // Bind elements of data definitions for exceptions and types (fields, etc.)
 //------------------------------------------------------------------------- 
 
-exception NotUpperCaseConstructor of range
+exception NotUpperCaseConstructor of range: range
 
 let CheckNamespaceModuleOrTypeName (g: TcGlobals) (id: Ident) = 
     // type names '[]' etc. are used in fslib
@@ -678,7 +679,7 @@ let TcOpenDecl (cenv: cenv) mOpenDecl scopem env target =
     | SynOpenDeclTarget.Type (synType, m) ->
         TcOpenTypeDecl cenv mOpenDecl scopem env (synType, m)
 
-exception ParameterlessStructCtor of range
+exception ParameterlessStructCtor of range: range
 
 let MakeSafeInitField (g: TcGlobals) env m isStatic = 
     let id =
@@ -2290,7 +2291,7 @@ module MutRecBindingChecking =
                 let moduleAbbrevs = decls |> List.choose (function MutRecShape.ModuleAbbrev (MutRecDataForModuleAbbrev (id, mp, m)) -> Some (id, mp, m) | _ -> None)
                 let opens = decls |> List.choose (function MutRecShape.Open (MutRecDataForOpen (target, m, moduleRange, openDeclsRef)) -> Some (target, m, moduleRange, openDeclsRef) | _ -> None)
                 let lets = decls |> List.collect (function MutRecShape.Lets binds -> getVals binds | _ -> [])
-                let exns = tycons |> List.filter (fun (tycon: Tycon) -> tycon.IsExceptionDecl)
+                let exns = tycons |> List.filter (fun (tycon: Tycon) -> tycon.IsFSharpException)
 
                 // Add the type definitions, exceptions, modules and "open" declarations.
                 // The order here is sensitive. The things added first will be resolved in an environment
@@ -2475,7 +2476,7 @@ let TcMutRecDefns_Phase2 (cenv: cenv) envInitial bindsm scopem mutRecNSInfo (env
         let overridesOK = DeclKind.CanOverrideOrImplement declKind
         members |> List.collect (function
             | SynMemberDefn.Interface(interfaceType=intfTy; members=defnOpt) -> 
-                  let ty = if tcref.Deref.IsExceptionDecl then g.exn_ty else generalizedTyconRef g tcref
+                  let ty = if tcref.Deref.IsFSharpException then g.exn_ty else generalizedTyconRef g tcref
                   let m = intfTy.Range
                   if tcref.IsTypeAbbrev then error(Error(FSComp.SR.tcTypeAbbreviationsCannotHaveInterfaceDeclaration(), m))
                   if tcref.IsEnumTycon then error(Error(FSComp.SR.tcEnumerationsCannotHaveInterfaceDeclaration(), m))
@@ -2600,7 +2601,7 @@ module AddAugmentationDeclarations =
         if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare g tycon && scSet.Contains tycon.Stamp then 
             let tcref = mkLocalTyconRef tycon
             let tcaug = tycon.TypeContents
-            let ty = if tcref.Deref.IsExceptionDecl then g.exn_ty else generalizedTyconRef g tcref
+            let ty = if tcref.Deref.IsFSharpException then g.exn_ty else generalizedTyconRef g tcref
             let m = tycon.Range
             let genericIComparableTy = mkAppTy g.system_GenericIComparable_tcref [ty]
 
@@ -2623,7 +2624,7 @@ module AddAugmentationDeclarations =
 
                 PublishInterface cenv env.DisplayEnv tcref m true g.mk_IStructuralComparable_ty
                 PublishInterface cenv env.DisplayEnv tcref m true g.mk_IComparable_ty
-                if not tycon.IsExceptionDecl && not hasExplicitGenericIComparable then 
+                if not tycon.IsFSharpException && not hasExplicitGenericIComparable then 
                     PublishInterface cenv env.DisplayEnv tcref m true genericIComparableTy
                 tcaug.SetCompare (mkLocalValRef cvspec1, mkLocalValRef cvspec2)
                 tcaug.SetCompareWith (mkLocalValRef cvspec3)
@@ -2684,7 +2685,7 @@ module AddAugmentationDeclarations =
         if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals g tycon then 
             let tcref = mkLocalTyconRef tycon
             let tcaug = tycon.TypeContents
-            let ty = if tcref.Deref.IsExceptionDecl then g.exn_ty else generalizedTyconRef g tcref
+            let ty = if tcref.Deref.IsFSharpException then g.exn_ty else generalizedTyconRef g tcref
             let m = tycon.Range
 
             // Note: tycon.HasOverride only gives correct results after we've done the type augmentation 
@@ -2701,7 +2702,7 @@ module AddAugmentationDeclarations =
 
                  let vspec1, vspec2 = AugmentWithHashCompare.MakeValsForEqualsAugmentation g tcref
                  tcaug.SetEquals (mkLocalValRef vspec1, mkLocalValRef vspec2)
-                 if not tycon.IsExceptionDecl then 
+                 if not tycon.IsFSharpException then 
                     PublishInterface cenv env.DisplayEnv tcref m true (mkAppTy g.system_GenericIEquatable_tcref [ty])
                  PublishValueDefn cenv env ModuleOrMemberBinding vspec1
                  PublishValueDefn cenv env ModuleOrMemberBinding vspec2
@@ -4606,7 +4607,7 @@ module EstablishTypeDefinitionCores =
             (envMutRecPrelim, withAttrs) 
             ||> MutRecShapes.extendEnvs (fun envForDecls decls -> 
                     let tycons = decls |> List.choose (function MutRecShape.Tycon (_, Some (tycon, _)) -> Some tycon | _ -> None) 
-                    let exns = tycons |> List.filter (fun tycon -> tycon.IsExceptionDecl) 
+                    let exns = tycons |> List.filter (fun tycon -> tycon.IsFSharpException) 
                     let envForDecls = (envForDecls, exns) ||> List.fold (AddLocalExnDefnAndReport cenv.tcSink scopem)
                     envForDecls)
 

diff --git a/src/fsharp/CheckDeclarations.fsi b/src/fsharp/CheckDeclarations.fsi
@@ -74,6 +74,6 @@ val CheckOneSigFile:
         ParsedSigFileInput ->
             Cancellable<TcEnv * ModuleOrNamespaceType * bool>
 
-exception ParameterlessStructCtor of range
+exception ParameterlessStructCtor of range: range
 
-exception NotUpperCaseConstructor of range
+exception NotUpperCaseConstructor of range: range