fix(parser): Improve bad quote error messages (#1014)

epage · web-flow · commit 39dd8b6422ac · 2025-08-04T14:45:30.000-05:00
Fixes #1013
diff --git a/crates/toml/tests/snapshots/invalid/array/missing-separator-01.stderr b/crates/toml/tests/snapshots/invalid/array/missing-separator-01.stderr
@@ -2,4 +2,4 @@ TOML parse error at line 1, column 9
   |
 1 | arrr = [true false]
   |         ^^^^^^^^^^
-invalid boolean, expected `true`
+string values must be quoted, expected literal string
diff --git a/crates/toml/tests/snapshots/invalid/array/missing-separator-02.stderr b/crates/toml/tests/snapshots/invalid/array/missing-separator-02.stderr
@@ -1,12 +1,5 @@
-TOML parse error at line 1, column 15
-  |
-1 | wrong = [ 1 2 3 ]
-  |               ^
-missing comma between array elements, expected `,`
-
----
 TOML parse error at line 1, column 11
   |
 1 | wrong = [ 1 2 3 ]
-  |           ^^^
+  |           ^^^^^
 string values must be quoted, expected literal string
diff --git a/crates/toml/tests/snapshots/invalid/array/no-comma-01.stderr b/crates/toml/tests/snapshots/invalid/array/no-comma-01.stderr
@@ -2,4 +2,4 @@ TOML parse error at line 1, column 15
   |
 1 | no-comma-1 = [true false]
   |               ^^^^^^^^^^
-invalid boolean, expected `true`
+string values must be quoted, expected literal string
diff --git a/crates/toml/tests/snapshots/invalid/array/no-comma-02.stderr b/crates/toml/tests/snapshots/invalid/array/no-comma-02.stderr
@@ -1,12 +1,5 @@
-TOML parse error at line 1, column 20
-  |
-1 | no-comma-2 = [ 1 2 3 ]
-  |                    ^
-missing comma between array elements, expected `,`
-
----
 TOML parse error at line 1, column 16
   |
 1 | no-comma-2 = [ 1 2 3 ]
-  |                ^^^
+  |                ^^^^^
 string values must be quoted, expected literal string
diff --git a/crates/toml/tests/snapshots/invalid/array/no-comma-1.stderr b/crates/toml/tests/snapshots/invalid/array/no-comma-1.stderr
@@ -2,4 +2,4 @@ TOML parse error at line 1, column 15
   |
 1 | no-comma-1 = [true false]
   |               ^^^^^^^^^^
-invalid boolean, expected `true`
+string values must be quoted, expected literal string
diff --git a/crates/toml/tests/snapshots/invalid/array/no-comma-2.stderr b/crates/toml/tests/snapshots/invalid/array/no-comma-2.stderr
@@ -1,12 +1,5 @@
-TOML parse error at line 1, column 20
-  |
-1 | no-comma-2 = [ 1 2 3 ]
-  |                    ^
-missing comma between array elements, expected `,`
-
----
 TOML parse error at line 1, column 16
   |
 1 | no-comma-2 = [ 1 2 3 ]
-  |                ^^^
+  |                ^^^^^
 string values must be quoted, expected literal string
diff --git a/crates/toml/tests/snapshots/invalid/array/text-in-array.stderr b/crates/toml/tests/snapshots/invalid/array/text-in-array.stderr
@@ -1,26 +1,5 @@
-TOML parse error at line 3, column 8
-  |
-3 |   I don't belong,
-  |        ^
-missing comma between array elements, expected `,`
-
----
-TOML parse error at line 4, column 3
-  |
-4 |   "Entry 2",
-  |   ^
-missing comma between array elements, expected `,`
-
----
 TOML parse error at line 3, column 3
   |
 3 |   I don't belong,
-  |   ^^^^^
-invalid float, expected `inf`
-
----
-TOML parse error at line 3, column 18
-  |
-3 |   I don't belong,
-  |                  ^
-invalid literal string, expected `'`
+  |   ^^^^^^^^^^^^^^
+string values must be quoted, expected literal string
diff --git a/crates/toml/tests/snapshots/invalid/inline-table/no-comma-02.stderr b/crates/toml/tests/snapshots/invalid/inline-table/no-comma-02.stderr
@@ -23,4 +23,4 @@ TOML parse error at line 1, column 26
   |
 1 | arrr = { comma-missing = true valid-toml = false }
   |                          ^^^^^^^^^^^^^^^
-invalid boolean, expected `true`
+string values must be quoted, expected literal string
diff --git a/crates/toml/tests/snapshots/invalid/integer/text-after-integer.stderr b/crates/toml/tests/snapshots/invalid/integer/text-after-integer.stderr
@@ -1,12 +1,5 @@
-TOML parse error at line 1, column 17
+TOML parse error at line 1, column 10
   |
 1 | answer = 42 the ultimate answer?
-  |                 ^
-unexpected key or value, expected newline, `#`
-
----
-TOML parse error at line 1, column 12
-  |
-1 | answer = 42 the ultimate answer?
-  |            ^^^^
-invalid float, expected nothing
+  |          ^^^^^^^^^^^^^^^^^^^^^^^
+string values must be quoted, expected literal string
diff --git a/crates/toml/tests/snapshots/invalid/key/newline-02.stderr b/crates/toml/tests/snapshots/invalid/key/newline-02.stderr
@@ -4,13 +4,6 @@ TOML parse error at line 1, column 8
   |        ^
 key with no value, expected `=`
 
----
-TOML parse error at line 2, column 4
-  |
-2 | key" = 1
-  |    ^
-key with no value, expected `=`
-
 ---
 TOML parse error at line 1, column 8
   |
diff --git a/crates/toml/tests/snapshots/invalid/key/newline-03.stderr b/crates/toml/tests/snapshots/invalid/key/newline-03.stderr
@@ -4,13 +4,6 @@ TOML parse error at line 1, column 8
   |        ^
 key with no value, expected `=`
 
----
-TOML parse error at line 2, column 4
-  |
-2 | key' = 1
-  |    ^
-key with no value, expected `=`
-
 ---
 TOML parse error at line 1, column 8
   |
diff --git a/crates/toml/tests/snapshots/invalid/key/partial-quoted.stderr b/crates/toml/tests/snapshots/invalid/key/partial-quoted.stderr
@@ -2,4 +2,11 @@ TOML parse error at line 1, column 8
   |
 1 | partial"quoted" = 5
   |        ^
-key with no value, expected `=`
+invalid unquoted key, expected letters, numbers, `-`, `_`
+
+---
+TOML parse error at line 1, column 15
+  |
+1 | partial"quoted" = 5
+  |               ^
+invalid unquoted key, expected letters, numbers, `-`, `_`
diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-01.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-01.stderr
@@ -1,12 +1,5 @@
-TOML parse error at line 1, column 6
-  |
-1 | s = a"
-  |      ^
-unexpected key or value, expected newline, `#`
-
----
 TOML parse error at line 1, column 5
   |
 1 | s = a"
   |     ^
-string values must be quoted, expected literal string
+missing opening quote, expected `"`
diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-02.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-02.stderr
@@ -1,26 +1,5 @@
-TOML parse error at line 1, column 7
-  |
-1 | a = [a"]
-  |       ^
-missing comma between array elements, expected `,`
-
----
-TOML parse error at line 1, column 10
-  |
-1 | a = [a"]
-  |          ^
-unclosed array, expected `]`
-
----
 TOML parse error at line 1, column 6
   |
 1 | a = [a"]
   |      ^
-string values must be quoted, expected literal string
-
----
-TOML parse error at line 1, column 9
-  |
-1 | a = [a"]
-  |         ^
-invalid basic string, expected `"`
+missing opening quote, expected `"`
diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-03.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-03.stderr
@@ -1,12 +1,5 @@
-TOML parse error at line 1, column 6
-  |
-1 | s = a'
-  |      ^
-unexpected key or value, expected newline, `#`
-
----
 TOML parse error at line 1, column 5
   |
 1 | s = a'
   |     ^
-string values must be quoted, expected literal string
+missing opening quote, expected `'`
diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-04.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-04.stderr
@@ -1,26 +1,5 @@
-TOML parse error at line 1, column 7
-  |
-1 | a = [a']
-  |       ^
-missing comma between array elements, expected `,`
-
----
-TOML parse error at line 1, column 10
-  |
-1 | a = [a']
-  |          ^
-unclosed array, expected `]`
-
----
 TOML parse error at line 1, column 6
   |
 1 | a = [a']
   |      ^
-string values must be quoted, expected literal string
-
----
-TOML parse error at line 1, column 9
-  |
-1 | a = [a']
-  |         ^
-invalid literal string, expected `'`
+missing opening quote, expected `'`
diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-05.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-05.stderr
@@ -1,12 +1,5 @@
-TOML parse error at line 1, column 6
-  |
-1 | a = a"""
-  |      ^
-unexpected key or value, expected newline, `#`
-
----
 TOML parse error at line 1, column 5
   |
 1 | a = a"""
   |     ^
-string values must be quoted, expected literal string
+missing opening quote, expected `"""`
diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-06.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-06.stderr
@@ -1,26 +1,5 @@
-TOML parse error at line 1, column 7
-  |
-1 | a = [a"""]
-  |       ^
-missing comma between array elements, expected `,`
-
----
-TOML parse error at line 1, column 12
-  |
-1 | a = [a"""]
-  |            ^
-unclosed array, expected `]`
-
----
 TOML parse error at line 1, column 6
   |
 1 | a = [a"""]
   |      ^
-string values must be quoted, expected literal string
-
----
-TOML parse error at line 1, column 12
-  |
-1 | a = [a"""]
-  |            ^
-invalid multi-line basic string, expected `"`
+missing opening quote, expected `"""`
diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-07.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-07.stderr
@@ -1,12 +1,5 @@
-TOML parse error at line 1, column 6
-  |
-1 | a = a'''
-  |      ^
-unexpected key or value, expected newline, `#`
-
----
 TOML parse error at line 1, column 5
   |
 1 | a = a'''
   |     ^
-string values must be quoted, expected literal string
+missing opening quote, expected `'''`
diff --git a/crates/toml/tests/snapshots/invalid/string/no-open-08.stderr b/crates/toml/tests/snapshots/invalid/string/no-open-08.stderr
@@ -1,26 +1,5 @@
-TOML parse error at line 1, column 7
-  |
-1 | a = [a''']
-  |       ^
-missing comma between array elements, expected `,`
-
----
-TOML parse error at line 1, column 12
-  |
-1 | a = [a''']
-  |            ^
-unclosed array, expected `]`
-
----
 TOML parse error at line 1, column 6
   |
 1 | a = [a''']
   |      ^
-string values must be quoted, expected literal string
-
----
-TOML parse error at line 1, column 12
-  |
-1 | a = [a''']
-  |            ^
-invalid multi-line literal string, expected `'`
+missing opening quote, expected `'''`
diff --git a/crates/toml_edit/tests/snapshots/invalid/array/missing-separator-01.stderr b/crates/toml_edit/tests/snapshots/invalid/array/missing-separator-01.stderr
@@ -2,4 +2,4 @@ TOML parse error at line 1, column 9
   |
 1 | arrr = [true false]
   |         ^^^^^^^^^^
-invalid boolean, expected `true`
+string values must be quoted, expected literal string
diff --git a/crates/toml_edit/tests/snapshots/invalid/array/missing-separator-02.stderr b/crates/toml_edit/tests/snapshots/invalid/array/missing-separator-02.stderr
@@ -1,5 +1,5 @@
-TOML parse error at line 1, column 15
+TOML parse error at line 1, column 11
   |
 1 | wrong = [ 1 2 3 ]
-  |               ^
-missing comma between array elements, expected `,`
+  |           ^^^^^
+string values must be quoted, expected literal string
diff --git a/crates/toml_edit/tests/snapshots/invalid/array/no-comma-01.stderr b/crates/toml_edit/tests/snapshots/invalid/array/no-comma-01.stderr
@@ -2,4 +2,4 @@ TOML parse error at line 1, column 15
   |
 1 | no-comma-1 = [true false]
   |               ^^^^^^^^^^
-invalid boolean, expected `true`
+string values must be quoted, expected literal string
diff --git a/crates/toml_edit/tests/snapshots/invalid/array/no-comma-02.stderr b/crates/toml_edit/tests/snapshots/invalid/array/no-comma-02.stderr
@@ -1,5 +1,5 @@
-TOML parse error at line 1, column 20
+TOML parse error at line 1, column 16
   |
 1 | no-comma-2 = [ 1 2 3 ]
-  |                    ^
-missing comma between array elements, expected `,`
+  |                ^^^^^
+string values must be quoted, expected literal string
diff --git a/crates/toml_edit/tests/snapshots/invalid/array/no-comma-1.stderr b/crates/toml_edit/tests/snapshots/invalid/array/no-comma-1.stderr
@@ -2,4 +2,4 @@ TOML parse error at line 1, column 15
   |
 1 | no-comma-1 = [true false]
   |               ^^^^^^^^^^
-invalid boolean, expected `true`
+string values must be quoted, expected literal string
diff --git a/crates/toml_edit/tests/snapshots/invalid/array/no-comma-2.stderr b/crates/toml_edit/tests/snapshots/invalid/array/no-comma-2.stderr
@@ -1,5 +1,5 @@
-TOML parse error at line 1, column 20
+TOML parse error at line 1, column 16
   |
 1 | no-comma-2 = [ 1 2 3 ]
-  |                    ^
-missing comma between array elements, expected `,`
+  |                ^^^^^
+string values must be quoted, expected literal string
diff --git a/crates/toml_edit/tests/snapshots/invalid/array/text-in-array.stderr b/crates/toml_edit/tests/snapshots/invalid/array/text-in-array.stderr
@@ -1,5 +1,5 @@
-TOML parse error at line 3, column 8
+TOML parse error at line 3, column 3
   |
 3 |   I don't belong,
-  |        ^
-missing comma between array elements, expected `,`
+  |   ^^^^^^^^^^^^^^
+string values must be quoted, expected literal string
diff --git a/crates/toml_edit/tests/snapshots/invalid/integer/text-after-integer.stderr b/crates/toml_edit/tests/snapshots/invalid/integer/text-after-integer.stderr
@@ -1,5 +1,5 @@
-TOML parse error at line 1, column 17
+TOML parse error at line 1, column 10
   |
 1 | answer = 42 the ultimate answer?
-  |                 ^
-unexpected key or value, expected newline, `#`
+  |          ^^^^^^^^^^^^^^^^^^^^^^^
+string values must be quoted, expected literal string
diff --git a/crates/toml_edit/tests/snapshots/invalid/key/partial-quoted.stderr b/crates/toml_edit/tests/snapshots/invalid/key/partial-quoted.stderr
@@ -2,4 +2,4 @@ TOML parse error at line 1, column 8
   |
 1 | partial"quoted" = 5
   |        ^
-key with no value, expected `=`
+invalid unquoted key, expected letters, numbers, `-`, `_`
diff --git a/crates/toml_edit/tests/snapshots/invalid/string/no-open-01.stderr b/crates/toml_edit/tests/snapshots/invalid/string/no-open-01.stderr
@@ -1,5 +1,5 @@
-TOML parse error at line 1, column 6
+TOML parse error at line 1, column 5
   |
 1 | s = a"
-  |      ^
-unexpected key or value, expected newline, `#`
+  |     ^
+missing opening quote, expected `"`
diff --git a/crates/toml_edit/tests/snapshots/invalid/string/no-open-02.stderr b/crates/toml_edit/tests/snapshots/invalid/string/no-open-02.stderr
diff --git a/crates/toml_edit/tests/snapshots/invalid/string/no-open-03.stderr b/crates/toml_edit/tests/snapshots/invalid/string/no-open-03.stderr
diff --git a/crates/toml_edit/tests/snapshots/invalid/string/no-open-04.stderr b/crates/toml_edit/tests/snapshots/invalid/string/no-open-04.stderr
diff --git a/crates/toml_edit/tests/snapshots/invalid/string/no-open-05.stderr b/crates/toml_edit/tests/snapshots/invalid/string/no-open-05.stderr
diff --git a/crates/toml_edit/tests/snapshots/invalid/string/no-open-06.stderr b/crates/toml_edit/tests/snapshots/invalid/string/no-open-06.stderr
diff --git a/crates/toml_edit/tests/snapshots/invalid/string/no-open-07.stderr b/crates/toml_edit/tests/snapshots/invalid/string/no-open-07.stderr
diff --git a/crates/toml_edit/tests/snapshots/invalid/string/no-open-08.stderr b/crates/toml_edit/tests/snapshots/invalid/string/no-open-08.stderr
diff --git a/crates/toml_parser/src/decoder/scalar.rs b/crates/toml_parser/src/decoder/scalar.rs
diff --git a/crates/toml_parser/src/lexer/mod.rs b/crates/toml_parser/src/lexer/mod.rs
diff --git a/crates/toml_parser/src/parser/document.rs b/crates/toml_parser/src/parser/document.rs
diff --git a/crates/toml_parser/tests/snapshots/testsuite__parse_value__string_missing_opening.txt b/crates/toml_parser/tests/snapshots/testsuite__parse_value__string_missing_opening.txt
diff --git a/crates/toml_parser/tests/testsuite/parse_value.rs b/crates/toml_parser/tests/testsuite/parse_value.rs

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ TOML parse error at line 1, column 9`
`2`	`2`	`\|`
`3`	`3`	`1 \| arrr = [true false]`
`4`	`4`	`\| ^^^^^^^^^^`
`5`		-invalid boolean, expected `true`
	`5`	`+string values must be quoted, expected literal string`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ TOML parse error at line 1, column 15`
`2`	`2`	`\|`
`3`	`3`	`1 \| no-comma-1 = [true false]`
`4`	`4`	`\| ^^^^^^^^^^`
`5`		-invalid boolean, expected `true`
	`5`	`+string values must be quoted, expected literal string`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,4 @@ TOML parse error at line 1, column 26`
`23`	`23`	`\|`
`24`	`24`	`1 \| arrr = { comma-missing = true valid-toml = false }`
`25`	`25`	`\| ^^^^^^^^^^^^^^^`
`26`		-invalid boolean, expected `true`
	`26`	`+string values must be quoted, expected literal string`