Skip to content

Commit 6df43e9

Browse files
committed
changes
1 parent 783a253 commit 6df43e9

3 files changed

Lines changed: 35 additions & 5 deletions

File tree

tests/ParallelTypeCheckingTests/Code/ASTVisit.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ module TopModulesExtraction =
11831183
[|LongIdent.Empty|]
11841184
else
11851185
// 'module A.B' is equivalent to 'namespace A; module B', meaning that 'A' is opened implicitly
1186-
if synModuleOrNamespaceKind.IsModule then
1186+
if synModuleOrNamespaceKind.IsModule && longId.Length > 1 then
11871187
[|longId.GetSlice(None, Some <| longId.Length-2); longId|]
11881188
else
11891189
[|longId|]

tests/ParallelTypeCheckingTests/Tests/TestCompilationFromCmdlineArgs.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type Codebase =
1717

1818
let codebases =
1919
[|
20-
{ WorkDir = $@"{__SOURCE_DIRECTORY__}\.checkouts\fcs\src\compiler"; Path = $@"{__SOURCE_DIRECTORY__}\FCS.args.txt"; Limit = Some 211 }
20+
{ WorkDir = $@"{__SOURCE_DIRECTORY__}\.checkouts\fcs\src\compiler"; Path = $@"{__SOURCE_DIRECTORY__}\FCS.args.txt"; Limit = None }
2121
{ WorkDir = $@"{__SOURCE_DIRECTORY__}\.checkouts\fcs\tests\FSharp.Compiler.ComponentTests"; Path = $@"{__SOURCE_DIRECTORY__}\ComponentTests.args.txt"; Limit = None }
2222
|]
2323

tests/ParallelTypeCheckingTests/Tests/TestDependencyResolution.fs

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,46 @@ type X = Y
121121
let ``Test error``() =
122122
let files =
123123
[|
124-
"pppars.fs", File.ReadAllText @"C:\projekty\fsharp\heuristic\tests\ParallelTypeCheckingTests\Tests\.checkouts\fcs\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pppars.fs"
125-
"pplex.fs", File.ReadAllText @"C:\projekty\fsharp\heuristic\tests\ParallelTypeCheckingTests\Tests\.checkouts\fcs\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pplex.fs"
124+
"A.fs", """
125+
module A.B1
126+
let x = 3
127+
"""
128+
"C.fs", """
129+
module A.B2
130+
let x = 4
131+
"""
132+
|]
133+
|> buildFiles
134+
135+
let deps = DependencyResolution.detectFileDependencies files
136+
137+
let expectedEdges =
138+
[
139+
"C.fs", ["A.fs"]
140+
]
141+
assertGraphEqual deps expectedEdges
142+
143+
144+
[<Test>]
145+
let ``Test error 2``() =
146+
let files =
147+
[|
148+
"A.fs", """
149+
module A.B1
150+
let x = 3
151+
"""
152+
"C.fs", """
153+
module A.B2
154+
let x = 4
155+
"""
126156
|]
127157
|> buildFiles
128158

129159
let deps = DependencyResolution.detectFileDependencies files
130160

131161
let expectedEdges =
132162
[
133-
"pplex.fs", ["pppars.fs"]
163+
"C.fs", ["A.fs"]
134164
]
135165
assertGraphEqual deps expectedEdges
136166

0 commit comments

Comments
 (0)