Merge pull request #516 from dsyme/add-test-1

add fix and test for 483

Author: dsyme

src/fsharp/CompileOps.fs

@@ -4235,9 +4235,16 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
             | None ->      
 
                 if tcConfigP.Get().useMonoResolution then
-                    let resolved = [tcConfig.ResolveLibWithDirectories CcuLoadFailureAction.RaiseError assemblyReference |> Option.get]
-                    resolutions <- resolutions.AddResolutionResults resolved
-                    ResultD resolved
+                    let action = 
+                        match mode with 
+                        | ResolveAssemblyReferenceMode.ReportErrors -> CcuLoadFailureAction.RaiseError
+                        | ResolveAssemblyReferenceMode.Speculative -> CcuLoadFailureAction.ReturnNone
+                    match tcConfig.ResolveLibWithDirectories action assemblyReference with 
+                    | Some resolved -> 
+                        resolutions <- resolutions.AddResolutionResults [resolved]
+                        ResultD [resolved]
+                    | None -> 
+                        ErrorD(AssemblyNotResolved(assemblyReference.Text,assemblyReference.Range))
                 else 
                     // This is a previously unencounterd assembly. Resolve it and add it to the list.
                     // But don't cache resolution failures because the assembly may appear on the disk later.
@@ -5111,3 +5118,4 @@ let TypeCheckClosedInputSet (checkForErrors, tcConfig, tcImports, tcGlobals, pre
 
 
 
+

tests/fsharp/core/attributes/test.fsx

@@ -1342,6 +1342,20 @@ module ParamArrayNullAttribute =
     check "vwcewecioj9" (test3()) "Attr(<null>)"
 
 
+// See https://github.com/fsharp/fsharp/issues/483
+// We do not expect an exception
+module TestFsiLoadOfNonExistentAssembly = 
+    let test() = 
+      try 
+        let log4netType = System.Type.GetType("ThisTypeDoes.Not.Exist, thisAssemblyDoesNotExist")
+        let exists = log4netType <> null
+        if exists then report_failure (sprintf "type existed!")
+        do printfn "%A" exists
+       with e -> 
+         report_failure (sprintf "exception unexpected: %s" e.Message)
+
+    do test()
+
 
 (*-------------------------------------------------------------------------
 !* Test passed?

tests/fsharp/core/fsiAndModifiers/test.fsx

@@ -86,7 +86,6 @@ module TestPack4 =
     printfn "got %A" got
     if got <> expected then fail (sprintf "TestPack4: got %A, expected %A" got expected)
 
-
 if errors.IsEmpty then 
     System.IO.File.WriteAllText("test.ok", "")
 else