Merge pull request #594 from alfonsogarciacaro/file-order

Fix ProjectFileNames order when getting project options from script

Author: dsyme

src/fsharp/CompileOps.fs

@@ -4976,37 +4976,32 @@ module private ScriptPreprocessClosure =
             match closureDirective with 
             | ClosedSourceFile _ as csf -> [csf]
             | SourceFile(filename,m,source) ->
-                let filename = FileSystem.GetFullPathShim(filename)
-                if observedSources.HaveSeen(filename) then [] 
-                else     
-                    observedSources.SetSeen(filename)
-                    
-                    let errors = ref []
-                    let warnings = ref [] 
-                    let errorLogger = 
-                         { new ErrorLogger("FindClosure") with 
-                               member x.ErrorSinkImpl(e) = errors := e :: !errors
-                               member x.WarnSinkImpl(e) = warnings := e :: !warnings
-                               member x.ErrorCount = (!errors).Length }                        
-
-                    use unwindEL = PushErrorLoggerPhaseUntilUnwind (fun _ -> errorLogger)
-                    let pathOfMetaCommandSource = Path.GetDirectoryName(filename)
-                    match ParseScriptText(filename,source,!tcConfig,codeContext,lexResourceManager,errorLogger) with 
-                    | Some(input) ->                    
-                        let tcConfigResult, noWarns = ApplyMetaCommandsFromInputToTcConfigAndGatherNoWarn !tcConfig (input,pathOfMetaCommandSource)
-                        tcConfig := tcConfigResult
+                let errors = ref []
+                let warnings = ref [] 
+                let errorLogger = 
+                        { new ErrorLogger("FindClosure") with 
+                            member x.ErrorSinkImpl(e) = errors := e :: !errors
+                            member x.WarnSinkImpl(e) = warnings := e :: !warnings
+                            member x.ErrorCount = (!errors).Length }                        
+
+                use unwindEL = PushErrorLoggerPhaseUntilUnwind (fun _ -> errorLogger)
+                let pathOfMetaCommandSource = Path.GetDirectoryName(filename)
+                match ParseScriptText(filename,source,!tcConfig,codeContext,lexResourceManager,errorLogger) with 
+                | Some(input) ->                    
+                    let tcConfigResult, noWarns = ApplyMetaCommandsFromInputToTcConfigAndGatherNoWarn !tcConfig (input,pathOfMetaCommandSource)
+                    tcConfig := tcConfigResult
 
-                        let AddFileIfNotSeen(m,filename) = 
-                            if observedSources.HaveSeen(filename) then []
-                            else
-                                if IsScript(filename) then SourceFileOfFilename(filename,m,tcConfigResult.inputCodePage)
-                                else 
-                                    observedSources.SetSeen(filename)
-                                    [ClosedSourceFile(filename,m,None,[],[],[])] // Don't traverse into .fs leafs.
+                    let AddFileIfNotSeen(m,filename) = 
+                        if observedSources.HaveSeen(filename) then []
+                        else
+                            observedSources.SetSeen(filename)
+                            if IsScript(filename) then SourceFileOfFilename(filename,m,tcConfigResult.inputCodePage)
+                            else [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.
-                    | None -> [ClosedSourceFile(filename,m,None,!errors,!warnings,[])]
+                    let loadedSources = (!tcConfig).GetAvailableLoadedSources() |> List.map AddFileIfNotSeen |> List.concat
+                    (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
 
@@ -5024,7 +5019,7 @@ module private ScriptPreprocessClosure =
         let sourceFiles = ref []
         let sourceInputs = ref []
         let globalNoWarns = ref []
-        for directive in closureDirectives do
+        for directive in List.rev closureDirectives do
             match directive with 
             | ClosedSourceFile(filename,m,input,_,_,noWarns) -> 
                 let filename = FileSystem.GetFullPathShim(filename)

tests/service/ProjectOptionsTests.fs

@@ -418,6 +418,22 @@ 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 test scriptName expected =
+        let scriptPath = __SOURCE_DIRECTORY__ + @"/data/ScriptProject/" + scriptName + ".fsx"
+        let scriptSource = File.ReadAllText scriptPath
+        let projOpts =
+            checker.GetProjectOptionsFromScript(scriptPath, scriptSource)
+            |> Async.RunSynchronously
+        projOpts.ProjectFileNames
+        |> Array.map Path.GetFileNameWithoutExtension
+        |> (=) expected
+        |> shouldEqual true
+    test "Main1" [|"BaseLib1"; "Lib1"; "Lib2"; "Main1"|]
+    test "Main2" [|"BaseLib1"; "Lib1"; "Lib2"; "Lib3"; "Main2"|]
+    test "Main3" [|"Lib3"; "Lib4"; "Main3"|]
+    test "Main4" [|"BaseLib2"; "Lib5"; "BaseLib1"; "Lib1"; "Lib2"; "Main4"|]
 
 #endif
 

tests/service/data/ScriptProject/BaseLib1.fs

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

tests/service/data/ScriptProject/BaseLib2.fs

@@ -0,0 +1,3 @@
+module BaseLib2
+
+let add10 x = x + 10

tests/service/data/ScriptProject/Lib1.fsx

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

tests/service/data/ScriptProject/Lib2.fsx

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

tests/service/data/ScriptProject/Lib3.fs

@@ -0,0 +1,3 @@
+module Lib3
+
+let add6 = ((+) 6)

tests/service/data/ScriptProject/Lib4.fs

@@ -0,0 +1,3 @@
+module Lib4
+
+let add8 = ((+) 8)

tests/service/data/ScriptProject/Lib5.fsx

@@ -0,0 +1,2 @@
+#load "BaseLib2.fs"
+let add12 = BaseLib2.add10 >> ((+) 2)

tests/service/data/ScriptProject/Main1.fsx

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