Commit bbb0a50

authored

Merge pull request #388 from CoreCompat/fixes/AddLine

Fix infinite loop in HelpText.Addline; add unit test + validation

2 parents caf0ca3 + 95ded2d commit bbb0a50Copy full SHA for bbb0a50

File tree

2 files changed

+33

-4

lines changed

src/CommandLine/Text
- HelpText.cs
tests/CommandLine.Tests/Unit/Text
- HelpTextTests.cs

2 files changed

+33

-4

lines changed

`‎src/CommandLine/Text/HelpText.cs‎`

Lines changed: 21 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ public SentenceBuilder SentenceBuilder`
`206`	`206`	`public static HelpText AutoBuild<T>(`
`207`	`207`	`ParserResult<T> parserResult,`
`208`	`208`	`Func<HelpText, HelpText> onError,`
`209`		`- Func<Example, Example> onExample,`
	`209`	`+ Func<Example, Example> onExample,`
`210`	`210`	`bool verbsIndex = false,`
`211`	`211`	`int maxDisplayWidth = DefaultMaximumLength)`
`212`	`212`	`{`
`@@ -254,7 +254,7 @@ public static HelpText AutoBuild<T>(`
`254`	`254`
`255`	`255`	`usageAttr.Do(`
`256`	`256`	`usage => usage.AddToHelpText(auto, true));`
`257`		`-`
	`257`	`+`
`258`	`258`	`usageLines.Do(`
`259`	`259`	`lines => auto.AddPreOptionsLines(lines));`
`260`	`260`
`@@ -519,7 +519,7 @@ public static IEnumerable<string> RenderParsingErrorsTextAsLines<T>(`
`519`	`519`	`yield return line.ToString();`
`520`	`520`	`}`
`521`	`521`
`522`		`- var mutuallyErrs =`
	`522`	`+ var mutuallyErrs =`
`523`	`523`	`formatMutuallyExclusiveSetErrors(`
`524`	`524`	`meaningfulErrors.OfType<MutuallyExclusiveSetError>());`
`525`	`525`	`if (mutuallyErrs.Length > 0)`
`@@ -619,8 +619,25 @@ public override string ToString()`
`619`	`619`	`.ToString();`
`620`	`620`	`}`
`621`	`621`
`622`		`- private static void AddLine(StringBuilder builder, string value, int maximumLength)`
	`622`	`+ internal static void AddLine(StringBuilder builder, string value, int maximumLength)`
`623`	`623`	`{`
	`624`	`+ if (builder == null)`
	`625`	`+ {`
	`626`	`+ throw new ArgumentNullException(nameof(builder));`
	`627`	`+ }`
	`628`	`+`
	`629`	`+ if (value == null)`
	`630`	`+ {`
	`631`	`+ throw new ArgumentNullException(nameof(value));`
	`632`	`+ }`
	`633`	`+`
	`634`	`+ if (maximumLength < 1)`
	`635`	`+ {`
	`636`	`+ throw new ArgumentOutOfRangeException(nameof(value));`
	`637`	`+ }`
	`638`	`+`
	`639`	`+ value = value.Trim();`
	`640`	`+`
`624`	`641`	`builder.AppendWhen(builder.Length > 0, Environment.NewLine);`
`625`	`642`	`do`
`626`	`643`	`{`

`‎tests/CommandLine.Tests/Unit/Text/HelpTextTests.cs‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using CommandLine.Text;`
`13`	`13`	`using FluentAssertions;`
`14`	`14`	`using Xunit;`
	`15`	`+using System.Text;`
`15`	`16`
`16`	`17`	`namespace CommandLine.Tests.Unit.Text`
`17`	`18`	`{`
`@@ -657,5 +658,16 @@ public void AutoBuild_with_assembly_company_attribute_only()`
`657`	`658`	`ReflectionHelper.SetAttributeOverride(null);`
`658`	`659`	`}`
`659`	`660`	`}`
	`661`	`+`
	`662`	`+ [Fact]`
	`663`	`+ public void Add_line_with_two_empty_spaces_at_the_end()`
	`664`	`+ {`
	`665`	`+ StringBuilder b = new StringBuilder();`
	`666`	`+ HelpText.AddLine(b,`
	`667`	`+ "Test ",`
	`668`	`+ 1);`
	`669`	`+`
	`670`	`+ Assert.Equal("T" + Environment.NewLine + "e" + Environment.NewLine + "s" + Environment.NewLine + "t", b.ToString());`
	`671`	`+ }`
`660`	`672`	`}`
`661`	`673`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit bbb0a50

File tree

2 files changed

2 files changed

`‎src/CommandLine/Text/HelpText.cs‎`

`‎tests/CommandLine.Tests/Unit/Text/HelpTextTests.cs‎`

0 commit comments