format parser does not handle escape character #16

Author: neuecc

sandbox/ConsoleApp/Program.cs

@@ -25,12 +25,13 @@ static void Main(string[] args)
 
         static void Run()
         {
-var a = new string('a', 10000);
-var b = new string('b', 1000000);
+            TimeSpan span = new TimeSpan(12, 34, 56);
+            Console.WriteLine($"string.Format: {string.Format(@"{0:h\,h\:mm\:ss}", span)}");
+
+
+            Console.WriteLine($"ZString.Format: {ZString.Format(@"{0:h\,h\:mm\:ss}", span)}");
 
-ZString.Join(',', new string[] { a, b });
 
-            
 
         }
     }

src/ZString.Unity/Assets/Scripts/ZString/FormatParser.cs

@@ -42,7 +42,7 @@ public static ParseResult Parse(ReadOnlySpan<char> format)
                     }
                 }
 
-                if (index == -1 && format[i] == ',' || format[i] == ':')
+                if (index == -1 && (format[i] == ',' && format[i - 1] != '\\') || (format[i] == ':' && format[i - 1] != '\\'))
                 {
                     index = Int32.Parse(format.Slice(1, i - 1));
                     formatStart = i + 1;

src/ZString/FormatParser.cs

@@ -42,7 +42,7 @@ public static ParseResult Parse(ReadOnlySpan<char> format)
                     }
                 }
 
-                if (index == -1 && format[i] == ',' || format[i] == ':')
+                if (index == -1 && (format[i] == ',' && format[i - 1] != '\\') || (format[i] == ':' && format[i - 1] != '\\'))
                 {
                     index = Int32.Parse(format.Slice(1, i - 1));
                     formatStart = i + 1;

tests/ZString.Tests/FormatTest.cs

@@ -96,5 +96,15 @@ public void FormatArgs()
         {
             ZString.Format("{0:00000000}-{1:00000000}", 100, 200).Should().Be("00000100-00000200");
         }
+
+        [Fact]
+        public void Escape()
+        {
+            TimeSpan span = new TimeSpan(12, 34, 56);
+            var reference = string.Format(@"{0:h\,h\:mm\:ss}", span);
+
+            var actual = ZString.Format(@"{0:h\,h\:mm\:ss}", span);
+            actual.Should().Be(reference);
+        }
     }
 }