Fix incorrect error span for out-of-range Unicode escapes

LukasKalbertodt · LukasKalbertodt · commit 8c55d089c61f · 2025-07-25T17:35:12.000+02:00
diff --git a/src/char/tests.rs b/src/char/tests.rs
@@ -199,7 +199,7 @@ fn invalid_unicode_escapes() {
     assert_err!(CharLit, r"'\u{1_23_4_56_7}'", TooManyDigitInUnicodeEscape, 14);
     assert_err!(CharLit, r"'\u{abcdef123}'", TooManyDigitInUnicodeEscape, 10);
 
-    assert_err!(CharLit, r"'\u{110000}'", InvalidUnicodeEscapeChar, 1..10);
+    assert_err!(CharLit, r"'\u{110000}'", InvalidUnicodeEscapeChar, 1..11);
 }
 
 #[test]
diff --git a/src/escape.rs b/src/escape.rs
@@ -86,7 +86,7 @@ pub(crate) fn unescape<E: Escapee>(
             }
 
             let c = std::char::from_u32(v)
-                .ok_or(perr(offset..closing_pos + 1, InvalidUnicodeEscapeChar))?;
+                .ok_or(perr(offset..offset + closing_pos + 1, InvalidUnicodeEscapeChar))?;
 
             (E::from_char(c), closing_pos + 1)
         }
diff --git a/src/string/tests.rs b/src/string/tests.rs
@@ -253,5 +253,5 @@ fn invalid_unicode_escapes() {
     assert_err!(StringLit, r#""నక్క\u{1_23_4_56_7}""#, TooManyDigitInUnicodeEscape, 26);
     assert_err!(StringLit, r#""\u{abcdef123}лиса""#, TooManyDigitInUnicodeEscape, 10);
 
-    assert_err!(StringLit, r#""\u{110000}fox""#, InvalidUnicodeEscapeChar, 1..10);
+    assert_err!(StringLit, r#""\u{110000}fox""#, InvalidUnicodeEscapeChar, 1..11);
 }

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ fn invalid_unicode_escapes() {`
`199`	`199`	`assert_err!(CharLit, r"'\u{1_23_4_56_7}'", TooManyDigitInUnicodeEscape, 14);`
`200`	`200`	`assert_err!(CharLit, r"'\u{abcdef123}'", TooManyDigitInUnicodeEscape, 10);`
`201`	`201`
`202`		`- assert_err!(CharLit, r"'\u{110000}'", InvalidUnicodeEscapeChar, 1..10);`
	`202`	`+ assert_err!(CharLit, r"'\u{110000}'", InvalidUnicodeEscapeChar, 1..11);`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`#[test]`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ pub(crate) fn unescape<E: Escapee>(`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`let c = std::char::from_u32(v)`
`89`		`- .ok_or(perr(offset..closing_pos + 1, InvalidUnicodeEscapeChar))?;`
	`89`	`+ .ok_or(perr(offset..offset + closing_pos + 1, InvalidUnicodeEscapeChar))?;`
`90`	`90`
`91`	`91`	`(E::from_char(c), closing_pos + 1)`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -253,5 +253,5 @@ fn invalid_unicode_escapes() {`
`253`	`253`	`assert_err!(StringLit, r#""నక్క\u{1_23_4_56_7}""#, TooManyDigitInUnicodeEscape, 26);`
`254`	`254`	`assert_err!(StringLit, r#""\u{abcdef123}лиса""#, TooManyDigitInUnicodeEscape, 10);`
`255`	`255`
`256`		`- assert_err!(StringLit, r#""\u{110000}fox""#, InvalidUnicodeEscapeChar, 1..10);`
	`256`	`+ assert_err!(StringLit, r#""\u{110000}fox""#, InvalidUnicodeEscapeChar, 1..11);`
`257`	`257`	`}`