bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/parser/src/tokens.rs')
-rw-r--r--crates/parser/src/tokens.rs16
1 files changed, 12 insertions, 4 deletions
diff --git a/crates/parser/src/tokens.rs b/crates/parser/src/tokens.rs
index 053d90a172..2fd807f9b3 100644
--- a/crates/parser/src/tokens.rs
+++ b/crates/parser/src/tokens.rs
@@ -49,10 +49,18 @@ impl Tokens {
pub fn len(&self) -> usize {
self.kind.len()
}
- pub(crate) fn get(&self, idx: usize) -> Option<(SyntaxKind, bool, IdentKind)> {
- let kind = *self.kind.get(idx)?;
+ pub(crate) fn get(&self, idx: usize) -> (SyntaxKind, bool, IdentKind) {
+ if idx > self.len() {
+ return self.eof();
+ }
+ let kind = self.kind[idx];
let joint = self.get_joint(idx);
- let ident_kind = *self.ident_kind.get(idx)?;
- Some((kind, joint, ident_kind))
+ let ident_kind = self.ident_kind[idx];
+ (kind, joint, ident_kind)
+ }
+
+ #[cold]
+ fn eof(&self) -> (SyntaxKind, bool, IdentKind) {
+ (SyntaxKind::EOF, false, 0)
}
}