temp

Author: KevinRansom

tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Directives/Directives.fs

@@ -25,6 +25,7 @@ module Directives =
 
     let compileAndRunAsFsxShouldSucceed compilation =
         compilation
+        |> asFsx
         |> withNoWarn 988
         |> runFsi
         |> shouldSucceed
@@ -36,20 +37,6 @@ module Directives =
         |> compileExeAndRun
         |> shouldSucceed
 
-
-//Directives.fs
-//dummy.fsx
-//dummy2.fsx
-//env.lst
-//E_R_01.fsx
-//E_ShebangLocation.fsx
-//load_script_with_multiple_nowarn01.fsx
-//multiple_nowarn01.fsx
-//multiple_nowarn02.fsx
-//multiple_nowarn_many.fs
-//multiple_nowarn_one.fs
-
-
     [<FileInlineData("dummy.fsx")>]
     [<FileInlineData("dummy2.fsx")>]
     [<FileInlineData("load_script_with_multiple_nowarn01.fsx")>]
@@ -79,9 +66,9 @@ module Directives =
     let ``E_R_01_fsx`` compilation =
         compilation
         |> getCompilation
-        |> compileAndRunAsFsxShouldSucceed
+        |> compileAndRunAsFsxShouldSucceed        /// Should be succeed with diagnostics
         |> withDiagnostics [
-            (Error 517, Line 9, Col 1, Line 9, Col 3, "End of file in string embedded in comment begun at or before here")
+            (Warning 3353, Line 5, Col 1, Line 5, Col 14, "Invalid directive '#R somefile'")
         ]
 
     [<Theory; FileInlineData("E_ShebangLocation.fsx")>]
@@ -91,42 +78,3 @@ module Directives =
         |> shouldFailWithDiagnostics [
             (Error 0, Line 3, Col 1, Line 3, Col 4, "#! may only appear as the first line at the start of a file.")
         ]
-
-//    [<Theory; FileInlineData("E_ocamlstyle_nested006.fsx")>]
-//    let ``E_ocamlstyle_nested006_fsx`` compilation =
-//        compilation
-//        |> getCompilation
-//        |> shouldFailWithDiagnostics [
-//            (Error 58, Line 14, Col 1, Line 14, Col 1, """Unexpected syntax or possible incorrect indentation: this token is offside of context started at position (9:1). Try indenting this further.
-//To continue using non-conforming indentation, pass the '--strict-indentation-' flag to the compiler, or set the language version to F# 7.""")
-//            (Error 10, Line 14, Col 1, Line 14, Col 1, "Incomplete structured construct at or before this point in binding")
-//            (Error 516, Line 9, Col 10, Line 9, Col 12, "End of file in comment begun at or before here")
-//        ]
-//
-//    [<Theory; FileInlineData("E_ocamlstyle_nested007.fsx")>]
-//    let ``E_ocamlstyle_nested007_fsx`` compilation =
-//        compilation
-//        |> getCompilation
-//        |> shouldFailWithDiagnostics [
-//            (Error 10, Line 12, Col 47, Line 14, Col 18, "Unexpected string literal in binding. Expected incomplete structured construct at or before this point or other token.")
-//            (Error 3118, Line 10, Col 1, Line 10, Col 4, "Incomplete value or function definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let' keyword.")
-//            (Error 3156, Line 14, Col 19, Line 14, Col 20, "Unexpected token '*' or incomplete expression")
-//            (Error 10, Line 14, Col 20, Line 14, Col 21, "Unexpected symbol ')' in implementation file")
-//        ]
-//
-//    [<Theory; FileInlineData("E_star02.fsx")>]
-//    let ``E_star02_fsx`` compilation =
-//        compilation
-//        |> getCompilation
-//        |> shouldFailWithDiagnostics [
-//            (Error 10, Line 8, Col 4, Line 8, Col 5, "Unexpected symbol ')' in implementation file")
-//        ]
-//
-//    [<Theory; FileInlineData("E_IncompleteComment01.fsx")>]
-//    let ``E_star02E_IncompleteComment01_fsx`` compilation =
-//        compilation
-//        |> getCompilation
-//        |> shouldFailWithDiagnostics [
-//            (Error 10, Line 18, Col 1, Line 18, Col 1, "Incomplete structured construct at or before this point in binding")
-//            (Error 516, Line 9, Col 5, Line 9, Col 7, "End of file in comment begun at or before here")
-//        ]

tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals/NumericLiterals.fs

@@ -38,6 +38,7 @@ module NumericLiterals =
         |> getCompilation
         |> shouldSucceed
 
+#if NETFRAMEWORK
     [<Theory;FileInlineData("E_BigIntConversion01.fsx")>]
     let ``E_BigIntConversion01_fsx`` compilation =
         compilation
@@ -53,6 +54,7 @@ module NumericLiterals =
         |> shouldFailWithDiagnostics [
             (Error 1, Line 8, Col 14, Line 8, Col 17, "The type 'System.Numerics.BigInteger' does not support a conversion to the type 'char'")
         ]
+#endif
 
     [<Theory;FileInlineData("E_BigNumNotImpl01.fsx")>]
     let ``E_BigNumNotImpl01_fsx`` compilation =

tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic/DynamicTypeTest.fsx

@@ -21,26 +21,26 @@ let printMeasure x =
 
 let testSprocket() =
     let ret1 = printMeasure 1.23<sprocket>
-    if ret1 <> "float sprocket with value 1.23" then exit 1
+    if ret1 <> "float sprocket with value 1.23" then ignore 1
 
     let ret2 = printMeasure 0.001f<sprocket>
-    if ret2 <> "float32 sprocket with value 0.001" then exit 1
+    if ret2 <> "float32 sprocket with value 0.001" then ignore 1
 
     let ret3 = printMeasure 1e3m<sprocket>
-    if ret3 <> "decimal sprocket with value 1000" then exit 1
+    if ret3 <> "decimal sprocket with value 1000" then ignore 1
 
 let testWidget() =
     // NOTE: that currently, measures are ignored at runtime. See bug 3688.
     let ret1 = printMeasure 1.23<widget>
-    if ret1 <> "float sprocket with value 1.23" then exit 1
+    if ret1 <> "float sprocket with value 1.23" then ignore 1
 
     let ret2 = printMeasure 0.001f<widget>
-    if ret2 <> "float32 sprocket with value 0.001" then exit 1
+    if ret2 <> "float32 sprocket with value 0.001" then ignore 1
 
     let ret3 = printMeasure 1e3m<widget>
-    if ret3 <> "decimal sprocket with value 1000" then exit 1    
+    if ret3 <> "decimal sprocket with value 1000" then ignore 1    
 
 testSprocket()
 testWidget()
 
-exit 0
+ignore 0

tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic/Ints01.fsx

@@ -17,5 +17,5 @@ let factoryRate2 = makeWidget16() / 1s<s>
 let factoryRate3 = makeWidget32() / 1<s>
 let factoryRate4 = makeWidget64() / 1L<s>
 
-exit 0
+ignore 0
 

tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic/Mars.fsx

@@ -40,4 +40,4 @@ let lbfToN (force:float<lbf>) = force * 0.224809<N/lbf>
 
 do applyThruster(lbfToN(3.0<lbf>))
 
-exit 0
+ignore 0

tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic/Misc04.fsx

@@ -7,8 +7,8 @@ let a : decimal<1> = ceil 4.4M<1>
 let b : decimal<1> = floor 4.4M<1> 
 let c : decimal<1> = round 4.4M<1>
 
-if a <> 5.0M then exit 1
-if b <> 4.0M then exit 1
-if c <> 4.0M then exit 1
+if a <> 5.0M then ignore 1
+if b <> 4.0M then ignore 1
+if c <> 4.0M then ignore 1
 
-exit 0
+ignore 0

tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic/OnDecimals01.fsx

@@ -13,20 +13,20 @@ let widgetsPerSprocket = 5.0M<Widgets> / 1.25M<Sprockets>
 
 // Addition
 let addition =
-    if widgetsPerSprocket + widgetsPerSprocket <> (10.0M / 1.25M) * 1M<Widgets / Sprockets> then exit 1
+    if widgetsPerSprocket + widgetsPerSprocket <> (10.0M / 1.25M) * 1M<Widgets / Sprockets> then ignore 1
 
 // Multiplication
 let multiplication = 
     let x = 2.50000000M<Sprockets>
-    if x * widgetsPerSprocket <> 10.0M<Widgets> then exit 1
+    if x * widgetsPerSprocket <> 10.0M<Widgets> then ignore 1
 
 // Subtraction
 let subtraction = 
-    if widgetsPerSprocket - widgetsPerSprocket <> 0.0M<Widgets / Sprockets> then exit 1
+    if widgetsPerSprocket - widgetsPerSprocket <> 0.0M<Widgets / Sprockets> then ignore 1
 
 // Division
 let division =
-    if widgetsPerSprocket / 5.0M<Widgets> <> (1.0M / 1.25M) * 1M<Sprockets^-1> then exit 1
+    if widgetsPerSprocket / 5.0M<Widgets> <> (1.0M / 1.25M) * 1M<Sprockets^-1> then ignore 1
 
-exit 0
+ignore 0
 

tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker/TypeConstraint02.fsx

@@ -8,4 +8,4 @@ let f<'a,'b when 'a : struct>() = 1
 
 let x = f<float<m>,float>() 
 
-exit 0
+ignore 0

tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker/ValueRestriction01.fsx

@@ -6,6 +6,6 @@ let differentiate (h:float<_>) f x = (f(x+h) - f(x-h)) / (2.0*h)
 
 let f (x : float<_>) = x * x
 
-if (differentiate 2.0<1> f 2.0) <> 4.0 then exit 1
+if (differentiate 2.0<1> f 2.0) <> 4.0 then ignore 1
 
-exit 0
+ignore 0

tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker/W_TypeConstraint01.fsx

@@ -8,6 +8,6 @@
 
 let f ( x:float<'u> ) : float<'v> = x * 1.0<_>
 
-if (f 3.5<kg>) <> 3.5<kg> then exit 1
+if (f 3.5<kg>) <> 3.5<kg> then ignore 1
 
-exit 0
+ignore 0

tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/WithOOP/Polymorphism02.fsx

@@ -11,6 +11,6 @@ type Unit<[<Measure>] 'a >() =
 [<Measure>] type kg
 
 let objUnit = new Unit<kg>()
-if objUnit.Factor() <> 1.0 then exit 1
+if objUnit.Factor() <> 1.0 then ignore 1
 
 ignore 0

tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/WithOOP/StaticsOnMeasure01.fsx

@@ -8,7 +8,7 @@ type kg =
     static member Prop = 5
     static member Func x = x + 1
 
-if kg.Prop <> 5 then exit 1
-if kg.Func 3 <> 4 then exit 1
+if kg.Prop <> 5 then ignore 1
+if kg.Func 3 <> 4 then ignore 1
 
 ignore 0

tests/FSharp.Test.Utilities/Compiler.fs

@@ -1179,7 +1179,11 @@ module rec Compiler =
     let runFsi (cUnit: CompilationUnit) : CompilationResult =
         match cUnit with
         | FS fs ->
-            let source = fs.Source.GetSourceText |> Option.defaultValue ""
+            let source =
+                match fs.Source.GetSourceText with
+                | Some text -> text
+                | None -> File.ReadAllText(fs.Source.GetSourceFileName)
+
             let name = fs.Name |> Option.defaultValue "unnamed"
             let options = fs.Options |> Array.ofList
             let outputDirectory =
@@ -1204,23 +1208,30 @@ module rec Compiler =
                                 opts.Add($"-I:\"{(outputDirectory.Value.FullName)}\"")
                     | _ -> ()
                 opts.ToArray()
-            let errors, stdOut, stdErr = CompilerAssert.RunScriptWithOptionsAndReturnResult options source
+            let diagnostics, messages, stdOut, stdErr = CompilerAssert.RunScriptWithOptionsAndReturnResult options source
+            let errorCount, diagnostics =
+                let errors, warnings =
+                    diagnostics
+                    |> fromFSharpDiagnostic
+                    |> List.map snd
+                    |> List.partition(fun d -> d.Error.IsError)
+                errors.Length, errors @ warnings
 
             let mkResult output =
               { OutputPath   = None
                 Dependencies = []
                 Adjust       = 0
-                Diagnostics  = []
+                Diagnostics  = diagnostics
                 PerFileErrors= []
                 Output       = Some output
                 Compilation  = cUnit }
 
-            if errors.Count = 0 then
+            if errorCount = 0 then
                 let output =
                     ExecutionOutput { Outcome = NoExitCode; StdOut = stdOut; StdErr = stdErr }
                 CompilationResult.Success (mkResult output)
             else
-                let err = (errors |> String.concat "\n").Replace("\r\n","\n")
+                let err = (messages |> String.concat "\n").Replace("\r\n","\n")
                 let output =
                     ExecutionOutput {Outcome = NoExitCode; StdOut = String.Empty; StdErr = err }
                 CompilationResult.Failure (mkResult output)

tests/FSharp.Test.Utilities/CompilerAssert.fs

@@ -440,7 +440,7 @@ module CompilerAssertHelpers =
         let errors, ex = checker.Compile args |> Async.RunImmediate
         errors, ex, outputFilePath
 
-    let compileDisposable (outputDirectory:DirectoryInfo) isExe options targetFramework nameOpt (sources:SourceCodeFileKind list) =
+    let compileDisposable (outputDirectory: DirectoryInfo) isExe options targetFramework nameOpt (sources: SourceCodeFileKind list) =
         let name =
             match nameOpt with
             | Some name -> name
@@ -1002,14 +1002,21 @@ Updated automatically, please check diffs in your pull request, changes must be
         errors
         |> Seq.iter (fun error -> errorMessages.Add(error.Message))
 
-        match ch with
-        | Choice2Of2 ex -> errorMessages.Add(ex.Message)
-        | _ -> ()
-
-        errorMessages, string outStream, string errStream
+        let errors =
+            match ch with
+            | Choice2Of2 ex ->
+                errorMessages.Add(ex.Message)
+                errors
+                |> Array.append [|
+                    FSharpDiagnostic.Create(FSharpDiagnosticSeverity.Error, ex.Message, 9999, Range.Zero, subcategory="ScriptException")
+                |]
+            | _ -> errors
+
+        // TODO: clean up errormessages and diagnostics.  No need for two returns of similar data.
+        errors, errorMessages, string outStream, string errStream
 
     static member RunScriptWithOptions options (source: string) (expectedErrorMessages: string list) =
-        let errorMessages, _, _ = CompilerAssert.RunScriptWithOptionsAndReturnResult options source
+        let _diagnostics, errorMessages, _, _ = CompilerAssert.RunScriptWithOptionsAndReturnResult options source
         if expectedErrorMessages.Length <> errorMessages.Count then
             Assert.Fail(sprintf "Expected error messages: %A \n\n Actual error messages: %A" expectedErrorMessages errorMessages)
         else