wip

Author: DedSec256

src/Compiler/Driver/CompilerDiagnostics.fs

@@ -405,14 +405,8 @@ type PhasedDiagnostic with
                 (severity = FSharpDiagnosticSeverity.Info && level > 0)
                 || (severity = FSharpDiagnosticSeverity.Warning && level >= x.WarningLevel)
 
-type PhasedDiagnosticWithSeverity with
     member x.AdjustSeverity(options) =
-        let {
-                PhasedDiagnostic = x
-                Severity = severity
-            } =
-            x
-
+        let severity = x.Severity
         let n = x.Number
 
         let localWarnon () = WarnScopes.IsWarnon options n x.Range
@@ -2014,7 +2008,7 @@ type PhasedDiagnostic with
             x.Exception.Output(buf, suggestNames)
             let message = buf.ToString()
             let exn = DiagnosticWithText(x.Number, message, m)
-            { Exception = exn; Phase = x.Phase }
+            { x with Exception = exn }
         | None -> x
 
 let SanitizeFileName fileName implicitIncludeDir =
@@ -2320,7 +2314,7 @@ type DiagnosticsLoggerFilteringByScopedNowarn(diagnosticOptions: FSharpDiagnosti
 
     let mutable realErrorPresent = false
 
-    override _.DiagnosticSink(diagnostic: PhasedDiagnosticWithSeverity) =
+    override _.DiagnosticSink(diagnostic: PhasedDiagnostic) =
 
         if diagnostic.Severity = FSharpDiagnosticSeverity.Error then
             realErrorPresent <- true

src/Compiler/Driver/CompilerDiagnostics.fsi

@@ -59,7 +59,10 @@ type PhasedDiagnostic with
 
     /// Format the core of the diagnostic as a string. Doesn't include the range information.
     member FormatCore: flattenErrors: bool * suggestNames: bool -> string
-
+    
+    /// Compute new severity according to the various diagnostics options
+    member AdjustSeverity: FSharpDiagnosticOptions -> FSharpDiagnosticSeverity
+    
     /// Output all of a diagnostic to a buffer, including range
     member Output: buf: StringBuilder * tcConfig: TcConfig * severity: FSharpDiagnosticSeverity -> unit
 
@@ -72,10 +75,6 @@ type PhasedDiagnostic with
         severity: FSharpDiagnosticSeverity ->
             unit
 
-type PhasedDiagnosticWithSeverity with
-    /// Compute new severity according to the various diagnostics options
-    member AdjustSeverity: FSharpDiagnosticOptions -> FSharpDiagnosticSeverity
-
 /// Get a diagnostics logger that filters the reporting of warnings based on scoped pragma information
 val GetDiagnosticsLoggerFilteringByScopedNowarn:
     diagnosticOptions: FSharpDiagnosticOptions * diagnosticsLogger: DiagnosticsLogger -> DiagnosticsLogger

src/Compiler/Driver/ScriptClosure.fs

@@ -29,8 +29,8 @@ type LoadClosureInput =
     {
         FileName: string
         SyntaxTree: ParsedInput option
-        ParseDiagnostics: PhasedDiagnosticWithSeverity list
-        MetaCommandDiagnostics: PhasedDiagnosticWithSeverity list
+        ParseDiagnostics: PhasedDiagnostic list
+        MetaCommandDiagnostics: PhasedDiagnostic list
     }
 
 [<RequireQualifiedAccess>]
@@ -64,13 +64,13 @@ type LoadClosure =
         OriginalLoadReferences: (range * string * string) list
 
         /// Diagnostics seen while processing resolutions
-        ResolutionDiagnostics: PhasedDiagnosticWithSeverity list
+        ResolutionDiagnostics: PhasedDiagnostic list
 
         /// Diagnostics seen while parsing root of closure
-        AllRootFileDiagnostics: PhasedDiagnosticWithSeverity list
+        AllRootFileDiagnostics: PhasedDiagnostic list
 
         /// Diagnostics seen while processing the compiler options implied root of closure
-        LoadClosureRootFileDiagnostics: PhasedDiagnosticWithSeverity list
+        LoadClosureRootFileDiagnostics: PhasedDiagnostic list
     }
 
 [<RequireQualifiedAccess>]
@@ -91,8 +91,8 @@ module ScriptPreprocessClosure =
             fileName: string *
             range: range *
             parsedInput: ParsedInput option *
-            parseDiagnostics: PhasedDiagnosticWithSeverity list *
-            metaDiagnostics: PhasedDiagnosticWithSeverity list
+            parseDiagnostics: PhasedDiagnostic list *
+            metaDiagnostics: PhasedDiagnostic list
 
     type Observed() =
         let seen = Dictionary<_, bool>()
@@ -594,8 +594,7 @@ module ScriptPreprocessClosure =
             | None -> true
 
         // Filter out non-root errors and warnings
-        let allRootDiagnostics =
-            allRootDiagnostics |> List.filter (isRootRange << _.PhasedDiagnostic)
+        let allRootDiagnostics = allRootDiagnostics |> List.filter isRootRange
 
         {
             SourceFiles = List.groupBy fst sourceFiles |> List.map (map2Of2 (List.map snd))

src/Compiler/Driver/ScriptClosure.fsi

@@ -26,9 +26,9 @@ type LoadClosureInput =
 
       SyntaxTree: ParsedInput option
 
-      ParseDiagnostics: PhasedDiagnosticWithSeverity list
+      ParseDiagnostics: PhasedDiagnostic list
 
-      MetaCommandDiagnostics: PhasedDiagnosticWithSeverity list }
+      MetaCommandDiagnostics: PhasedDiagnostic list }
 
 [<RequireQualifiedAccess>]
 type LoadClosure =
@@ -61,13 +61,13 @@ type LoadClosure =
         OriginalLoadReferences: (range * string * string) list
 
         /// Diagnostics seen while processing resolutions
-        ResolutionDiagnostics: PhasedDiagnosticWithSeverity list
+        ResolutionDiagnostics: PhasedDiagnostic list
 
         /// Diagnostics to show for root of closure (used by fsc.fs)
-        AllRootFileDiagnostics: PhasedDiagnosticWithSeverity list
+        AllRootFileDiagnostics: PhasedDiagnostic list
 
         /// Diagnostics seen while processing the compiler options implied root of closure
-        LoadClosureRootFileDiagnostics: PhasedDiagnosticWithSeverity list
+        LoadClosureRootFileDiagnostics: PhasedDiagnostic list
     }
 
     /// Analyze a script text and find the closure of its references.

src/Compiler/Driver/fsc.fs

@@ -76,26 +76,25 @@ type DiagnosticsLoggerUpToMaxErrors(tcConfigB: TcConfigBuilder, exiter: Exiter,
 
     override x.DiagnosticSink(diagnostic) =
         let tcConfig = TcConfig.Create(tcConfigB, validate = false)
-        let phasedDiagnostic = diagnostic.PhasedDiagnostic
 
         match diagnostic.AdjustSeverity(tcConfig.diagnosticsOptions) with
         | FSharpDiagnosticSeverity.Error ->
             if errors >= tcConfig.maxErrors then
                 x.HandleTooManyErrors(FSComp.SR.fscTooManyErrors ())
                 exiter.Exit 1
 
-            x.HandleIssue(tcConfig, phasedDiagnostic, FSharpDiagnosticSeverity.Error)
+            x.HandleIssue(tcConfig, diagnostic, FSharpDiagnosticSeverity.Error)
 
             errors <- errors + 1
 
-            match phasedDiagnostic.Exception, tcConfigB.simulateException with
+            match diagnostic.Exception, tcConfigB.simulateException with
             | InternalError(msg, _), None
-            | Failure msg, None -> Debug.Assert(false, sprintf "Bug in compiler: %s\n%s" msg (phasedDiagnostic.ToString()))
-            | :? KeyNotFoundException, None -> Debug.Assert(false, sprintf "Lookup exception in compiler: %s" (phasedDiagnostic.ToString()))
+            | Failure msg, None -> Debug.Assert(false, sprintf "Bug in compiler: %s\n%s" msg (diagnostic.ToString()))
+            | :? KeyNotFoundException, None -> Debug.Assert(false, sprintf "Lookup exception in compiler: %s" (diagnostic.ToString()))
             | _ -> ()
 
         | FSharpDiagnosticSeverity.Hidden -> ()
-        | s -> x.HandleIssue(tcConfig, phasedDiagnostic, s)
+        | s -> x.HandleIssue(tcConfig, diagnostic, s)
 
 /// Create an error logger that counts and prints errors
 let ConsoleDiagnosticsLogger (tcConfigB: TcConfigBuilder, exiter: Exiter) =

src/Compiler/Driver/fsc.fsi

@@ -39,7 +39,7 @@ type DiagnosticsLoggerUpToMaxErrors =
 
     override ErrorCount: int
 
-    override DiagnosticSink: diagnostic: PhasedDiagnosticWithSeverity -> unit
+    override DiagnosticSink: diagnostic: PhasedDiagnostic -> unit
 
 /// The main (non-incremental) compilation entry point used by fsc.exe
 val CompileFromCommandLineArguments:

src/Compiler/Facilities/DiagnosticsLogger.fs

@@ -286,10 +286,12 @@ type PhasedDiagnostic =
     {
         Exception: exn
         Phase: BuildPhase
+        Severity: FSharpDiagnosticSeverity
+        DefaultSeverity: FSharpDiagnosticSeverity
     }
 
     /// Construct a phased error
-    static member Create(exn: exn, phase: BuildPhase) : PhasedDiagnostic = { Exception = exn; Phase = phase }
+    static member Create(exn: exn, phase: BuildPhase, severity: FSharpDiagnosticSeverity) : PhasedDiagnostic = { Exception = exn; Phase = phase; Severity = severity; DefaultSeverity = severity }
 
     member this.DebugDisplay() =
         sprintf "%s: %s" (this.Subcategory()) this.Exception.Message
@@ -348,28 +350,14 @@ type PhasedDiagnostic =
         | BuildPhase.TypeCheck -> true
         | _ -> false
 
-type PhasedDiagnosticWithSeverity =
-    {
-        PhasedDiagnostic: PhasedDiagnostic
-        Severity: FSharpDiagnosticSeverity
-        DefaultSeverity: FSharpDiagnosticSeverity
-    }
-
-    static member Create(phasedDiagnostic, severity) =
-        {
-            PhasedDiagnostic = phasedDiagnostic
-            Severity = severity
-            DefaultSeverity = severity
-        }
-
 [<AbstractClass>]
 [<DebuggerDisplay("{DebugDisplay()}")>]
 type DiagnosticsLogger(nameForDebugging: string) =
     abstract ErrorCount: int
 
     // The 'Impl' factoring enables a developer to place a breakpoint at the non-Impl
     // code just below and get a breakpoint for all error logger implementations.
-    abstract DiagnosticSink: diagnostic: PhasedDiagnosticWithSeverity -> unit
+    abstract DiagnosticSink: diagnostic: PhasedDiagnostic -> unit
 
     member x.CheckForErrors() = (x.ErrorCount > 0)
 
@@ -401,10 +389,7 @@ type CapturingDiagnosticsLogger(nm, ?eagerFormat) =
         let diagnostic =
             match eagerFormat with
             | None -> diagnostic
-            | Some f ->
-                { diagnostic with
-                    PhasedDiagnostic = f diagnostic.PhasedDiagnostic
-                }
+            | Some f -> f diagnostic
 
         if diagnostic.Severity = FSharpDiagnosticSeverity.Error then
             errorCount <- errorCount + 1
@@ -475,13 +460,8 @@ module DiagnosticsLoggerExtensions =
                 PreserveStackTrace exn
                 raise exn
             | _ ->
-                let phasedDiagnostic =
-                    PhasedDiagnostic.Create(exn, DiagnosticsThreadStatics.BuildPhase)
-
-                let diagnosticWithSeverity =
-                    PhasedDiagnosticWithSeverity.Create(phasedDiagnostic, severity)
-
-                x.DiagnosticSink(diagnosticWithSeverity)
+                let diagnostic =PhasedDiagnostic.Create(exn, DiagnosticsThreadStatics.BuildPhase, severity)
+                x.DiagnosticSink(diagnostic)
 
         member x.ErrorR exn =
             x.EmitDiagnostic(exn, FSharpDiagnosticSeverity.Error)
@@ -497,10 +477,7 @@ module DiagnosticsLoggerExtensions =
             raise (ReportedError(Some exn))
 
         member x.SimulateError(diagnostic) =
-            let diagnosticWithSeverity =
-                PhasedDiagnosticWithSeverity.Create(diagnostic, FSharpDiagnosticSeverity.Error)
-
-            x.DiagnosticSink(diagnosticWithSeverity)
+            x.DiagnosticSink(diagnostic)
             raise (ReportedError(Some diagnostic.Exception))
 
         member x.ErrorRecovery (exn: exn) (m: range) =
@@ -613,12 +590,6 @@ let simulateError diagnostic =
 let diagnosticSink diagnostic =
     DiagnosticsThreadStatics.DiagnosticsLogger.DiagnosticSink(diagnostic)
 
-let errorSink diagnostic =
-    diagnosticSink (PhasedDiagnosticWithSeverity.Create(diagnostic, FSharpDiagnosticSeverity.Error))
-
-let warnSink diagnostic =
-    diagnosticSink (PhasedDiagnosticWithSeverity.Create(diagnostic, FSharpDiagnosticSeverity.Warning))
-
 let errorRecovery exn m =
     DiagnosticsThreadStatics.DiagnosticsLogger.ErrorRecovery exn m
 

src/Compiler/Facilities/DiagnosticsLogger.fsi

@@ -178,10 +178,12 @@ module BuildPhaseSubcategory =
 
 type PhasedDiagnostic =
     { Exception: exn
-      Phase: BuildPhase }
+      Phase: BuildPhase
+      Severity: FSharpDiagnosticSeverity
+      DefaultSeverity: FSharpDiagnosticSeverity }
 
     /// Construct a phased error
-    static member Create: exn: exn * phase: BuildPhase -> PhasedDiagnostic
+    static member Create: exn: exn * phase: BuildPhase * severity: FSharpDiagnosticSeverity -> PhasedDiagnostic
 
     /// Return true if the textual phase given is from the compile part of the build process.
     /// This set needs to be equal to the set of subcategories that the language service can produce.
@@ -199,14 +201,6 @@ type PhasedDiagnostic =
     ///
     member Subcategory: unit -> string
 
-type PhasedDiagnosticWithSeverity =
-    { PhasedDiagnostic: PhasedDiagnostic
-      Severity: FSharpDiagnosticSeverity
-      DefaultSeverity: FSharpDiagnosticSeverity }
-
-    static member Create:
-        phasedDiagnostic: PhasedDiagnostic * severity: FSharpDiagnosticSeverity -> PhasedDiagnosticWithSeverity
-
 /// Represents a capability to log diagnostics
 [<AbstractClass>]
 type DiagnosticsLogger =
@@ -216,7 +210,7 @@ type DiagnosticsLogger =
     member DebugDisplay: unit -> string
 
     /// Emit a diagnostic to the logger
-    abstract DiagnosticSink: diagnostic: PhasedDiagnosticWithSeverity -> unit
+    abstract DiagnosticSink: diagnostic: PhasedDiagnostic -> unit
 
     /// Get the number of error diagnostics reported
     abstract ErrorCount: int
@@ -243,9 +237,9 @@ type CapturingDiagnosticsLogger =
 
     member CommitDelayedDiagnostics: diagnosticsLogger: DiagnosticsLogger -> unit
 
-    override DiagnosticSink: diagnostic: PhasedDiagnosticWithSeverity -> unit
+    override DiagnosticSink: diagnostic: PhasedDiagnostic -> unit
 
-    member Diagnostics: PhasedDiagnosticWithSeverity list
+    member Diagnostics: PhasedDiagnostic list
 
     override ErrorCount: int
 
@@ -321,11 +315,7 @@ val informationalWarning: exn: exn -> unit
 
 val simulateError: diagnostic: PhasedDiagnostic -> 'T
 
-val diagnosticSink: diagnostic: PhasedDiagnosticWithSeverity -> unit
-
-val errorSink: diagnostic: PhasedDiagnostic -> unit
-
-val warnSink: diagnostic: PhasedDiagnostic -> unit
+val diagnosticSink: diagnostic: PhasedDiagnostic -> unit
 
 val errorRecovery: exn: exn -> m: range -> unit
 

src/Compiler/Interactive/fsi.fs

@@ -898,17 +898,11 @@ type internal DiagnosticsLoggerThatStopsOnFirstError
     member _.ResetErrorCount() = errorCount <- 0
 
     override _.DiagnosticSink(diagnostic) =
-        let {
-                PhasedDiagnostic = phasedDiagnostic
-                Severity = severity
-            } =
-            diagnostic
-
         let tcConfig = TcConfig.Create(tcConfigB, validate = false)
 
         match diagnostic.AdjustSeverity(tcConfig.diagnosticsOptions) with
         | FSharpDiagnosticSeverity.Error ->
-            fsiStdinSyphon.PrintDiagnostic(tcConfig, phasedDiagnostic)
+            fsiStdinSyphon.PrintDiagnostic(tcConfig, diagnostic)
             errorCount <- errorCount + 1
 
             if tcConfigB.abortOnError then
@@ -919,7 +913,7 @@ type internal DiagnosticsLoggerThatStopsOnFirstError
         | FSharpDiagnosticSeverity.Info as adjustedSeverity ->
             DoWithDiagnosticColor adjustedSeverity (fun () ->
                 fsiConsoleOutput.Error.WriteLine()
-                phasedDiagnostic.WriteWithContext(fsiConsoleOutput.Error, "  ", fsiStdinSyphon.GetLine, tcConfig, severity)
+                diagnostic.WriteWithContext(fsiConsoleOutput.Error, "  ", fsiStdinSyphon.GetLine, tcConfig, diagnostic.Severity)
                 fsiConsoleOutput.Error.WriteLine()
                 fsiConsoleOutput.Error.WriteLine()
                 fsiConsoleOutput.Error.Flush())