also print out optional paramters (if any) when auto-printing help fo…

…r missing parameters
rebus-org · Apr 27, 2017 · 8f2ac3c · 8f2ac3c
1 parent 09a627d
commit 8f2ac3c
Showing 1 changed file with 27 additions and 3 deletions.
diff --git a/GoCommando/Internals/CommandInvoker.cs b/GoCommando/Internals/CommandInvoker.cs
@@ -140,15 +140,39 @@ void InnerInvoke(IEnumerable<Switch> switches, EnvironmentSettings environmentSe
                             && !CanBeResolvedFromEnvironmentSettings(environmentSettings, p))
                 .ToList();
 
+            var optionalParamtersNotSpecified = Parameters
+                .Where(p => p.Optional
+                            && !CanBeResolvedFromSwitches(switches, p)
+                            && !CanBeResolvedFromEnvironmentSettings(environmentSettings, p))
+                .ToList();
+
             if (requiredParametersMissing.Any())
             {
                 var requiredParametersMissingString = string.Join(Environment.NewLine,
                     requiredParametersMissing.Select(p => $"    {_settings.SwitchPrefix}{p.Name} - {p.DescriptionText}"));
 
-                throw new GoCommandoException(
-                    $@"The following required parameters are missing:
+                var text = $@"The following required parameters are missing:
+
+{requiredParametersMissingString}";
+
+                if (optionalParamtersNotSpecified.Any())
+                {
+                    var optionalParamtersNotSpecifiedString = string.Join(Environment.NewLine,
+                        optionalParamtersNotSpecified.Select(p => $"    {_settings.SwitchPrefix}{p.Name} - {p.DescriptionText}"));
+
+                    var moreText = $@"The following optional parameters are also available:
+
+{optionalParamtersNotSpecifiedString}";
+
+                    throw new GoCommandoException(string.Concat(
+                        text,
+                        Environment.NewLine,
+                        Environment.NewLine,
+                        moreText
+                    ));
+                }
 
-{requiredParametersMissingString}");
+                throw new GoCommandoException(text);
             }
 
             var switchesWithoutMathingParameter = switches