Allow tab character in normal and literal string.

xoofx · Dec 21, 2022 · ee0df99 · ee0df99
1 parent 1691ab6
commit ee0df99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/src/Tomlyn.Tests/ValidatorTests.cs b/src/Tomlyn.Tests/ValidatorTests.cs
@@ -90,18 +90,13 @@ public void TestTableArrayAndInvalidTable()
         }
 
         [Test]
-        public void TestValidControlCharacters()
+        public void TestAllowTab()
         {
             var input = "";
-            input += "backspace='\b'\n";
-            input += "tab='\t'\n";
-            input += "form_feed='\f'\n";
-            input += "quote='\"'\n";
-            input += "backslash='\\'\n";
-            input += "heart='\u2665'\n";
-            input += "some_unicode='\U0002B695'\n";
+            input += "tab_normal=\"\t\"\n";
+            input += "tab_literal='\t'\n";
             var doc = Toml.Parse(input);
-            Assert.False(doc.HasErrors, "The document should not have errors on valid control characters");
+            Assert.False(doc.HasErrors, "The document should not have errors on tab character");
         }
 
     }

diff --git a/src/Tomlyn/Parsing/Lexer.cs b/src/Tomlyn/Parsing/Lexer.cs
@@ -797,7 +797,7 @@ private void ReadString(TextPosition start, bool allowMultiline)
                     {
                         AddError("Invalid newline in a string", _position, _position);
                     }
-                    else if (CharHelper.IsControlCharacter(_c) && (!isMultiLine || !CharHelper.IsWhiteSpaceOrNewLine(_c)))
+                    else if (CharHelper.IsControlCharacter(_c) && _c != '\t' && (!isMultiLine || !CharHelper.IsWhiteSpaceOrNewLine(_c)))
                     {
                         AddError($"Invalid control character found {((char)_c).ToPrintableString()}", start, start);
                     }
@@ -1016,7 +1016,7 @@ private void ReadStringLiteral(TextPosition start, bool allowMultiline)
                 {
                     AddError("Invalid newline in a string", _position, _position);
                 }
-                else if (CharHelper.IsControlCharacter(_c) && !CharHelper.IsNonNewlineValidControlCharacter(_c) && (!isMultiLine || !CharHelper.IsNewLine(_c)))
+                else if (CharHelper.IsControlCharacter(_c) && _c != '\t' && (!isMultiLine || !CharHelper.IsNewLine(_c)))
                 {
                     AddError($"Invalid control character found {((char)_c).ToPrintableString()}", start, start);
                 }

diff --git a/src/Tomlyn/Text/CharHelper.cs b/src/Tomlyn/Text/CharHelper.cs
@@ -24,11 +24,6 @@ public static bool IsControlCharacter(char32 c)
             return c <= 0x1F || c == 0x7F;
         }
 
-        public static bool IsNonNewlineValidControlCharacter(char32 c)
-        {
-            return c == '\b' || c == '\t' || c == '\f';
-        }
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsKeyStart(char32 c)
         {