Fixed bug with parsing of multiple quoted arguments. Added a test for values with inner quotes, fixed the value trimming code to only trim the outermost pair.

Author: jpdillingham

Utility.CommandLine.Arguments.Tests/Arguments.cs

@@ -86,27 +86,27 @@ public class Arguments
         private static string LowerCase { get; set; }
 
         /// <summary>
-        ///     Gets or sets a test property.
+        ///     Gets or sets a property with no attribute.
         /// </summary>
-        [CommandLine.Argument('t', "test-prop")]
-        private static string TestProp { get; set; }
+        private static string NonArgumentProperty { get; set; }
 
         /// <summary>
-        ///     Gets or sets a test property.
+        ///     Gets or sets a property with an attribute other than Argument
         /// </summary>
-        [CommandLine.Argument('C', "CASE-SENSITIVE")]
-        private static string UpperCase { get; set; }
+        [Obsolete]
+        private static string PlainProperty { get; set; }
 
         /// <summary>
-        ///     Gets or sets a property with no attribute.
+        ///     Gets or sets a test property.
         /// </summary>
-        private static string NonArgumentProperty { get; set; }
+        [CommandLine.Argument('t', "test-prop")]
+        private static string TestProp { get; set; }
 
         /// <summary>
-        ///     Gets or sets a property with an attribute other than Argument
+        ///     Gets or sets a test property.
         /// </summary>
-        [Obsolete]
-        private static string PlainProperty { get; set; }
+        [CommandLine.Argument('C', "CASE-SENSITIVE")]
+        private static string UpperCase { get; set; }
 
         #endregion Private Properties
 
@@ -145,6 +145,19 @@ public void ParseCaseSensitive()
             Assert.False(test.ContainsKey("C"));
         }
 
+        /// <summary>
+        ///     Tests the <see cref="Utility.CommandLine.Arguments.Parse(string)"/> method with an exclicit command line string
+        ///     containing values with inner quoted strings.
+        /// </summary>
+        [Fact]
+        public void ParseInnerQuotedStrings()
+        {
+            Dictionary<string, string> test = CommandLine.Arguments.Parse("--test1 \"test \'1\'\" --test2 \'test \"2\"\'");
+
+            Assert.Equal("test \'1\'", test["test1"]);
+            Assert.Equal("test \"2\"", test["test2"]);
+        }
+
         /// <summary>
         ///     Tests the <see cref="Utility.CommandLine.Arguments.Parse(string)"/> method with an explicit command line string
         ///     containing a mixture of short and long arguments.
@@ -162,6 +175,21 @@ public void ParseLongAndShortMix()
             Assert.Equal("4", test["4"]);
         }
 
+        /// <summary>
+        ///     Tests the <see cref="Utility.CommandLine.Arguments.Parse(string)"/> method with an explicit command line string
+        ///     containing multiple pairs of arguments containing quoted values.
+        /// </summary>
+        [Fact]
+        public void ParseMultipleQuotes()
+        {
+            Dictionary<string, string> test = CommandLine.Arguments.Parse("--test1 \"1\" --test2 \"2\" --test3 \'3\' --test4 \'4\'");
+
+            Assert.Equal("1", test["test1"]);
+            Assert.Equal("2", test["test2"]);
+            Assert.Equal("3", test["test3"]);
+            Assert.Equal("4", test["test4"]);
+        }
+
         /// <summary>
         ///     Tests the <see cref="Utility.CommandLine.Arguments.Parse(string)"/> method with an explicit command line string
         ///     containing only short parameters.
@@ -199,20 +227,6 @@ public void ParseStringOfLongs()
             Assert.Equal("5 5", test["five"]);
         }
 
-        /// <summary>
-        ///     Tests the <see cref="Utility.CommandLine.Arguments.Parse(string)"/> method with an explicit command line string containing multiple pairs of arguments containing quoted values.
-        /// </summary>
-        [Fact]
-        public void ParseMultipleQuotes()
-        {
-            Dictionary<string, string> test = CommandLine.Arguments.Parse("--test1 \"1\" --test2 \"2\" --test3 \'3\' --test4 \'4\'");
-
-            Assert.Equal("1", test["test1"]);
-            Assert.Equal("2", test["test2"]);
-            Assert.Equal("3", test["test3"]);
-            Assert.Equal("4", test["test4"]);
-        }
-
         /// <summary>
         ///     Tests the <see cref="Utility.CommandLine.Arguments.Populate(string)"/> method with the default values.
         /// </summary>

Utility.CommandLine.Arguments/Arguments.cs

@@ -66,7 +66,7 @@ public static class Arguments
         /// <summary>
         ///     The regular expression with which to parse the command line string.
         /// </summary>
-        private const string ArgumentRegEx = "(?:[-]{1,2}|\\/)([\\w-]+)[=|:| ]?(\\w\\S*|\\\".*\\\"|\\\'.*\\\')?";
+        private const string ArgumentRegEx = "(?:[-]{1,2}|\\/)([\\w-]+)[=|:| ]?(\\w\\S*|\\\"[^\".]*\\\"|\\\'[^'.]*\\\')?";
 
         /// <summary>
         ///     The regular expression with which to parse argument-value groups.
@@ -232,7 +232,17 @@ private static Dictionary<string, string> GetArgumentDictionary(string commandLi
             {
                 string fullMatch = match.Groups[0].Value;
                 string argument = match.Groups[1].Value;
-                string value = match.Groups[2].Value.Trim('"', '\'');
+                string value = match.Groups[2].Value;
+
+                // trim outer quotes, if present
+                if (value.StartsWith("\"") && value.EndsWith("\""))
+                {
+                    value = value.Trim('"');
+                }
+                else if (value.StartsWith("'") && value.EndsWith("'"))
+                {
+                    value = value.Trim('\'');
+                }
 
                 // check to see if the argument uses a single dash. if so, split the argument name into a char array and add each
                 // to the dictionary. if a value is specified, it belongs to the final character.