diff options
Diffstat (limited to 'crates/mbe/src/subtree_source.rs')
-rw-r--r-- | crates/mbe/src/subtree_source.rs | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/crates/mbe/src/subtree_source.rs b/crates/mbe/src/subtree_source.rs index 41461b315..396ce8b16 100644 --- a/crates/mbe/src/subtree_source.rs +++ b/crates/mbe/src/subtree_source.rs | |||
@@ -155,9 +155,14 @@ fn convert_delim(d: Option<tt::DelimiterKind>, closing: bool) -> TtToken { | |||
155 | } | 155 | } |
156 | 156 | ||
157 | fn convert_literal(l: &tt::Literal) -> TtToken { | 157 | fn convert_literal(l: &tt::Literal) -> TtToken { |
158 | let kind = lex_single_syntax_kind(&l.text) | 158 | let is_negated = l.text.starts_with('-'); |
159 | let inner_text = &l.text[if is_negated { 1 } else { 0 }..]; | ||
160 | |||
161 | let kind = lex_single_syntax_kind(inner_text) | ||
159 | .map(|(kind, _error)| kind) | 162 | .map(|(kind, _error)| kind) |
160 | .filter(|kind| kind.is_literal()) | 163 | .filter(|kind| { |
164 | kind.is_literal() && (!is_negated || matches!(kind, FLOAT_NUMBER | INT_NUMBER)) | ||
165 | }) | ||
161 | .unwrap_or_else(|| panic!("Fail to convert given literal {:#?}", &l)); | 166 | .unwrap_or_else(|| panic!("Fail to convert given literal {:#?}", &l)); |
162 | 167 | ||
163 | TtToken { kind, is_joint_to_next: false, text: l.text.clone() } | 168 | TtToken { kind, is_joint_to_next: false, text: l.text.clone() } |
@@ -195,3 +200,24 @@ fn convert_leaf(leaf: &tt::Leaf) -> TtToken { | |||
195 | tt::Leaf::Punct(punct) => convert_punct(*punct), | 200 | tt::Leaf::Punct(punct) => convert_punct(*punct), |
196 | } | 201 | } |
197 | } | 202 | } |
203 | |||
204 | #[cfg(test)] | ||
205 | mod tests { | ||
206 | use super::{convert_literal, TtToken}; | ||
207 | use syntax::{SmolStr, SyntaxKind}; | ||
208 | |||
209 | #[test] | ||
210 | fn test_negative_literal() { | ||
211 | assert_eq!( | ||
212 | convert_literal(&tt::Literal { | ||
213 | id: tt::TokenId::unspecified(), | ||
214 | text: SmolStr::new("-42.0") | ||
215 | }), | ||
216 | TtToken { | ||
217 | kind: SyntaxKind::FLOAT_NUMBER, | ||
218 | is_joint_to_next: false, | ||
219 | text: SmolStr::new("-42.0") | ||
220 | } | ||
221 | ); | ||
222 | } | ||
223 | } | ||