Skip to content

Updating to use the latest System.CommandLine #343

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 1 commit into from
Apr 29, 2022
Merged

Updating to use the latest System.CommandLine #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageReference Update="NUnit" Version="3.13.3" />
<PackageReference Update="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Update="System.CommandLine" Version="2.0.0-beta1.21308.1" />
<PackageReference Update="System.CommandLine" Version="2.0.0-beta3.22114.1" />
<PackageReference Update="System.Memory" Version="4.5.4" />
</ItemGroup>

Expand Down
17 changes: 11 additions & 6 deletions sources/ClangSharpPInvokeGenerator/CustomHelpBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@ namespace ClangSharp
{
internal sealed class CustomHelpBuilder : HelpBuilder
{
public CustomHelpBuilder(IConsole console, int maxWidth = int.MaxValue)
: base(console, maxWidth)
private IConsole Console { get; }

public CustomHelpBuilder(IConsole console, LocalizationResources localizationResources,
int maxWidth = int.MaxValue)
: base(localizationResources, maxWidth)
{
Console = console;
}

public void Write(IOption option)
public void Write(Option option)
{
Write(string.Join(", ", option.Aliases));
Write("\t");
Expand All @@ -26,15 +30,16 @@ public void Write(IOption option)

public void Write(string value) => Console.Out.Write(value);

public void Write(params HelpItem[] helpItems)
public void Write(params TwoColumnHelpRow[] helpItems)
{
WriteLine("Options:");
RenderAsColumns(helpItems);
var _ = new Command("unused");
WriteColumns(helpItems, new HelpContext(this, _, Console.Out.CreateTextWriter()));
WriteLine();
}

public void WriteLine() => Console.Out.WriteLine();

public void WriteLine(string value) => Console.Out.WriteLine(value);
}
}
Loading