From 4fd7ad908b6e7cee0ee7853fcf29fb5a38a19aa2 Mon Sep 17 00:00:00 2001
From: Phil Ellison <phil.j.ellison@gmail.com>
Date: Sun, 28 Jul 2019 20:47:44 +0100
Subject: Add special case for f32 and f43 suffices on Literal.kind

---
 crates/ra_assists/src/add_explicit_type.rs  |  5 +++++
 crates/ra_syntax/src/ast/expr_extensions.rs | 24 +++++++++++++++++++++---
 crates/ra_syntax/src/parsing/lexer.rs       | 14 --------------
 3 files changed, 26 insertions(+), 17 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_assists/src/add_explicit_type.rs b/crates/ra_assists/src/add_explicit_type.rs
index 7c6080640..2ed03e5e9 100644
--- a/crates/ra_assists/src/add_explicit_type.rs
+++ b/crates/ra_assists/src/add_explicit_type.rs
@@ -77,6 +77,11 @@ mod tests {
             "fn f() { let a<|> = 42f64; }",
             "fn f() { let a<|>: f64 = 42f64; }",
         );
+        check_assist(
+            add_explicit_type,
+            "fn f() { let a<|> = 42f32; }",
+            "fn f() { let a<|>: f32 = 42f32; }",
+        );
     }
 
     #[test]
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs
index f9190d877..745dece98 100644
--- a/crates/ra_syntax/src/ast/expr_extensions.rs
+++ b/crates/ra_syntax/src/ast/expr_extensions.rs
@@ -239,16 +239,34 @@ impl ast::Literal {
     pub fn kind(&self) -> LiteralKind {
         match self.token().kind() {
             INT_NUMBER => {
-                let allowed_suffix_list = [
+                let int_suffix_list = [
                     "isize", "i128", "i64", "i32", "i16", "i8", "usize", "u128", "u64", "u32",
                     "u16", "u8",
                 ];
+
+                // The lexer treats e.g. `1f64` as an integer literal. See
+                // https://github.com/rust-analyzer/rust-analyzer/issues/1592
+                // and the comments on the linked PR.
+                let float_suffix_list = [
+                    "f32", "f64"
+                ];
+
                 let text = self.token().text().to_string();
-                let suffix = allowed_suffix_list
+
+                let float_suffix = float_suffix_list
                     .iter()
                     .find(|&s| text.ends_with(s))
                     .map(|&suf| SmolStr::new(suf));
-                LiteralKind::IntNumber { suffix }
+
+                if float_suffix.is_some() {
+                    LiteralKind::FloatNumber { suffix: float_suffix }
+                } else {
+                    let suffix = int_suffix_list
+                        .iter()
+                        .find(|&s| text.ends_with(s))
+                        .map(|&suf| SmolStr::new(suf));
+                    LiteralKind::IntNumber { suffix }
+                }
             }
             FLOAT_NUMBER => {
                 let allowed_suffix_list = ["f64", "f32"];
diff --git a/crates/ra_syntax/src/parsing/lexer.rs b/crates/ra_syntax/src/parsing/lexer.rs
index 45ef88ac0..2a4343b0a 100644
--- a/crates/ra_syntax/src/parsing/lexer.rs
+++ b/crates/ra_syntax/src/parsing/lexer.rs
@@ -145,17 +145,3 @@ pub fn classify_literal(text: &str) -> Option<Token> {
     };
     Some(Token { kind, len: TextUnit::from_usize(t.len) })
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // https://github.com/rust-analyzer/rust-analyzer/issues/1592
-    #[test]
-    fn lex_float_literal() {
-        assert_eq!(
-            tokenize("42f64")[0],
-            Token { kind: FLOAT_NUMBER, len: TextUnit::from_usize(5)}
-        );
-    }
-}
-- 
cgit v1.2.3