Add test and go back to first fix

Author: alfonsogarciacaro

src/fsharp/CompileOps.fs

@@ -5005,7 +5005,8 @@ module private ScriptPreprocessClosure =
                                     [ClosedSourceFile(filename,m,None,[],[],[])] // Don't traverse into .fs leafs.
 
                         let loadedSources = (!tcConfig).GetAvailableLoadedSources() |> List.rev |> List.map AddFileIfNotSeen |> List.concat
-                        ClosedSourceFile(filename,m,Some(input),!errors,!warnings,!noWarns) :: loadedSources |> List.map FindClosure |> List.concat // Final closure is in reverse order. Keep the closed source at the top.
+                        (loadedSources |> List.map FindClosure |> List.concat)
+                            @  [ClosedSourceFile(filename,m,Some(input),!errors,!warnings,!noWarns)]
                     | None -> [ClosedSourceFile(filename,m,None,!errors,!warnings,[])]
 
         closureDirectives |> List.map FindClosure |> List.concat, !tcConfig
@@ -5067,7 +5068,7 @@ module private ScriptPreprocessClosure =
         let rootWarnings = rootWarnings |> List.filter isRootRange
 
         let result : LoadClosure = 
-            { SourceFiles = List.groupByFirst !sourceFiles
+            { SourceFiles = List.groupByFirst !sourceFiles |> List.rev
               References = List.groupByFirst references
               UnresolvedReferences = unresolvedReferences
               Inputs = !sourceInputs

src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -2546,7 +2546,7 @@ type BackgroundCompiler(projectCacheSize, keepAssemblyContents, keepAllBackgroun
             let co = 
                 {
                     ProjectFileName = filename + ".fsproj" // Make a name that is unique in this directory.
-                    ProjectFileNames = fas.Inputs |> List.map fst |> List.toArray
+                    ProjectFileNames = fas.SourceFiles |> List.map fst |> List.toArray
                     OtherOptions = otherFlags 
                     ReferencedProjects= [| |]  
                     IsIncompleteTypeCheckEnvironment = false

src/fsharp/vs/service.fs

@@ -418,6 +418,17 @@ let ``Project file parsing -- report files``() =
    for f in Directory.EnumerateFiles(@"C:\Program Files (x86)\Microsoft SDKs\F#\4.0\","*",SearchOption.AllDirectories) do 
      printfn "File: %s" f
 
+[<Test>]
+let ``Test ProjectFileNames order for GetProjectOptionsFromScript`` () = // See #594
+    let scriptPath = __SOURCE_DIRECTORY__ + @"/data/ScriptProject/Main.fsx"
+    let scriptSource = File.ReadAllText scriptPath
+    let projOpts =
+        checker.GetProjectOptionsFromScript(scriptPath, scriptSource)
+        |> Async.RunSynchronously
+    projOpts.ProjectFileNames
+    |> Array.map Path.GetFileNameWithoutExtension
+    |> (=) [|"BaseLib"; "Lib1"; "Lib2"; "Main"|]
+    |> shouldEqual true
 
 #endif
 

tests/service/ProjectOptionsTests.fs

@@ -0,0 +1,3 @@
+module BaseLib
+
+let add2 x = x + 2

tests/service/data/ScriptProject/BaseLib.fs

@@ -0,0 +1,2 @@
+#load "BaseLib.fs"
+let add3 = BaseLib.add2 >> ((+) 1)

tests/service/data/ScriptProject/Lib1.fsx

@@ -0,0 +1,2 @@
+#load "BaseLib.fs"
+let add4 = BaseLib.add2 >> ((+) 2)

tests/service/data/ScriptProject/Lib2.fsx

@@ -0,0 +1,4 @@
+#load "Lib1.fsx"
+#load "Lib2.fsx"
+Lib1.add3 5 |> printfn "%i"
+Lib2.add4 5 |> printfn "%i"