language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-24 06:55:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

add ? token

Browse source
This commit is contained in:
Luke Boswell 2023-03-01 18:38:16 +11:00
parent 0c7bb163d5
commit c9ffedb483
No known key found for this signature in database
GPG key ID: F6DB3C9DB47377B0
1 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

52
crates/compiler/parse/src/highlight.rs
View file

@ -28,6 +28,7 @@ pub enum Token {
UpperIdent,
LowerIdent,
Number,
QuestionMark,
Other,
Minus,
Plus,
@ -153,18 +154,16 @@ fn combine_tokens(locations: Vec<Loc<Token>>) -> Vec<Loc<Token>> {
}
}
}
_ => {
match previous_location {
Some(prev) => {
tokens.push(prev);
tokens.push(location);
previous_location = None;
}
None => {
tokens.push(location);
}
_ => match previous_location {
Some(prev) => {
tokens.push(prev);
tokens.push(location);
previous_location = None;
}
}
None => {
tokens.push(location);
}
},
}
}
@ -302,6 +301,13 @@ fn highlight_inner<'a>(
state.advance_mut(1);
tokens.push(Loc::at(Region::between(start, state.pos()), Token::Comma));
}
'?' => {
state.advance_mut(1);
tokens.push(Loc::at(
Region::between(start, state.pos()),
Token::QuestionMark,
));
}
'\\' => {
state.advance_mut(1);
tokens.push(Loc::at(
@ -602,5 +608,27 @@ mod tests {
]
)
}
#[test]
fn test_highlight_question_mark() {
let text = "title? Str";
let tokens = highlight(text);
assert_eq!(
tokens,
vec![
Loc::at(
Region::between(Position::new(0), Position::new(5)),
Token::LowerIdent
),
Loc::at(
Region::between(Position::new(5), Position::new(6)),
Token::QuestionMark
),
Loc::at(
Region::between(Position::new(7), Position::new(10)),
Token::UpperIdent
),
]
)
}
}