fix load closure

Author: dsyme

src/fsharp/vs/service.fs

@@ -3007,7 +3007,7 @@ type FsiInteractiveChecker(referenceResolver, reactorOps: IReactorOperations, tc
 
     member __.ParseAndCheckInteraction (source) =
 
-        let mainInputFileName = "stdin.fsx" 
+        let mainInputFileName = Path.Combine(tcConfig.implicitIncludeDir, "stdin.fsx")
         // Note: projectSourceFiles is only used to compute isLastCompiland, and is ignored if Build.IsScript(mainInputFileName) is true (which it is in this case).
         let projectSourceFiles = [ ]
         let parseErrors, _matchPairs, inputOpt, anyErrors = Parser.ParseOneFile (source, false, true, mainInputFileName, projectSourceFiles, tcConfig)
@@ -3018,7 +3018,7 @@ type FsiInteractiveChecker(referenceResolver, reactorOps: IReactorOperations, tc
             let fsiCompilerOptions = CompileOptions.GetCoreFsiCompilerOptions tcConfigB 
             CompileOptions.ParseCompilerOptions (ignore, fsiCompilerOptions, [ ])
 
-        let loadClosure = LoadClosure.ComputeClosureOfSourceText(referenceResolver,mainInputFileName, source, CodeContext.Editing, tcConfig.useSimpleResolution, tcConfig.useFsiAuxLib, new Lexhelp.LexResourceManager(), applyCompilerOptions)
+        let loadClosure = LoadClosure.ComputeClosureOfSourceText(referenceResolver, mainInputFileName, source, CodeContext.Editing, tcConfig.useSimpleResolution, tcConfig.useFsiAuxLib, new Lexhelp.LexResourceManager(), applyCompilerOptions)
         let backgroundErrors = []
         let tcErrors, tcFileResult = 
             Parser.TypeCheckOneFile(parseResults,source,mainInputFileName,"project",tcConfig,tcGlobals,tcImports,  tcState,

tests/service/FsiTests.fs

@@ -215,7 +215,7 @@ let ``ParseAndCheckInteraction test 1``() =
     fsiSession.EvalInteraction """ let xxxxxx = 1 """  
     fsiSession.EvalInteraction """ type CCCC() = member x.MMMMM()  = 1 + 1 """  
     let untypedResults, typedResults, _ = fsiSession.ParseAndCheckInteraction("xxxxxx")
-    untypedResults.FileName |> shouldEqual "stdin.fsx"
+    Path.GetFileName(untypedResults.FileName) |> shouldEqual "stdin.fsx"
     untypedResults.Errors.Length |> shouldEqual 0
     untypedResults.ParseHadErrors |> shouldEqual false
 
@@ -232,6 +232,21 @@ let ``ParseAndCheckInteraction test 1``() =
 
     Assert.True(tooltip.Contains("val xxxxxx : int"))
 
+[<Test>]
+let ``ParseAndCheckInteraction test 2``() = 
+    let fileName1 = Path.Combine(Path.Combine(__SOURCE_DIRECTORY__, "data"), "testscript.fsx")
+    File.WriteAllText(fileName1, "let x = 1")
+    let interaction1 = 
+        sprintf """
+#load @"%s"  
+let y = Testscript.x + 1 
+"""        fileName1
+    let untypedResults, typedResults, _ = fsiSession.ParseAndCheckInteraction interaction1
+    Path.GetFileName(untypedResults.FileName) |> shouldEqual "stdin.fsx"
+    untypedResults.Errors.Length |> shouldEqual 0
+    untypedResults.ParseHadErrors |> shouldEqual false
+
+
 [<Test>]
 let ``Bad arguments to session creation 1``() = 
     let inStream = new StringReader("")