Add scenario with dependent signature files.

nojaf · nojaf · commit 6cb01a1ed824 · 2022-11-24T16:59:23.000+01:00
diff --git a/tests/ParallelTypeCheckingTests/Code/DependencyResolution.fs b/tests/ParallelTypeCheckingTests/Code/DependencyResolution.fs
@@ -188,7 +188,7 @@ let mkGraph (files: FileWithAST array) : Graph<int> =
                     let implIdx =
                         files
                         |> Array.skip (f.Idx + 1)
-                        |> Array.tryFind (fun (implFile: FileWithAST) -> $"{implFile.AST.FileName}i" = f.File)
+                        |> Array.tryFind (fun (implFile: FileWithAST) -> $"{implFile.File}i" = f.File)
 
                     Option.map (fun (implFile: FileWithAST) -> (implFile.Idx, f.Idx), (f.Idx, implFile.Idx)) implIdx
                 | ParsedInput.ImplFile _ -> None)
diff --git a/tests/ParallelTypeCheckingTests/Tests/Scenarios.fs b/tests/ParallelTypeCheckingTests/Tests/Scenarios.fs
@@ -203,15 +203,15 @@ type Y = { Q: int }
         scenario
             "Signature files are being used to construct the Trie"
             [
-                sourceFile
+                sourceFile // 0
                     "A.fsi"
                     """
 module A
 
 val a: int -> int
 """
                     Set.empty
-                sourceFile
+                sourceFile // 1
                     "A.fs"
                     """
 module A
@@ -221,15 +221,15 @@ module Helpers =
 
 let a b = Helpers.impl b
 """
-                    Set.empty
-                sourceFile
+                    (set [| 0 |])
+                sourceFile // 2
                     "B.fs"
                     """
 module B
 
 let b = A.a 42
 """
-                    (set [| 0 |])
+                    (set [| 1 |])
             ]
         scenario
             "A partial open statement still links to a file as a last resort"
@@ -359,4 +359,86 @@ let person: string = A.B.C.D.Name
 """
                     (set [| 0 |])
             ]
+        // Diamond scenario
+        scenario
+            "Dependent signature files"
+            [
+                sourceFile // 0
+                    "A.fsi"
+                    """
+module A
+
+type AType = class end
+"""
+                    Set.empty
+                sourceFile // 1
+                    "A.fs"
+                    """
+module A
+
+type AType = class end
+            """
+                    (set [| 0 |])
+                sourceFile // 2
+                    "B.fsi"
+                    """
+module B
+
+open A
+
+val b: AType -> unit
+"""
+                    (set [| 1 |])
+                sourceFile // 3
+                    "B.fs"
+                    """
+module B
+
+open A
+
+let b (a:AType) = ()
+"""
+                    (set [| 1; 2 |])
+                sourceFile // 4
+                    "C.fsi"
+                    """
+                module C
+
+                type CType = class end
+                            """
+                    Set.empty
+                sourceFile // 5
+                    "C.fs"
+                    """
+module C
+
+type CType = class end
+                            """
+                    (set [| 4 |])
+                sourceFile // 6
+                    "D.fsi"
+                    """
+module D
+
+open A
+open C
+
+val d: CType -> unit
+            """
+                    (set [| 1; 5 |])
+                sourceFile // 7
+                    "D.fs"
+                    """
+module D
+
+open A
+open B
+open C
+
+let d (c: CType) =
+    let a : AType = failwith "todo"
+    b a
+            """
+                    (set [| 1; 3; 5; 6 |])
+            ]
     ]
