language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use IDENT for both raw and normal idents

Browse source
This commit is contained in:
Josh Robson Chase 2019-01-23 13:14:34 -05:00
parent 1cd6d6539a
commit 3b70acad01
22 changed files with 41 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ra_syntax/src/lexer.rs
View file

@ -190,24 +190,18 @@ fn next_token_inner(c: char, ptr: &mut Ptr) -> SyntaxKind {
}
fn scan_ident(c: char, ptr: &mut Ptr) -> SyntaxKind {
let is_raw = match (c, ptr.current()) {
match (c, ptr.current()) {
('r', Some('#')) => {
ptr.bump();
true
}
('_', Some(c)) if !is_ident_continue(c) => return UNDERSCORE,
_ => false,
};
ptr.bump_while(is_ident_continue);
if is_raw {
RAW_IDENT
} else if let Some(kind) = SyntaxKind::from_keyword(ptr.current_token_text()) {
return kind;
} else {
IDENT
_ => {}
}
ptr.bump_while(is_ident_continue);
if let Some(kind) = SyntaxKind::from_keyword(ptr.current_token_text()) {
return kind;
}
IDENT
}
fn scan_literal_suffix(ptr: &mut Ptr) {