Skip to content
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.

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

Safer check for source code options in Project Cracker #758

Merged
merged 3 commits into from
Apr 19, 2017

Conversation

cgravill
Copy link
Contributor

The partitioning is looking for ".fs" as an extension but this can throw exceptions. This can happen on settings that aren't paths and therefore may contain invalid path characters e.g. --ws:"Bundle" (a WebSharper 4.x setting).

Current test fails on for example, --ws:"Bundle" (a WebSharper 4.x
setting)
@@ -20,7 +20,7 @@ type ProjectCracker =
let referencedProjects = Array.map (fun (a, b) -> a, convert b) opts.ReferencedProjectOptions

let sourceFiles, otherOptions =
opts.Options |> Array.partition (fun x -> Path.GetExtension(x).ToLower() = ".fs")
opts.Options |> Array.partition (fun x -> x.IndexOfAny(Path.GetInvalidPathChars()) = -1 && Path.GetExtension(x).ToLower() = ".fs")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed this with a direct edit to the PR

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually what you had was right - this code is not part of the compiler DLL itself

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that looks cleaner but that part of the code base seems quite independent. Thanks for the fast review.

@dsyme dsyme merged commit aba316b into fsharp:master Apr 19, 2017
cgravill added a commit to cgravill/TypesTSFS that referenced this pull request May 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants