6 files changed, 70 insertions, 91 deletions

diff --git a/crates/ra_assists/src/handlers/change_visibility.rs b/crates/ra_assists/src/handlers/change_visibility.rs
index f325b6f92..54e0a6c84 100644
--- a/crates/ra_assists/src/handlers/change_visibility.rs
+++ b/crates/ra_assists/src/handlers/change_visibility.rs
@@ -2,8 +2,8 @@ use ra_syntax::{
     ast::{self, NameOwner, VisibilityOwner},
     AstNode,
     SyntaxKind::{
-        ATTR, COMMENT, ENUM_DEF, FN_DEF, IDENT, MODULE, STRUCT_DEF, TRAIT_DEF, VISIBILITY,
-        WHITESPACE,
+        ATTR, COMMENT, CONST_DEF, ENUM_DEF, FN_DEF, IDENT, MODULE, STRUCT_DEF, TRAIT_DEF,
+        VISIBILITY, WHITESPACE,
     },
     SyntaxNode, TextUnit, T,
 };
@@ -30,13 +30,13 @@ pub(crate) fn change_visibility(ctx: AssistCtx) -> Option<Assist> {
 
 fn add_vis(ctx: AssistCtx) -> Option<Assist> {
     let item_keyword = ctx.token_at_offset().find(|leaf| match leaf.kind() {
-        T![fn] | T![mod] | T![struct] | T![enum] | T![trait] => true,
+        T![const] | T![fn] | T![mod] | T![struct] | T![enum] | T![trait] => true,
         _ => false,
     });
 
     let (offset, target) = if let Some(keyword) = item_keyword {
         let parent = keyword.parent();
-        let def_kws = vec![FN_DEF, MODULE, STRUCT_DEF, ENUM_DEF, TRAIT_DEF];
+        let def_kws = vec![CONST_DEF, FN_DEF, MODULE, STRUCT_DEF, ENUM_DEF, TRAIT_DEF];
         // Parent is not a definition, can't add visibility
         if !def_kws.iter().any(|&def_kw| def_kw == parent.kind()) {
             return None;
@@ -136,6 +136,11 @@ mod tests {
     }
 
     #[test]
+    fn change_visibility_const() {
+        check_assist(change_visibility, "<|>const FOO = 3u8;", "<|>pub(crate) const FOO = 3u8;");
+    }
+
+    #[test]
     fn change_visibility_handles_comment_attrs() {
         check_assist(
             change_visibility,
diff --git a/crates/ra_ide/src/hover.rs b/crates/ra_ide/src/hover.rs
index dfa0f1d97..7ba4bfcac 100644
--- a/crates/ra_ide/src/hover.rs
+++ b/crates/ra_ide/src/hover.rs
@@ -6,7 +6,6 @@ use ra_ide_db::{
     RootDatabase,
 };
 use ra_syntax::{
-    algo::find_covering_element,
     ast::{self, DocCommentsOwner},
     match_ast, AstNode,
     SyntaxKind::*,
@@ -16,7 +15,7 @@ use ra_syntax::{
 use crate::{
     display::{macro_label, rust_code_markup, rust_code_markup_with_doc, ShortLabel},
     references::classify_name_ref,
-    FilePosition, FileRange, RangeInfo,
+    FilePosition, RangeInfo,
 };
 
 /// Contains the results when hovering over an item
@@ -174,23 +173,25 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
         .ancestors()
         .find(|n| ast::Expr::cast(n.clone()).is_some() || ast::Pat::cast(n.clone()).is_some())?;
 
-    // if this node is a MACRO_CALL, it means that `descend_into_macros` is failed to resolve.
-    // (e.g expanding a builtin macro). So we give up here.
-    if node.kind() == MACRO_CALL {
-        return None;
-    }
-
-    // FIXME: Currently `hover::typeof` do not work inside
-    // macro expansion such that if the hover range is pointing to
-    // a string literal, the following type_of will return None.
-    // See also `test_hover_through_literal_string_in_macro`
-    let frange = sema.original_range(&node);
-    res.extend(type_of(db, frange).map(rust_code_markup));
-    if res.is_empty() {
-        return None;
-    }
-    let range = node.text_range();
+    let ty = match_ast! {
+        match node {
+            ast::MacroCall(_it) => {
+                // If this node is a MACRO_CALL, it means that `descend_into_macros` failed to resolve.
+                // (e.g expanding a builtin macro). So we give up here.
+                return None;
+            },
+            ast::Expr(it) => {
+                sema.type_of_expr(&it)
+            },
+            ast::Pat(it) => {
+                sema.type_of_pat(&it)
+            },
+            _ => None,
+        }
+    }?;
 
+    res.extend(Some(rust_code_markup(ty.display_truncated(db, None).to_string())));
+    let range = sema.original_range(&node).range;
     Some(RangeInfo::new(range, res))
 }
 
@@ -206,33 +207,12 @@ fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
     }
 }
 
-pub(crate) fn type_of(db: &RootDatabase, frange: FileRange) -> Option<String> {
-    let sema = Semantics::new(db);
-    let source_file = sema.parse(frange.file_id);
-    let leaf_node = find_covering_element(source_file.syntax(), frange.range);
-    // if we picked identifier, expand to pattern/expression
-    let node = leaf_node
-        .ancestors()
-        .take_while(|it| it.text_range() == leaf_node.text_range())
-        .find(|it| ast::Expr::cast(it.clone()).is_some() || ast::Pat::cast(it.clone()).is_some())?;
-    let ty = if let Some(ty) = ast::Expr::cast(node.clone()).and_then(|e| sema.type_of_expr(&e)) {
-        ty
-    } else if let Some(ty) = ast::Pat::cast(node).and_then(|p| sema.type_of_pat(&p)) {
-        ty
-    } else {
-        return None;
-    };
-    Some(ty.display_truncated(db, None).to_string())
-}
-
 #[cfg(test)]
 mod tests {
     use ra_db::FileLoader;
     use ra_syntax::TextRange;
 
-    use crate::mock_analysis::{
-        analysis_and_position, single_file_with_position, single_file_with_range,
-    };
+    use crate::mock_analysis::{analysis_and_position, single_file_with_position};
 
     fn trim_markup(s: &str) -> &str {
         s.trim_start_matches("```rust\n").trim_end_matches("\n```")
@@ -525,37 +505,6 @@ fn func(foo: i32) { if true { <|>foo; }; }
     }
 
     #[test]
-    fn test_type_of_for_function() {
-        let (analysis, range) = single_file_with_range(
-            "
-            pub fn foo() -> u32 { 1 };
-
-            fn main() {
-                let foo_test = <|>foo()<|>;
-            }
-            ",
-        );
-
-        let type_name = analysis.type_of(range).unwrap().unwrap();
-        assert_eq!("u32", &type_name);
-    }
-
-    #[test]
-    fn test_type_of_for_expr() {
-        let (analysis, range) = single_file_with_range(
-            "
-            fn main() {
-                let foo: usize = 1;
-                let bar = <|>1 + foo<|>;
-            }
-            ",
-        );
-
-        let type_name = analysis.type_of(range).unwrap().unwrap();
-        assert_eq!("usize", &type_name);
-    }
-
-    #[test]
     fn test_hover_infer_associated_method_result() {
         let (analysis, position) = single_file_with_position(
             "
@@ -791,9 +740,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
 
     #[test]
     fn test_hover_through_literal_string_in_macro() {
-        // FIXME: Currently `hover::type_of` do not work inside
-        // macro expansion
-        check_hover_no_result(
+        let hover_on = check_hover_result(
             r#"
             //- /lib.rs
             macro_rules! arr {
@@ -804,7 +751,10 @@ fn func(foo: i32) { if true { <|>foo; }; }
                 let _ = arr!("Tr<|>acks", &mastered_for_itunes);
             }
             "#,
+            &["&str"],
         );
+
+        assert_eq!(hover_on, "\"Tracks\"");
     }
 
     #[test]
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index d509de14e..f61028f78 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -455,11 +455,6 @@ impl Analysis {
         self.with_db(|db| diagnostics::diagnostics(db, file_id))
     }
 
-    /// Computes the type of the expression at the given position.
-    pub fn type_of(&self, frange: FileRange) -> Cancelable<Option<String>> {
-        self.with_db(|db| hover::type_of(db, frange))
-    }
-
     /// Returns the edit required to rename reference at the position to the new
     /// name.
     pub fn rename(
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index 06c92645e..4163a2cf5 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -169,6 +169,7 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi) {
     //     let d: i32 = 92;
     //     let e: !;
     //     let _: ! = {};
+    //     let f = #[attr]||{};
     // }
     fn let_stmt(p: &mut Parser, m: Marker, with_semi: StmtWithSemi) {
         assert!(p.at(T![let]));
@@ -178,7 +179,7 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi) {
             types::ascription(p);
         }
         if p.eat(T![=]) {
-            expressions::expr(p);
+            expressions::expr_with_attrs(p);
         }
 
         match with_semi {
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs
index 86803fe08..fa8ee49a2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs
@@ -5,4 +5,5 @@ fn foo() {
     let d: i32 = 92;
     let e: !;
     let _: ! = {};
+    let f = #[attr]||{};
 }
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.txt b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.txt
index 97166cfd5..17739dfbd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.txt
@@ -1,5 +1,5 @@
-SOURCE_FILE@[0; 110)
-  FN_DEF@[0; 109)
+SOURCE_FILE@[0; 135)
+  FN_DEF@[0; 134)
     FN_KW@[0; 2) "fn"
     WHITESPACE@[2; 3) " "
     NAME@[3; 6)
@@ -8,8 +8,8 @@ SOURCE_FILE@[0; 110)
       L_PAREN@[6; 7) "("
       R_PAREN@[7; 8) ")"
     WHITESPACE@[8; 9) " "
-    BLOCK_EXPR@[9; 109)
-      BLOCK@[9; 109)
+    BLOCK_EXPR@[9; 134)
+      BLOCK@[9; 134)
         L_CURLY@[9; 10) "{"
         WHITESPACE@[10; 15) "\n    "
         LET_STMT@[15; 21)
@@ -97,6 +97,33 @@ SOURCE_FILE@[0; 110)
               L_CURLY@[104; 105) "{"
               R_CURLY@[105; 106) "}"
           SEMI@[106; 107) ";"
-        WHITESPACE@[107; 108) "\n"
-        R_CURLY@[108; 109) "}"
-  WHITESPACE@[109; 110) "\n"
+        WHITESPACE@[107; 112) "\n    "
+        LET_STMT@[112; 132)
+          LET_KW@[112; 115) "let"
+          WHITESPACE@[115; 116) " "
+          BIND_PAT@[116; 117)
+            NAME@[116; 117)
+              IDENT@[116; 117) "f"
+          WHITESPACE@[117; 118) " "
+          EQ@[118; 119) "="
+          WHITESPACE@[119; 120) " "
+          LAMBDA_EXPR@[120; 131)
+            ATTR@[120; 127)
+              POUND@[120; 121) "#"
+              L_BRACK@[121; 122) "["
+              PATH@[122; 126)
+                PATH_SEGMENT@[122; 126)
+                  NAME_REF@[122; 126)
+                    IDENT@[122; 126) "attr"
+              R_BRACK@[126; 127) "]"
+            PARAM_LIST@[127; 129)
+              PIPE@[127; 128) "|"
+              PIPE@[128; 129) "|"
+            BLOCK_EXPR@[129; 131)
+              BLOCK@[129; 131)
+                L_CURLY@[129; 130) "{"
+                R_CURLY@[130; 131) "}"
+          SEMI@[131; 132) ";"
+        WHITESPACE@[132; 133) "\n"
+        R_CURLY@[133; 134) "}"
+  WHITESPACE@[134; 135) "\n"