Revert "Merge pull request #90 from yatagarasu25/params_arguments_patch"

neuecc · neuecc · commit 57240a50d70d · 2022-10-05T18:20:06.000+09:00
This reverts commit 4a19ccb.
diff --git a/src/ConsoleAppFramework/CommandHelpBuilder.cs b/src/ConsoleAppFramework/CommandHelpBuilder.cs
@@ -305,24 +305,24 @@ internal CommandHelpDefinition CreateCommandHelpDefinition(CommandDescriptor des
                 var isFlag = item.ParameterType == typeof(bool);
 
                 var defaultValue = default(string);
-                if (item.HasDefaultValue())
+                if (item.HasDefaultValue)
                 {
                     if (option?.DefaultValue != null)
                     {
                         defaultValue = option.DefaultValue;
                     }
                     else
                     {
-                        defaultValue = (item.DefaultValue()?.ToString() ?? "null");
+                        defaultValue = (item.DefaultValue?.ToString() ?? "null");
                     }
                     if (isFlag)
                     {
-                        if (item.DefaultValue() is true)
+                        if (item.DefaultValue is true)
                         {
                             // bool option with true default value is not flag.
                             isFlag = false;
                         }
-                        else if (item.DefaultValue() is false)
+                        else if (item.DefaultValue is false)
                         {
                             // false default value should be omitted for flag.
                             defaultValue = null;
diff --git a/src/ConsoleAppFramework/ConsoleAppEngine.cs b/src/ConsoleAppFramework/ConsoleAppEngine.cs
@@ -106,7 +106,7 @@ public async Task RunAsync()
             if (commandDescriptor.CommandType == CommandType.DefaultCommand && args.Length == 0)
             {
                 var p = commandDescriptor.MethodInfo.GetParameters();
-                if (p.Any(x => !(x.ParameterType == typeof(ConsoleAppContext) || isService.IsService(x.ParameterType) || x.HasDefaultValue())))
+                if (p.Any(x => !(x.ParameterType == typeof(ConsoleAppContext) || isService.IsService(x.ParameterType) || x.HasDefaultValue)))
                 {
                     options.CommandDescriptors.TryGetHelpMethod(out commandDescriptor);
                 }
@@ -294,7 +294,7 @@ bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsO
                     {
                         if (optionByIndex.Count <= option.Index)
                         {
-                            if (!item.HasDefaultValue())
+                            if (!item.HasDefaultValue)
                             {
                                 throw new InvalidOperationException($"Required argument {option.Index} was not found in specified arguments.");
                             }
@@ -346,20 +346,13 @@ bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsO
                                     var elemType = UnwrapCollectionElementType(parameters[i].ParameterType);
                                     if (elemType == typeof(string))
                                     {
-                                        if (parameters.Length == i + 1)
-										{
-                                            v = "[" + string.Join(",", optionByIndex.Skip(parameters[i].Position).Select(x => "\"" + x.Value + "\"")) + "]";
+                                        if (!(v.StartsWith("\"") && v.EndsWith("\"")))
+                                        {
+                                            v = "[" + string.Join(",", v.Split(' ', ',').Select(x => "\"" + x + "\"")) + "]";
                                         }
                                         else
-										{
-                                            if (!(v.StartsWith("\"") && v.EndsWith("\"")))
-                                            {
-                                                v = "[" + string.Join(",", v.Split(' ', ',').Select(x => "\"" + x + "\"")) + "]";
-                                            }
-                                            else
-                                            {
-                                                v = "[" + v + "]";
-                                            }
+                                        {
+                                            v = "[" + v + "]";
                                         }
                                     }
                                     else
@@ -408,9 +401,9 @@ bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsO
                         }
                     }
 
-                    if (item.HasDefaultValue())
+                    if (item.HasDefaultValue)
                     {
-                        invokeArgs[i] = item.DefaultValue();
+                        invokeArgs[i] = item.DefaultValue;
                     }
                     else if (item.ParameterType == typeof(bool))
                     {
diff --git a/src/ConsoleAppFramework/ParameterInfoExtensions.cs b/src/ConsoleAppFramework/ParameterInfoExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -305,24 +305,24 @@ internal CommandHelpDefinition CreateCommandHelpDefinition(CommandDescriptor des`
`305`	`305`	`var isFlag = item.ParameterType == typeof(bool);`
`306`	`306`
`307`	`307`	`var defaultValue = default(string);`
`308`		`- if (item.HasDefaultValue())`
	`308`	`+ if (item.HasDefaultValue)`
`309`	`309`	`{`
`310`	`310`	`if (option?.DefaultValue != null)`
`311`	`311`	`{`
`312`	`312`	`defaultValue = option.DefaultValue;`
`313`	`313`	`}`
`314`	`314`	`else`
`315`	`315`	`{`
`316`		`- defaultValue = (item.DefaultValue()?.ToString() ?? "null");`
	`316`	`+ defaultValue = (item.DefaultValue?.ToString() ?? "null");`
`317`	`317`	`}`
`318`	`318`	`if (isFlag)`
`319`	`319`	`{`
`320`		`- if (item.DefaultValue() is true)`
	`320`	`+ if (item.DefaultValue is true)`
`321`	`321`	`{`
`322`	`322`	`// bool option with true default value is not flag.`
`323`	`323`	`isFlag = false;`
`324`	`324`	`}`
`325`		`- else if (item.DefaultValue() is false)`
	`325`	`+ else if (item.DefaultValue is false)`
`326`	`326`	`{`
`327`	`327`	`// false default value should be omitted for flag.`
`328`	`328`	`defaultValue = null;`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public async Task RunAsync()`
`106`	`106`	`if (commandDescriptor.CommandType == CommandType.DefaultCommand && args.Length == 0)`
`107`	`107`	`{`
`108`	`108`	`var p = commandDescriptor.MethodInfo.GetParameters();`
`109`		`- if (p.Any(x => !(x.ParameterType == typeof(ConsoleAppContext) \|\| isService.IsService(x.ParameterType) \|\| x.HasDefaultValue())))`
	`109`	`+ if (p.Any(x => !(x.ParameterType == typeof(ConsoleAppContext) \|\| isService.IsService(x.ParameterType) \|\| x.HasDefaultValue)))`
`110`	`110`	`{`
`111`	`111`	`options.CommandDescriptors.TryGetHelpMethod(out commandDescriptor);`
`112`	`112`	`}`
`@@ -294,7 +294,7 @@ bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsO`
`294`	`294`	`{`
`295`	`295`	`if (optionByIndex.Count <= option.Index)`
`296`	`296`	`{`
`297`		`- if (!item.HasDefaultValue())`
	`297`	`+ if (!item.HasDefaultValue)`
`298`	`298`	`{`
`299`	`299`	`throw new InvalidOperationException($"Required argument {option.Index} was not found in specified arguments.");`
`300`	`300`	`}`
`@@ -346,20 +346,13 @@ bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsO`
`346`	`346`	`var elemType = UnwrapCollectionElementType(parameters[i].ParameterType);`
`347`	`347`	`if (elemType == typeof(string))`
`348`	`348`	`{`
`349`		`- if (parameters.Length == i + 1)`
`350`		`- {`
`351`		`- v = "[" + string.Join(",", optionByIndex.Skip(parameters[i].Position).Select(x => "\"" + x.Value + "\"")) + "]";`
	`349`	`+ if (!(v.StartsWith("\"") && v.EndsWith("\"")))`
	`350`	`+ {`
	`351`	`+ v = "[" + string.Join(",", v.Split(' ', ',').Select(x => "\"" + x + "\"")) + "]";`
`352`	`352`	`}`
`353`	`353`	`else`
`354`		`- {`
`355`		`- if (!(v.StartsWith("\"") && v.EndsWith("\"")))`
`356`		`- {`
`357`		`- v = "[" + string.Join(",", v.Split(' ', ',').Select(x => "\"" + x + "\"")) + "]";`
`358`		`- }`
`359`		`- else`
`360`		`- {`
`361`		`- v = "[" + v + "]";`
`362`		`- }`
	`354`	`+ {`
	`355`	`+ v = "[" + v + "]";`
`363`	`356`	`}`
`364`	`357`	`}`
`365`	`358`	`else`
`@@ -408,9 +401,9 @@ bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsO`
`408`	`401`	`}`
`409`	`402`	`}`
`410`	`403`
`411`		`- if (item.HasDefaultValue())`
	`404`	`+ if (item.HasDefaultValue)`
`412`	`405`	`{`
`413`		`- invokeArgs[i] = item.DefaultValue();`
	`406`	`+ invokeArgs[i] = item.DefaultValue;`
`414`	`407`	`}`
`415`	`408`	`else if (item.ParameterType == typeof(bool))`
`416`	`409`	`{`