Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-10 15:14:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: handle errors for string byte string and c_string

Browse source
This commit is contained in:
Pol Valletbó 2023-10-11 15:25:52 +02:00
parent 677e6f3439
commit e1aeb7fa79
7 changed files with 167 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
crates/parser/src/lexed_str.rs
View file

@ -8,7 +8,10 @@
//! Note that these tokens, unlike the tokens we feed into the parser, do
//! include info about comments and whitespace.
use rustc_dependencies::lexer as rustc_lexer;
use rustc_dependencies::lexer::{
self as rustc_lexer,
unescape::{unescape_c_string, unescape_literal},
};
use std::ops;
@ -284,18 +287,45 @@ impl<'a> Converter<'a> {
rustc_lexer::LiteralKind::Str { terminated } => {
if !terminated {
err = "Missing trailing `\"` symbol to terminate the string literal";
} else {
let text = &self.res.text[self.offset + 1..][..len - 1];
let i = text.rfind('"').unwrap();
let text = &text[..i];
rustc_lexer::unescape::unescape_literal(text, Mode::Str, &mut |_, res| {
if let Err(e) = res {
err = error_to_diagnostic_message(e, Mode::Str);
}
});
}
STRING
}
rustc_lexer::LiteralKind::ByteStr { terminated } => {
if !terminated {
err = "Missing trailing `\"` symbol to terminate the byte string literal";
} else {
let text = &self.res.text[self.offset + 2..][..len - 2];
let i = text.rfind('"').unwrap();
let text = &text[..i];
rustc_lexer::unescape::unescape_literal(text, Mode::ByteStr, &mut |_, res| {
if let Err(e) = res {
err = error_to_diagnostic_message(e, Mode::ByteStr);
}
})
}
BYTE_STRING
}
rustc_lexer::LiteralKind::CStr { terminated } => {
if !terminated {
err = "Missing trailing `\"` symbol to terminate the string literal";
} else {
let text = &self.res.text[self.offset + 2..][..len - 2];
let i = text.rfind('"').unwrap();
let text = &text[..i];
rustc_lexer::unescape::unescape_c_string(text, Mode::CStr, &mut |_, res| {
if let Err(e) = res {
err = error_to_diagnostic_message(e, Mode::CStr);
}
})
}
C_STRING
}
@ -360,3 +390,13 @@ fn error_to_diagnostic_message(error: EscapeError, mode: Mode) -> &'static str {
EscapeError::MultipleSkippedLinesWarning => "",
}
}
fn fill_unescape_string_error(text: &str, mode: Mode, mut error_message: &str) {
rustc_lexer::unescape::unescape_c_string(text, mode, &mut |_, res| {
if let Err(e) = res {
error_message = error_to_diagnostic_message(e, mode);
}
});
}

28
crates/parser/test_data/lexer/err/byte_strings.rast Normal file
View file

@ -0,0 +1,28 @@
BYTE_STRING "b\"\\💩\"" error: unknown byte escape
WHITESPACE "\n"
BYTE_STRING "b\"\\●\"" error: unknown byte escape
WHITESPACE "\n"
BYTE_STRING "b\"\\u{_0000}\"" error: invalid start of unicode escape
WHITESPACE "\n"
BYTE_STRING "b\"\\u{0000000}\"" error: overlong unicode escape
WHITESPACE "\n"
BYTE_STRING "b\"\\u{FFFFFF}\"" error: unicode escape in byte string
WHITESPACE "\n"
BYTE_STRING "b\"\\u{ffffff}\"" error: unicode escape in byte string
WHITESPACE "\n"
BYTE_STRING "b\"\\u{ffffff}\"" error: unicode escape in byte string
WHITESPACE "\n"
BYTE_STRING "b\"\\u{DC00}\"" error: unicode escape in byte string
WHITESPACE "\n"
BYTE_STRING "b\"\\u{DDDD}\"" error: unicode escape in byte string
WHITESPACE "\n"
BYTE_STRING "b\"\\u{DFFF}\"" error: unicode escape in byte string
WHITESPACE "\n"
BYTE_STRING "b\"\\u{D800}\"" error: unicode escape in byte string
WHITESPACE "\n"
BYTE_STRING "b\"\\u{DAAA}\"" error: unicode escape in byte string
WHITESPACE "\n"
BYTE_STRING "b\"\\u{DBFF}\"" error: unicode escape in byte string
WHITESPACE "\n"
BYTE_STRING "b\"\\xы\"" error: invalid character in numeric character escape
WHITESPACE "\n"

14
crates/parser/test_data/lexer/err/byte_strings.rs Normal file
View file

@ -0,0 +1,14 @@
b"\💩"
b"\●"
b"\u{_0000}"
b"\u{0000000}"
b"\u{FFFFFF}"
b"\u{ffffff}"
b"\u{ffffff}"
b"\u{DC00}"
b"\u{DDDD}"
b"\u{DFFF}"
b"\u{D800}"
b"\u{DAAA}"
b"\u{DBFF}"
b"\xы"

28
crates/parser/test_data/lexer/err/c_strings.rast Normal file
View file

@ -0,0 +1,28 @@
C_STRING "c\"\\💩\"" error: unknown character escape
WHITESPACE "\n"
C_STRING "c\"\\●\"" error: unknown character escape
WHITESPACE "\n"
C_STRING "c\"\\u{_0000}\"" error: invalid start of unicode escape
WHITESPACE "\n"
C_STRING "c\"\\u{0000000}\"" error: overlong unicode escape
WHITESPACE "\n"
C_STRING "c\"\\u{FFFFFF}\"" error: invalid unicode character escape
WHITESPACE "\n"
C_STRING "c\"\\u{ffffff}\"" error: invalid unicode character escape
WHITESPACE "\n"
C_STRING "c\"\\u{ffffff}\"" error: invalid unicode character escape
WHITESPACE "\n"
C_STRING "c\"\\u{DC00}\"" error: invalid unicode character escape
WHITESPACE "\n"
C_STRING "c\"\\u{DDDD}\"" error: invalid unicode character escape
WHITESPACE "\n"
C_STRING "c\"\\u{DFFF}\"" error: invalid unicode character escape
WHITESPACE "\n"
C_STRING "c\"\\u{D800}\"" error: invalid unicode character escape
WHITESPACE "\n"
C_STRING "c\"\\u{DAAA}\"" error: invalid unicode character escape
WHITESPACE "\n"
C_STRING "c\"\\u{DBFF}\"" error: invalid unicode character escape
WHITESPACE "\n"
C_STRING "c\"\\xы\"" error: invalid character in numeric character escape
WHITESPACE "\n"

14
crates/parser/test_data/lexer/err/c_strings.rs Normal file
View file

@ -0,0 +1,14 @@
c"\💩"
c"\●"
c"\u{_0000}"
c"\u{0000000}"
c"\u{FFFFFF}"
c"\u{ffffff}"
c"\u{ffffff}"
c"\u{DC00}"
c"\u{DDDD}"
c"\u{DFFF}"
c"\u{D800}"
c"\u{DAAA}"
c"\u{DBFF}"
c"\xы"

28
crates/parser/test_data/lexer/err/strings.rast Normal file
View file

@ -0,0 +1,28 @@
STRING "\"\\💩\"" error: unknown character escape
WHITESPACE "\n"
STRING "\"\\●\"" error: unknown character escape
WHITESPACE "\n"
STRING "\"\\u{_0000}\"" error: invalid start of unicode escape
WHITESPACE "\n"
STRING "\"\\u{0000000}\"" error: overlong unicode escape
WHITESPACE "\n"
STRING "\"\\u{FFFFFF}\"" error: invalid unicode character escape
WHITESPACE "\n"
STRING "\"\\u{ffffff}\"" error: invalid unicode character escape
WHITESPACE "\n"
STRING "\"\\u{ffffff}\"" error: invalid unicode character escape
WHITESPACE "\n"
STRING "\"\\u{DC00}\"" error: invalid unicode character escape
WHITESPACE "\n"
STRING "\"\\u{DDDD}\"" error: invalid unicode character escape
WHITESPACE "\n"
STRING "\"\\u{DFFF}\"" error: invalid unicode character escape
WHITESPACE "\n"
STRING "\"\\u{D800}\"" error: invalid unicode character escape
WHITESPACE "\n"
STRING "\"\\u{DAAA}\"" error: invalid unicode character escape
WHITESPACE "\n"
STRING "\"\\u{DBFF}\"" error: invalid unicode character escape
WHITESPACE "\n"
STRING "\"\\xы\"" error: invalid character in numeric character escape
WHITESPACE "\n"

14
crates/parser/test_data/lexer/err/strings.rs Normal file
View file

@ -0,0 +1,14 @@
"\💩"
"\●"
"\u{_0000}"
"\u{0000000}"
"\u{FFFFFF}"
"\u{ffffff}"
"\u{ffffff}"
"\u{DC00}"
"\u{DDDD}"
"\u{DFFF}"
"\u{D800}"
"\u{DAAA}"
"\u{DBFF}"
"\xы"