Skip to content
Open
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
4 changes: 4 additions & 0 deletions src/lexer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,10 @@ impl<'a> Lexer<'a> {

fn lex_symbol(&mut self, start: usize) -> Result<(), LexError> {
let c = self.peek().unwrap();
if c == b'&' && self.peek2() == Some(b'&') {
self.pos += 2;
return Err(self.err(start, "use `and` instead of `&&`"));
}
// Two-character operators first.
if c == b'|' && self.peek2() == Some(b'>') {
self.pos += 2;
Expand Down
3 changes: 3 additions & 0 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1744,6 +1744,9 @@ impl Parser {
}
Tok::LBrace => return self.parse_record(start),
Tok::LBracket => return self.parse_list(start),
Tok::Bar if matches!(self.peek2(), Tok::Bar) => {
return Err(self.error("use `or` instead of `||`"));
}
_ => return Err(self.error("expected an expression")),
};
Ok(self.mk(start, kind))
Expand Down
15 changes: 15 additions & 0 deletions tests/roundtrip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -888,3 +888,18 @@ fn an_active_pattern_is_top_level_only() {
err.message()
);
}

#[test]
fn suggests_keyword_operators_for_symbolic_logical_operator_typos() {
for (source, expected) in [
("let ok = ready && valid", "use `and` instead of `&&`"),
("let ok = ready || valid", "use `or` instead of `||`"),
] {
let err = parse(source).unwrap_err();
assert!(
err.message().contains(expected),
"{source} -> {}",
err.message()
);
}
}