8 files changed, 20 insertions, 95 deletions

diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs
index 0c90ed5b5..26fde91bc 100644
--- a/crates/ra_ide_api/src/change.rs
+++ b/crates/ra_ide_api/src/change.rs
@@ -223,7 +223,7 @@ impl RootDatabase {
         self.query(hir::db::FileItemsQuery).sweep(sweep);
         self.query(hir::db::FileItemQuery).sweep(sweep);
 
-        self.query(hir::db::LowerModuleWithSourceMapQuery).sweep(sweep);
+        self.query(hir::db::RawItemsWithSourceMapQuery).sweep(sweep);
         self.query(hir::db::BodyWithSourceMapQuery).sweep(sweep);
     }
 }
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index 71003104b..28c8f83ab 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -1,7 +1,7 @@
 //! This modules takes care of rendering various defenitions as completion items.
 use join_to_string::join;
 use test_utils::tested_by;
-use hir::{Docs, PerNs, Resolution};
+use hir::{Docs, PerNs, Resolution, HirDisplay};
 use ra_syntax::ast::NameOwner;
 
 use crate::completion::{
@@ -22,7 +22,7 @@ impl Completions {
             field.name(ctx.db).to_string(),
         )
         .kind(CompletionItemKind::Field)
-        .detail(field.ty(ctx.db).subst(substs).to_string())
+        .detail(field.ty(ctx.db).subst(substs).display(ctx.db).to_string())
         .set_documentation(field.docs(ctx.db))
         .add_to(self);
     }
@@ -30,7 +30,7 @@ impl Completions {
     pub(crate) fn add_pos_field(&mut self, ctx: &CompletionContext, field: usize, ty: &hir::Ty) {
         CompletionItem::new(CompletionKind::Reference, ctx.source_range(), field.to_string())
             .kind(CompletionItemKind::Field)
-            .detail(ty.to_string())
+            .detail(ty.display(ctx.db).to_string())
             .add_to(self);
     }
 
@@ -154,7 +154,10 @@ impl Completions {
             None => return,
         };
         let detail_types = variant.fields(ctx.db).into_iter().map(|field| field.ty(ctx.db));
-        let detail = join(detail_types).separator(", ").surround_with("(", ")").to_string();
+        let detail = join(detail_types.map(|t| t.display(ctx.db).to_string()))
+            .separator(", ")
+            .surround_with("(", ")")
+            .to_string();
 
         CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.to_string())
             .kind(CompletionItemKind::EnumVariant)
diff --git a/crates/ra_ide_api/src/extend_selection.rs b/crates/ra_ide_api/src/extend_selection.rs
index 4051728e1..d23290b74 100644
--- a/crates/ra_ide_api/src/extend_selection.rs
+++ b/crates/ra_ide_api/src/extend_selection.rs
@@ -1,55 +1,13 @@
 use ra_db::SourceDatabase;
-use ra_syntax::{
-    SyntaxNode, AstNode, SourceFile,
-    ast, algo::find_covering_node,
-};
+use ra_syntax::AstNode;
 
 use crate::{
     TextRange, FileRange,
     db::RootDatabase,
 };
 
+// FIXME: restore macro support
 pub(crate) fn extend_selection(db: &RootDatabase, frange: FileRange) -> TextRange {
     let source_file = db.parse(frange.file_id);
-    if let Some(range) = extend_selection_in_macro(db, &source_file, frange) {
-        return range;
-    }
     ra_ide_api_light::extend_selection(source_file.syntax(), frange.range).unwrap_or(frange.range)
 }
-
-fn extend_selection_in_macro(
-    _db: &RootDatabase,
-    source_file: &SourceFile,
-    frange: FileRange,
-) -> Option<TextRange> {
-    let macro_call = find_macro_call(source_file.syntax(), frange.range)?;
-    let (off, exp) = hir::MacroDef::ast_expand(macro_call)?;
-    let dst_range = exp.map_range_forward(frange.range - off)?;
-    let dst_range = ra_ide_api_light::extend_selection(&exp.syntax(), dst_range)?;
-    let src_range = exp.map_range_back(dst_range)? + off;
-    Some(src_range)
-}
-
-fn find_macro_call(node: &SyntaxNode, range: TextRange) -> Option<&ast::MacroCall> {
-    find_covering_node(node, range).ancestors().find_map(ast::MacroCall::cast)
-}
-
-#[cfg(test)]
-mod tests {
-    use ra_syntax::TextRange;
-
-    use crate::mock_analysis::single_file_with_range;
-
-    #[test]
-    fn extend_selection_inside_macros() {
-        let (analysis, frange) = single_file_with_range(
-            "
-            fn main() {
-                vec![foo(|x| <|>x<|>)];
-            }
-        ",
-        );
-        let r = analysis.extend_selection(frange).unwrap();
-        assert_eq!(r, TextRange::from_to(50.into(), 55.into()));
-    }
-}
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index 66a625c6c..f6a83dd93 100644
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -3,6 +3,7 @@ use ra_syntax::{
     AstNode, SyntaxNode, TreeArc, ast::{self, NameOwner, VisibilityOwner, TypeAscriptionOwner},
     algo::{find_covering_node, find_node_at_offset, find_leaf_at_offset, visit::{visitor, Visitor}},
 };
+use hir::HirDisplay;
 
 use crate::{db::RootDatabase, RangeInfo, FilePosition, FileRange, NavigationTarget};
 
@@ -134,9 +135,9 @@ pub(crate) fn type_of(db: &RootDatabase, frange: FileRange) -> Option<String> {
     let infer = function.infer(db);
     let source_map = function.body_source_map(db);
     if let Some(expr) = ast::Expr::cast(node).and_then(|e| source_map.node_expr(e)) {
-        Some(infer[expr].to_string())
+        Some(infer[expr].display(db).to_string())
     } else if let Some(pat) = ast::Pat::cast(node).and_then(|p| source_map.node_pat(p)) {
-        Some(infer[pat].to_string())
+        Some(infer[pat].display(db).to_string())
     } else {
         None
     }
diff --git a/crates/ra_ide_api/src/runnables.rs b/crates/ra_ide_api/src/runnables.rs
index d64b5a4e0..2395930f0 100644
--- a/crates/ra_ide_api/src/runnables.rs
+++ b/crates/ra_ide_api/src/runnables.rs
@@ -1,7 +1,7 @@
 use itertools::Itertools;
 use ra_syntax::{
     TextRange, SyntaxNode,
-    ast::{self, AstNode, NameOwner, ModuleItemOwner},
+    ast::{self, AstNode, NameOwner, ModuleItemOwner, AttrsOwner},
 };
 use ra_db::SourceDatabase;
 
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs
index 94fe1d6d7..23c743bef 100644
--- a/crates/ra_ide_api/src/symbol_index.rs
+++ b/crates/ra_ide_api/src/symbol_index.rs
@@ -30,7 +30,7 @@ use std::{
 use fst::{self, Streamer};
 use ra_syntax::{
     SyntaxNode, SyntaxNodePtr, SourceFile, SmolStr, TreeArc, AstNode,
-    algo::{visit::{visitor, Visitor}, find_covering_node},
+    algo::{visit::{visitor, Visitor}},
     SyntaxKind::{self, *},
     ast::{self, NameOwner},
     WalkEvent,
@@ -66,14 +66,9 @@ fn file_symbols(db: &impl SymbolsDatabase, file_id: FileId) -> Arc<SymbolIndex>
     db.check_canceled();
     let source_file = db.parse(file_id);
 
-    let mut symbols = source_file_to_file_symbols(&source_file, file_id);
+    let symbols = source_file_to_file_symbols(&source_file, file_id);
 
-    for (name, text_range) in hir::source_binder::macro_symbols(db, file_id) {
-        let node = find_covering_node(source_file.syntax(), text_range);
-        let ptr = SyntaxNodePtr::new(node);
-        // TODO: Should we get container name for macro symbols?
-        symbols.push(FileSymbol { file_id, name, ptr, name_range: None, container_name: None })
-    }
+    // TODO: add macros here
 
     Arc::new(SymbolIndex::new(symbols))
 }
diff --git a/crates/ra_ide_api/src/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs
index 345b6653d..fdd87bcff 100644
--- a/crates/ra_ide_api/src/syntax_highlighting.rs
+++ b/crates/ra_ide_api/src/syntax_highlighting.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{ast, AstNode,};
+use ra_syntax::AstNode;
 use ra_db::SourceDatabase;
 
 use crate::{
@@ -8,37 +8,5 @@ use crate::{
 
 pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRange> {
     let source_file = db.parse(file_id);
-    let mut res = ra_ide_api_light::highlight(source_file.syntax());
-    for macro_call in source_file.syntax().descendants().filter_map(ast::MacroCall::cast) {
-        if let Some((off, exp)) = hir::MacroDef::ast_expand(macro_call) {
-            let mapped_ranges =
-                ra_ide_api_light::highlight(&exp.syntax()).into_iter().filter_map(|r| {
-                    let mapped_range = exp.map_range_back(r.range)?;
-                    let res = HighlightedRange { range: mapped_range + off, tag: r.tag };
-                    Some(res)
-                });
-            res.extend(mapped_ranges);
-        }
-    }
-    res
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::mock_analysis::single_file;
-
-    use insta::assert_debug_snapshot_matches;
-
-    #[test]
-    fn highlights_code_inside_macros() {
-        let (analysis, file_id) = single_file(
-            "
-            fn main() {
-                vec![{ let x = 92; x}];
-            }
-            ",
-        );
-        let highlights = analysis.highlight(file_id).unwrap();
-        assert_debug_snapshot_matches!("highlights_code_inside_macros", &highlights);
-    }
+    ra_ide_api_light::highlight(source_file.syntax())
 }
diff --git a/crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap b/crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap
index d258820af..5bb953892 100644
--- a/crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap
+++ b/crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap
@@ -7,7 +7,7 @@ source: "crates\\ra_ide_api\\tests\\test\\main.rs"
 [
     Diagnostic {
         message: "unresolved module",
-        range: [4; 7),
+        range: [0; 8),
         fix: Some(
             SourceChange {
                 label: "create module",