Add more tests and improve fix

dotnet · Jul 20, 2016 · 0d92803 · 0d92803
1 parent 5436f4f
commit 0d92803
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 47 deletions.
diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
@@ -4924,38 +4924,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
-                        (loadedSources |> List.map FindClosure |> List.concat)
-                            @  [ClosedSourceFile(filename,m,Some(input),!errors,!warnings,!noWarns)]
-                    | 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
 
@@ -4973,7 +4967,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)
@@ -5016,8 +5010,8 @@ module private ScriptPreprocessClosure =
         let rootWarnings = rootWarnings |> List.filter isRootRange
 
         let result : LoadClosure = 
-            { SourceFiles = List.groupByFirst !sourceFiles |> List.rev
-              References = List.groupByFirst references |> List.rev
+            { SourceFiles = List.groupByFirst !sourceFiles
+              References = List.groupByFirst references
               UnresolvedReferences = unresolvedReferences
               Inputs = !sourceInputs
               NoWarns = List.groupByFirst !globalNoWarns

diff --git a/tests/service/ProjectOptionsTests.fs b/tests/service/ProjectOptionsTests.fs
@@ -422,15 +422,20 @@ let ``Project file parsing -- report files``() =
 
 [<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
+    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"|]
 
 
 

diff --git a/tests/service/data/ScriptProject/BaseLib.fs → tests/service/data/ScriptProject/BaseLib1.fs b/tests/service/data/ScriptProject/BaseLib.fs → tests/service/data/ScriptProject/BaseLib1.fs
@@ -1,3 +1,3 @@
-module BaseLib
+module BaseLib1
 
 let add2 x = x + 2
diff --git a/tests/service/data/ScriptProject/BaseLib2.fs b/tests/service/data/ScriptProject/BaseLib2.fs
@@ -0,0 +1,3 @@
+module BaseLib2
+
+let add10 x = x + 10
diff --git a/tests/service/data/ScriptProject/Lib1.fsx b/tests/service/data/ScriptProject/Lib1.fsx
@@ -1,2 +1,2 @@
-#load "BaseLib.fs"
-let add3 = BaseLib.add2 >> ((+) 1)
+#load "BaseLib1.fs"
+let add3 = BaseLib1.add2 >> ((+) 1)
diff --git a/tests/service/data/ScriptProject/Lib2.fsx b/tests/service/data/ScriptProject/Lib2.fsx
@@ -1,2 +1,2 @@
-#load "BaseLib.fs"
-let add4 = BaseLib.add2 >> ((+) 2)
+#load "BaseLib1.fs"
+let add4 = BaseLib1.add2 >> ((+) 2)
diff --git a/tests/service/data/ScriptProject/Lib3.fs b/tests/service/data/ScriptProject/Lib3.fs
@@ -0,0 +1,3 @@
+module Lib3
+
+let add6 = ((+) 6)
diff --git a/tests/service/data/ScriptProject/Lib4.fs b/tests/service/data/ScriptProject/Lib4.fs
@@ -0,0 +1,3 @@
+module Lib4
+
+let add8 = ((+) 8)
diff --git a/tests/service/data/ScriptProject/Lib5.fsx b/tests/service/data/ScriptProject/Lib5.fsx
@@ -0,0 +1,2 @@
+#load "BaseLib2.fs"
+let add12 = BaseLib2.add10 >> ((+) 2)
diff --git a/tests/service/data/ScriptProject/Main.fsx → tests/service/data/ScriptProject/Main1.fsx b/tests/service/data/ScriptProject/Main.fsx → tests/service/data/ScriptProject/Main1.fsx
diff --git a/tests/service/data/ScriptProject/Main2.fsx b/tests/service/data/ScriptProject/Main2.fsx
@@ -0,0 +1,6 @@
+#load "Lib1.fsx"
+#load "Lib2.fsx"
+#load "Lib3.fs"
+Lib1.add3 5 |> printfn "%i"
+Lib2.add4 5 |> printfn "%i"
+Lib3.add6 5 |> printfn "%i"
diff --git a/tests/service/data/ScriptProject/Main3.fsx b/tests/service/data/ScriptProject/Main3.fsx
@@ -0,0 +1,4 @@
+#load "Lib3.fs"
+#load "Lib4.fs"
+Lib3.add6 5 |> printfn "%i"
+Lib4.add8 5 |> printfn "%i"
diff --git a/tests/service/data/ScriptProject/Main4.fsx b/tests/service/data/ScriptProject/Main4.fsx
@@ -0,0 +1,6 @@
+#load "Lib5.fsx"
+#load "Lib1.fsx"
+#load "Lib2.fsx"
+Lib1.add3 5 |> printfn "%i"
+Lib2.add4 5 |> printfn "%i"
+Lib5.add12 5 |> printfn "%i"