diff options
author | Lukas Wirth <[email protected]> | 2020-12-15 18:23:51 +0000 |
---|---|---|
committer | Lukas Wirth <[email protected]> | 2020-12-16 13:16:09 +0000 |
commit | dd496223f50232fe98312ee8edc89eb4b5ee3d85 (patch) | |
tree | 4d50c04ca78f9458ab536ff1edee76eba6ab1957 /crates/mbe/src/subtree_source.rs | |
parent | d34611633b3b2404188b9e12b08c5def589808c2 (diff) |
Node-ify lifetimes
Diffstat (limited to 'crates/mbe/src/subtree_source.rs')
-rw-r--r-- | crates/mbe/src/subtree_source.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crates/mbe/src/subtree_source.rs b/crates/mbe/src/subtree_source.rs index ccc56c479..d10d4b70e 100644 --- a/crates/mbe/src/subtree_source.rs +++ b/crates/mbe/src/subtree_source.rs | |||
@@ -84,7 +84,11 @@ impl<'a> SubtreeTokenSource<'a> { | |||
84 | } | 84 | } |
85 | 85 | ||
86 | if let Some((curr, text)) = is_lifetime(cursor) { | 86 | if let Some((curr, text)) = is_lifetime(cursor) { |
87 | cached.push(Some(TtToken { kind: LIFETIME, is_joint_to_next: false, text })); | 87 | cached.push(Some(TtToken { |
88 | kind: LIFETIME_IDENT, | ||
89 | is_joint_to_next: false, | ||
90 | text, | ||
91 | })); | ||
88 | self.cached_cursor.set(curr); | 92 | self.cached_cursor.set(curr); |
89 | continue; | 93 | continue; |
90 | } | 94 | } |
@@ -172,7 +176,7 @@ fn convert_ident(ident: &tt::Ident) -> TtToken { | |||
172 | let kind = match ident.text.as_ref() { | 176 | let kind = match ident.text.as_ref() { |
173 | "true" => T![true], | 177 | "true" => T![true], |
174 | "false" => T![false], | 178 | "false" => T![false], |
175 | i if i.starts_with('\'') => LIFETIME, | 179 | i if i.starts_with('\'') => LIFETIME_IDENT, |
176 | _ => SyntaxKind::from_keyword(ident.text.as_str()).unwrap_or(IDENT), | 180 | _ => SyntaxKind::from_keyword(ident.text.as_str()).unwrap_or(IDENT), |
177 | }; | 181 | }; |
178 | 182 | ||