Fixed problem with help options being treated as potentially supporting parameters. Updated examples to demonstrate handling of unkeyed parameters.

Author: markolbert

J4JCommandLine/allocating/Allocator.cs

@@ -13,6 +13,7 @@ public class Allocator : IAllocator
         private readonly IElementKey _prefixer;
 
         private StringComparison _keyComp;
+        private MasterTextCollection _masterText;
 
         public Allocator( 
             IElementTerminator terminator,
@@ -31,10 +32,11 @@ public bool Initialize(
             MasterTextCollection masterText )
         {
             _keyComp = keyComp;
+            _masterText = masterText;
 
-            _prefixer.Initialize( keyComp, logger, masterText );
+            _prefixer.Initialize( keyComp, logger, _masterText );
 
-            _terminator.Initialize(keyComp, logger, masterText);
+            _terminator.Initialize(keyComp, logger, _masterText);
 
             return _prefixer.IsInitialized && _terminator.IsInitialized;
         }
@@ -79,10 +81,15 @@ public Allocations AllocateCommandLine( string cmdLine )
                     if( !retVal.Contains( element ) )
                         retVal.Add( new Allocation( retVal ) { Key = element } );
 
-                    // store a reference to the current/active Allocation
-                    curResult = retVal[ element ];
-
-                    lastElementWasKey = true;
+                    // store a reference to the current/active Allocation unless the
+                    // element is a request for help (because help options cannot have
+                    // parameters)
+                    if( !_masterText.Contains( element, TextUsageType.HelpOptionKey ) )
+                    {
+                        curResult = retVal[ element ];
+                        lastElementWasKey = true;
+                    }
+                    else lastElementWasKey = false;
                 }
                 else
                 {

examples/InstancePropertyExample/Configuration.cs

@@ -1,8 +1,11 @@
-namespace InstancePropertyExample
+using System.Collections.Generic;
+
+namespace InstancePropertyExample
 {
     public class Configuration
     {
         public int IntValue { get; set; }
         public string TextValue { get; set; }
+        public List<string> Unkeyed { get; set; }
     }
 }

examples/InstancePropertyExample/Program.cs

@@ -35,6 +35,8 @@ static void Main(string[] args)
                 .SetDescription("a text value")
                 .SetDefaultValue("some text value");
 
+            binder.BindUnkeyed(x => x.Unkeyed);
+
             if (!binder.Parse(args))
             {
                 Environment.ExitCode = 1;
@@ -43,6 +45,10 @@ static void Main(string[] args)
 
             Console.WriteLine($"IntValue is {binder.Value.IntValue}");
             Console.WriteLine($"TextValue is {binder.Value.TextValue}");
+
+            Console.WriteLine(binder.Value.Unkeyed.Count == 0
+                ? "No unkeyed parameters"
+                : $"Unkeyed parameters: {string.Join(", ", binder.Value.Unkeyed)}");
         }
 
         private static void InitializeServiceProvider()

examples/InstancePropertyExample/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "InstancePropertyExample": {
+      "commandName": "Project",
+      "commandLineArgs": "-i 5 -h abc def"
+    }
+  }
+}

examples/StaticPropertyExample/Program.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using Alba.CsConsoleFormat;
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using J4JSoftware.CommandLine;
@@ -33,6 +35,8 @@ static void Main(string[] args)
                 .SetDescription( "a text value" )
                 .SetDefaultValue( "some text value" );
 
+            binder.BindUnkeyed( x => Program.Unkeyed );
+
             if( !binder.Parse( args ) )
             {
                 Environment.ExitCode = 1;
@@ -41,11 +45,16 @@ static void Main(string[] args)
 
             Console.WriteLine($"IntValue is {IntValue}");
             Console.WriteLine($"TextValue is {TextValue}");
+
+            Console.WriteLine( Unkeyed.Count == 0
+                ? "No unkeyed parameters"
+                : $"Unkeyed parameters: {string.Join( ", ", Unkeyed )}" );
         }
 
         public static IServiceProvider ServiceProvider { get; set; }
         public static int IntValue { get; set; }
         public static string TextValue { get; set; }
+        public static List<string> Unkeyed { get; set; }
 
         private static void InitializeServiceProvider()
         {

examples/StaticPropertyExample/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "ConsoleAppJ4JCmdLine": {
       "commandName": "Project",
-      "commandLineArgs": "-i -5 -h"
+      "commandLineArgs": "-i 5 -h abc def"
     }
   }
 }