Skip to content

Improve top level auto open detection. #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 7, 2022
Merged

Improve top level auto open detection. #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3848a3
Improve top level auto open detection.
nojaf Nov 30, 2022
d8d86c0
Allow file indexes to the trie root.
nojaf Dec 5, 2022
9867c09
Add additional test for nested AutoOpen module in a namespace.
nojaf Dec 6, 2022
51c6870
Don't fully process files that add to root.
nojaf Dec 6, 2022
5ff2fc3
Add test for what happens with module naming clash.
nojaf Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 0 additions & 47 deletions tests/ParallelTypeCheckingTests/Code/AlwaysLinkDetection.fs
View file
Open in desktop

This file was deleted.

22 changes: 2 additions & 20 deletions tests/ParallelTypeCheckingTests/Code/DependencyResolution.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module ParallelTypeCheckingTests.DependencyResolution

open System.Linq
open FSharp.Compiler.Syntax
open ParallelTypeCheckingTests

Expand Down Expand Up @@ -194,7 +193,6 @@ let mkGraph (files: FileWithAST array) : Graph<int> =
|> Map.ofArray

// Implementation files backed by signatures should be excluded to construct the trie.
// Signature files should link to the implementation index instead.
let trieInput =
Array.choose
(fun f ->
Expand All @@ -208,34 +206,19 @@ let mkGraph (files: FileWithAST array) : Graph<int> =

let fileContents = Array.Parallel.map FileContentMapping.mkFileContent files

let filesWithAutoOpen =
Array.choose
(fun f ->
if AlwaysLinkDetection.doesFileHasAutoOpenBehavior f.AST then
Some f.Idx
else
None)
trieInput

let findDependencies (file: FileWithAST) : int * int array =
let fileContent = fileContents.[file.Idx]
let knownFiles = getFileNameBefore files file.Idx
let filesFromRoot = trie.Files |> Set.filter (fun rootIdx -> rootIdx < file.Idx)

// Process all entries of a file and query the trie when required to find the dependent files.
let result =
// Seq is faster than List in this case.
Seq.fold (processStateEntry queryTrie) (FileContentQueryState.Create file.Idx knownFiles) fileContent
Seq.fold (processStateEntry queryTrie) (FileContentQueryState.Create file.Idx knownFiles filesFromRoot) fileContent

// after processing the file we should verify if any of the open statements are found in the trie but do not yield any file link.
let ghostDependencies = collectGhostDependencies file.Idx trie queryTrie result

// Automatically add all files that came before the current file that use the [<AutoOpen>] attribute.
let topLevelAutoOpenFiles =
if Array.isEmpty filesWithAutoOpen then
Array.empty
else
[| 0 .. (file.Idx - 1) |].Intersect(filesWithAutoOpen).ToArray()

// Automatically add a link from an implementation to its signature file (if present)
let signatureDependency =
match Map.tryFind file.Idx implToSig with
Expand All @@ -246,7 +229,6 @@ let mkGraph (files: FileWithAST array) : Graph<int> =
[|
yield! result.FoundDependencies
yield! ghostDependencies
yield! topLevelAutoOpenFiles
yield! signatureDependency
|]
|> Array.distinct
Expand Down
Loading