Corrected issue when parsing a string containing only the strict operand dlimiter. Added test.

Author: jpdillingham

Utility.CommandLine.Arguments.Tests/Arguments.cs

@@ -340,6 +340,34 @@ public void ParseShorts()
             Assert.Equal("hello world", test["c"]);
         }
 
+        /// <summary>
+        ///     Tests the <see cref="Utility.CommandLine.Arguments.Parse(string)"/> method with a a string containing only the
+        ///     strict operand delimiter.
+        /// </summary>
+        [Fact]
+        public void ParseStrictOperandDelimiterOnly()
+        {
+            CommandLine.Arguments test = CommandLine.Arguments.Parse("--");
+
+            Assert.Equal(0, test.OperandList.Count);
+        }
+
+        /// <summary>
+        ///     Tests the <see cref="Utility.CommandLine.Arguments.Parse(string)"/> method with a a string containing multiple
+        ///     strict operand delimiters.
+        /// </summary>
+        [Fact]
+        public void ParseStrictOperandMultipleDelimiter()
+        {
+            CommandLine.Arguments test = CommandLine.Arguments.Parse("one -- two -- three");
+
+            Assert.Equal(4, test.OperandList.Count);
+            Assert.Equal("one", test.OperandList[0]);
+            Assert.Equal("two", test.OperandList[1]);
+            Assert.Equal("--", test.OperandList[2]);
+            Assert.Equal("three", test.OperandList[3]);
+        }
+
         /// <summary>
         ///     Tests the <see cref="Utility.CommandLine.Arguments.Parse(string)"/> method with an explicit operand delimiter.
         /// </summary>
@@ -365,7 +393,7 @@ public void ParseStrictOperands()
         [Fact]
         public void ParseStrictOperandsEmpty()
         {
-            CommandLine.Arguments test = CommandLine.Arguments.Parse("--test one two -- ");
+            CommandLine.Arguments test = CommandLine.Arguments.Parse("--test one two --");
 
             Assert.Equal(1, test.OperandList.Count);
             Assert.Equal("two", test.OperandList[0]);

Utility.CommandLine.Arguments/Arguments.cs

@@ -150,7 +150,7 @@ public class Arguments
         ///     This regular expression effectively splits a string into two parts; the part before the first "--", and the part
         ///     after. Instances of "--" not surrounded by a word boundary and those enclosed in quotes are ignored.
         /// </remarks>
-        private const string StrictOperandSplitRegEx = "(.*[^\\\"\\\'])?\\B-{2}\\B[^\\\"\\\'](.*)";
+        private const string StrictOperandSplitRegEx = "(.*?[^\\\"\\\'])?(\\B-{2}\\B)[^\\\"\\\']?(.*)";
 
         #endregion Private Fields
 
@@ -228,7 +228,7 @@ public string this[string index]
             MatchCollection matches = Regex.Matches(commandLineString, StrictOperandSplitRegEx);
 
             // if there is a match, the string contains the strict operand delimiter. parse the first and second matches accordingly.
-            if (matches.Count > 0 && matches[0].Groups.Count >= 1)
+            if (matches.Count > 0)
             {
                 // the first group of the first match will contain everything in the string prior to the strict operand delimiter,
                 // so extract the argument key/value pairs and list of operands from that string.
@@ -237,9 +237,9 @@ public string this[string index]
 
                 // the first group of the second match will contain everything in the string after the strict operand delimiter, so
                 // extract the operands from that string using the strict method.
-                if (matches[0].Groups[2].Value != string.Empty)
+                if (matches[0].Groups[3].Value != string.Empty)
                 {
-                    List<string> operandListStrict = GetOperandListStrict(matches[0].Groups[2].Value);
+                    List<string> operandListStrict = GetOperandListStrict(matches[0].Groups[3].Value);
 
                     // join the operand lists.
                     operandList.AddRange(operandListStrict);