Fixed VdfTextReader treating slashes in quoted values as comments

- Resolves #27. - Also added a test so it doesn't break again.
shravan2x · Jun 20, 2020 · c27ca7a · c27ca7a
1 parent c2aa841
commit c27ca7a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/Gameloop.Vdf/VdfTextReader.cs b/Gameloop.Vdf/VdfTextReader.cs
@@ -61,7 +61,7 @@ public override bool ReadToken()
                         continue;
                     }
                 }
-                else if (_tokenSize == 0 && curChar == VdfStructure.Comment && _charBuffer[_charPos + 1] == VdfStructure.Comment)
+                else if (!_isQuoted && _tokenSize == 0 && curChar == VdfStructure.Comment && _charBuffer[_charPos + 1] == VdfStructure.Comment)
                 {
                     _isComment = true;
                     _charPos += 2;

diff --git a/Tests/VdfConvertFacts.cs b/Tests/VdfConvertFacts.cs
@@ -16,7 +16,7 @@ public void EmptyStringThrowsException()
         [Fact]
         public void CommentsDeserializeCorrectly()
         {
-            string vdf = @"
+            const string vdf = @"
                 // Comment type A (at the start of the file)
                 ""root""
                 {
@@ -44,5 +44,24 @@ public void CommentsDeserializeCorrectly()
 
             Assert.True(VToken.DeepEquals(result, expected));
         }
+
+        [Fact]
+        public void DoubleSlashInValueDeserializesCorrectly()
+        {
+            const string vdf = @"
+                ""root""
+                {
+                    ""key1"" ""//""
+                }
+            ";
+            VProperty result = VdfConvert.Deserialize(vdf);
+
+            VProperty expected = new VProperty("root", new VObject
+            {
+                new VProperty("key1", new VValue("//")),
+            });
+
+            Assert.True(VToken.DeepEquals(result, expected));
+        }
     }
 }