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.

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

Safer check for source code options in Project Cracker #758

Merged
merged 3 commits into from
Apr 19, 2017
Merged

Safer check for source code options in Project Cracker #758

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1cbbac
Safer check for source code option
cgravill Apr 19, 2017
a910704
Update ProjectCracker.fs
dsyme Apr 19, 2017
66baa58
Update ProjectCracker.fs
dsyme Apr 19, 2017
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
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Looks like you can use not (FileSystem.IsInvalidPathShim(x)) like this https://github.com/Microsoft/visualfsharp/blob/379f729dca9f310b474e3edf0669c71fe39b0129/src/fsharp/vs/IncrementalBuild.fs#L1612

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.


let sepChar = Path.DirectorySeparatorChar

Expand Down