language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Refactor parser handle mult-char punct internally

Browse source
This commit is contained in:
Edwin Cheng 2019-04-28 23:46:03 +08:00
parent 1dd3d9bc2d
commit d436ab0581
9 changed files with 183 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_mbe/src/subtree_source.rs
View file

@ -388,6 +388,7 @@ where
}
}
// FIXME: Remove this function
fn convert_multi_char_punct<'b, I>(
p: &tt::Punct,
iter: &mut TokenPeek<'b, I>,
@ -397,8 +398,6 @@ where
{
if let Some((m, is_joint_to_next)) = iter.current_punct3(p) {
if let Some((kind, text)) = match m {
('.', '.', '.') => Some((DOTDOTDOT, "...")),
('.', '.', '=') => Some((DOTDOTEQ, "..=")),
_ => None,
} {
return Some((kind, is_joint_to_next, text, 3));
@ -407,13 +406,6 @@ where
if let Some((m, is_joint_to_next)) = iter.current_punct2(p) {
if let Some((kind, text)) = match m {
('-', '>') => Some((THIN_ARROW, "->")),
('!', '=') => Some((NEQ, "!=")),
('=', '>') => Some((FAT_ARROW, "=>")),
('=', '=') => Some((EQEQ, "==")),
('.', '.') => Some((DOTDOT, "..")),
(':', ':') => Some((COLONCOLON, "::")),
_ => None,
} {
return Some((kind, is_joint_to_next, text, 2));