foster/denoland-deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-02-01 12:16:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(std/toml): parser error with inline comments (#6942)

Browse source
This commit is contained in:
Jarrett Helton 2020-08-03 13:26:02 -04:00 • committed by GitHub
parent e9d713c007
commit d615ebefe2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
std/encoding/testdata/boolean.toml vendored
View file

@ -1,3 +1,4 @@
[boolean] # i hate comments [boolean] # i hate comments
bool1 = true bool1 = true
bool2 = false bool2 = false
bool3 = true # I love comments

2
std/encoding/toml.ts
View file

@ -280,7 +280,7 @@ class Parser {
return dataString.slice(0, endOfString); return dataString.slice(0, endOfString);
} }
const m = /(?:|\[|{|).*(?:|\]||})\s*[^#]/g.exec(dataString); const m = /(?:|\[|{).*(?:|\]|})\s*^((?!#).)*/g.exec(dataString);
if (m) { if (m) {
return m[0].trim(); return m[0].trim();
} else { } else {

2
std/encoding/toml_test.ts
View file

@ -48,7 +48,7 @@ Deno.test({
Deno.test({ Deno.test({
name: "[TOML] Boolean", name: "[TOML] Boolean",
fn(): void { fn(): void {
const expected = { boolean: { bool1: true, bool2: false } }; const expected = { boolean: { bool1: true, bool2: false, bool3: true } };
const actual = parseFile(path.join(testFilesDir, "boolean.toml")); const actual = parseFile(path.join(testFilesDir, "boolean.toml"));
assertEquals(actual, expected); assertEquals(actual, expected);
}, },