Skip to content

Use String.concat to concatenate command line arguments #9297

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 2 commits into from
May 26, 2020
Merged

Use String.concat to concatenate command line arguments #9297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac4a13b
Use `String.concat` to concatenate command line arguments
saul May 26, 2020
3a3585a
Fix newline at end of cmd
KevinRansom May 26, 2020
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.Build/Fsc.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ type public Fsc () as this =

override fsc.GenerateResponseFileCommands() =
let builder = generateCommandLineBuilder ()
builder.GetCapturedArguments() |> Seq.fold(fun acc f -> acc + f + Environment.NewLine) ""
builder.GetCapturedArguments() |> String.concat Environment.NewLine

// expose this to internal components (for nunit testing)
member internal fsc.InternalGenerateCommandLineCommands() =
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Build/Fsi.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ type public Fsi () as this =

override fsi.GenerateResponseFileCommands() =
let builder = generateCommandLineBuilder ()
builder.GetCapturedArguments() |> Seq.fold(fun acc f -> acc + f + Environment.NewLine) ""
builder.GetCapturedArguments() |> String.concat Environment.NewLine

// expose this to internal components (for nunit testing)
member internal fsi.InternalGenerateCommandLineCommands() =
Expand Down
68 changes: 34 additions & 34 deletions vsintegration/tests/UnitTests/Tests.Build.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -109,7 +109,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -125,7 +125,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -143,7 +143,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -159,7 +159,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -174,7 +174,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -190,7 +190,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -206,7 +206,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -222,7 +222,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -238,7 +238,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -254,7 +254,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -270,7 +270,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -285,7 +285,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -301,7 +301,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -318,7 +318,7 @@ type Build() =
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine +
"--yadda" + Environment.NewLine +
"yadda" + Environment.NewLine)
"yadda")
cmd

[<Test>]
Expand All @@ -334,7 +334,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -350,7 +350,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -366,7 +366,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -382,7 +382,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -399,7 +399,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -416,7 +416,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -433,7 +433,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -449,7 +449,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -468,7 +468,7 @@ type Build() =
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine +
src + Environment.NewLine +
src + Environment.NewLine)
src)
cmd
()

Expand All @@ -485,7 +485,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -501,7 +501,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -517,7 +517,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -532,7 +532,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -547,7 +547,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -562,7 +562,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -576,7 +576,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva+" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand All @@ -591,7 +591,7 @@ type Build() =
"--flaterrors" + Environment.NewLine +
"--subsystemversion:6.02" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
"--nocopyfsharpcore" + Environment.NewLine)
"--nocopyfsharpcore")
cmd

[<Test>]
Expand Down Expand Up @@ -665,7 +665,7 @@ type Build() =
"--other:internal quote" + Environment.NewLine +
"blah" + Environment.NewLine +
"foo.fs" + Environment.NewLine +
@"C:\Program Files\spaces.fs" + Environment.NewLine
@"C:\Program Files\spaces.fs"

AssertEqual expected cmd

Expand Down Expand Up @@ -710,4 +710,4 @@ type Build() =
"blah" |]
AssertEqual expectedFlags hostObject.Flags
let expectedSources = [| "foo.fs"; "C:\\Program Files\\spaces.fs" |]
AssertEqual expectedSources hostObject.Sources
AssertEqual expectedSources hostObject.Sources