Skip to content

fix generate name value for MethodInfo without Parameters #1789

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
jonsequitur merged 2 commits into from
Jul 14, 2022
Merged

fix generate name value for MethodInfo without Parameters #1789

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
a9d1554
fix generate name value for MethodInfo without Parameters
hessenar Jun 30, 2022
936bad2
add test for XmlDocReader, case: method without input params
hessenar Jul 2, 2022
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
29 changes: 29 additions & 0 deletions src/System.CommandLine.DragonFruit.Tests/XmlDocReaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ private class Program
public static void Main(bool verbose = false, string flavor = null, int? count = 0)
{
}

public static void MainWithoutParam()
{
}
}

[Fact]
Expand Down Expand Up @@ -47,5 +51,30 @@ public void It_finds_member_xml()
helpMetadata.ParameterDescriptions["flavor"].Should().Be("Which flavor to use");
helpMetadata.ParameterDescriptions["count"].Should().Be("How many smoothies?");
}

[Fact]
public void It_finds_member_without_param()
{
const string xml = @"<?xml version=""1.0""?>
<doc>
<assembly>
<name>DragonFruit</name>
</assembly>
<members>
<member name=""M:System.CommandLine.DragonFruit.Tests." + nameof(XmlDocReaderTests) + @".Program.MainWithoutParam"">
<summary>
Hello
</summary>
</member>
</members>
</doc>
";
Action action = Program.MainWithoutParam;
var reader = new StringReader(xml);
XmlDocReader.TryLoad(reader, out var docReader).Should().BeTrue();

docReader.TryGetMethodDescription(action.Method, out var helpMetadata).Should().BeTrue();
helpMetadata.Description.Should().Be("Hello");
}
}
}
30 changes: 17 additions & 13 deletions src/System.CommandLine.DragonFruit/XmlDocReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,30 @@ public bool TryGetMethodDescription(MethodInfo info, out CommandHelpMetadata com
sb.Append("M:");
AppendTypeName(sb, info.DeclaringType);
sb.Append(".")
.Append(info.Name)
.Append("(");
.Append(info.Name);

bool first = true;
foreach (ParameterInfo param in info.GetParameters())
var parameters = info.GetParameters();
if (parameters.Length > 0)
{
if (first)
sb.Append("(");
bool first = true;
foreach (ParameterInfo param in info.GetParameters())
{
first = false;
}
else
{
sb.Append(",");
if (first)
{
first = false;
}
else
{
sb.Append(",");
}

AppendTypeName(sb, param.ParameterType);
}

AppendTypeName(sb, param.ParameterType);
sb.Append(")");
}

sb.Append(")");

string name = sb.ToString();

XElement member = _members.Elements("member")
Expand Down