Fixed problem with containing quote characters not being stripped from parameter values.

Author: markolbert

Binder.Tests/MiscAllocation.cs

@@ -0,0 +1,28 @@
+using FluentAssertions;
+using J4JSoftware.CommandLine;
+using Xunit;
+
+namespace J4JSoftware.Binder.Tests
+{
+    public class MiscAllocation
+    {
+        [ Theory ]
+        [ InlineData( "-x abc", "abc" ) ]
+        [ InlineData( "-x \"abc\"", "abc" ) ]
+        public void StringHandling( string cmdLine, string? result )
+        {
+            var options = new OptionCollection();
+
+            var option = options.Bind<MiscTarget, string?>( x => x.AStringValue, "x" );
+            option.Should().NotBeNull();
+            options.Log.HasMessages().Should().BeFalse();
+
+            var allocResult = options.Allocator.AllocateCommandLine( cmdLine, options );
+            allocResult.UnknownKeys.Should().BeEmpty();
+            allocResult.UnkeyedParameters.Should().BeEmpty();
+
+            option!.CommandLineValues.Count.Should().Be( 1 );
+            option.CommandLineValues[ 0 ].Should().Be( result );
+        }
+    }
+}

Binder.Tests/results/MiscTarget.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace J4JSoftware.Binder.Tests
+{
+    public class MiscTarget
+    {
+        public string? AStringValue { get; set; }
+    }
+}

Binder/allocating/Allocator.cs

@@ -1,4 +1,5 @@
-using System.Text;
+using System.Linq;
+using System.Text;
 
 #pragma warning disable 8618
 
@@ -8,16 +9,19 @@ public class Allocator : IAllocator
     {
         private readonly IElementTerminator _terminator;
         private readonly IKeyPrefixer _prefixer;
+        private readonly MasterTextCollection _masterText;
         private readonly CommandLineLogger _logger;
 
         public Allocator( 
             IElementTerminator terminator,
             IKeyPrefixer prefixer,
+            MasterTextCollection masterText,
             CommandLineLogger logger
             )
         {
             _terminator = terminator;
             _prefixer = prefixer;
+            _masterText = masterText;
 
             _logger = logger;
         }
@@ -71,7 +75,17 @@ public AllocationResult AllocateCommandLine( string cmdLine, OptionCollection op
                 else
                 {
                     // element is parameter value
-                    if( curOption == null 
+
+                    // strip off any containing quotes
+                    var firstQuoteChar = element.Where(c =>
+                            _masterText[TextUsageType.Quote].Any(x => x == c.ToString()))
+                        .Select(c => c)
+                        .FirstOrDefault();
+
+                    if( firstQuoteChar != char.MinValue )
+                        element = element.Replace( firstQuoteChar.ToString(), "" );
+
+                    if ( curOption == null 
                         || curOption.NumValuesAllocated >= curOption.MaxValues )
                         retVal.UnkeyedParameters.Add( element );
                     else curOption.AddAllocatedValue( element );

Binder/allocating/ElementTerminator.cs

@@ -29,13 +29,13 @@ public int GetMaxTerminatorLength( string text, bool isKey )
             // spaces are terminators only if the text contains no paired allowable quotes 
             // or has an even number of allowable quotes (i.e., the quotes are 'closed')
             var closedQuotes = true;
-
-            foreach( var quoteChar in _masterText[TextUsageType.Quote] )
+            
+            foreach (var quoteChar in _masterText[TextUsageType.Quote])
             {
-                closedQuotes &= text.Count( c => c == quoteChar[0] ) % 2 == 0;
+                closedQuotes &= text.Count(c => c == quoteChar[0]) % 2 == 0;
             }
 
-            if( closedQuotes )
+            if ( closedQuotes )
             {
                 if( text[ ^1 ] == ' ' )
                     retVal = 1;

Binder/options/OptionCollection.cs

@@ -45,7 +45,7 @@ public OptionCollection(
             MasterText = MasterTextCollection.GetDefault(cmdLineStyle);
             ElementTerminator = _elementTerminator ?? new ElementTerminator(MasterText, Log);
             KeyPrefixer = _keyPrefixer ?? new KeyPrefixer(MasterText, Log);
-            Allocator = allocator ?? new Allocator(ElementTerminator, KeyPrefixer, Log);
+            Allocator = allocator ?? new Allocator(ElementTerminator, KeyPrefixer, MasterText, Log);
         }
 
         public OptionCollection(
@@ -60,7 +60,7 @@ public OptionCollection(
             MasterText = mt;
             ElementTerminator = _elementTerminator ?? new ElementTerminator(MasterText, Log);
             KeyPrefixer = _keyPrefixer ?? new KeyPrefixer(MasterText, Log);
-            Allocator = allocator ?? new Allocator(ElementTerminator, KeyPrefixer, Log);
+            Allocator = allocator ?? new Allocator(ElementTerminator, KeyPrefixer, MasterText, Log);
         }
 
         public CommandLineStyle CommandLineStyle { get; }