Skip to content

Emit only one nbsp error per file #106872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions compiler/rustc_parse/src/lexer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,15 @@ pub(crate) fn parse_token_trees<'a>(
}

let cursor = Cursor::new(src);
let string_reader =
StringReader { sess, start_pos, pos: start_pos, src, cursor, override_span };
let string_reader = StringReader {
sess,
start_pos,
pos: start_pos,
src,
cursor,
override_span,
nbsp_is_whitespace: false,
};
tokentrees::TokenTreesReader::parse_all_token_trees(string_reader)
}

Expand All @@ -68,6 +75,10 @@ struct StringReader<'a> {
/// Cursor for getting lexer tokens.
cursor: Cursor<'a>,
override_span: Option<Span>,
/// When a "unknown start of token: \u{a0}" has already been emitted earlier
/// in this file, it's safe to treat further occurrences of the non-breaking
/// space character as whitespace.
nbsp_is_whitespace: bool,
}

impl<'a> StringReader<'a> {
Expand Down Expand Up @@ -239,6 +250,16 @@ impl<'a> StringReader<'a> {
}
let mut it = self.str_from_to_end(start).chars();
let c = it.next().unwrap();
if c == '\u{00a0}' {
// If an error has already been reported on non-breaking
// space characters earlier in the file, treat all
// subsequent occurrences as whitespace.
if self.nbsp_is_whitespace {
preceded_by_whitespace = true;
continue;
}
self.nbsp_is_whitespace = true;
}
let repeats = it.take_while(|c1| *c1 == c).count();
let mut err =
self.struct_err_span_char(start, self.pos + Pos::from_usize(repeats * c.len_utf8()), "unknown start of token", c);
Expand Down Expand Up @@ -486,7 +507,7 @@ impl<'a> StringReader<'a> {

/// Slice of the source text from `start` up to but excluding `self.pos`,
/// meaning the slice does not include the character `self.ch`.
fn str_from(&self, start: BytePos) -> &str {
fn str_from(&self, start: BytePos) -> &'a str {
self.str_from_to(start, self.pos)
}

Expand All @@ -497,12 +518,12 @@ impl<'a> StringReader<'a> {
}

/// Slice of the source text spanning from `start` up to but excluding `end`.
fn str_from_to(&self, start: BytePos, end: BytePos) -> &str {
fn str_from_to(&self, start: BytePos, end: BytePos) -> &'a str {
&self.src[self.src_index(start)..self.src_index(end)]
}

/// Slice of the source text spanning from `start` until the end
fn str_from_to_end(&self, start: BytePos) -> &str {
fn str_from_to_end(&self, start: BytePos) -> &'a str {
&self.src[self.src_index(start)..]
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/parser/unicode-chars.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ fn main() {
let y = 0;
//~^ ERROR unknown start of token: \u{37e}
//~^^ HELP Unicode character ';' (Greek Question Mark) looks like ';' (Semicolon), but it is not
    let x = 0;
    let x = 0;
//~^ ERROR unknown start of token: \u{a0}
//~^^ NOTE character appears 3 more times
//~^^^ HELP Unicode character ' ' (No-Break Space) looks like ' ' (Space), but it is not
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/parser/unicode-chars.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ LL | let y = 0;
error: unknown start of token: \u{a0}
--> $DIR/unicode-chars.rs:5:5
|
LL |     let x = 0;
LL |     let x = 0;
| ^^^^
|
= note: character appears 3 more times
help: Unicode character ' ' (No-Break Space) looks like ' ' (Space), but it is not
|
LL | let x = 0;
LL | let x = 0;
| ++++

error: aborting due to 2 previous errors
Expand Down