Merge remote-tracking branch 'upstream/master' into issue961_profiling

9 files changed, 827 insertions, 40 deletions

diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs
index 26fde91bc..a4a086931 100644
--- a/crates/ra_ide_api/src/change.rs
+++ b/crates/ra_ide_api/src/change.rs
@@ -220,8 +220,8 @@ impl RootDatabase {
         self.query(ra_db::ParseQuery).sweep(sweep);
 
         self.query(hir::db::HirParseQuery).sweep(sweep);
-        self.query(hir::db::FileItemsQuery).sweep(sweep);
-        self.query(hir::db::FileItemQuery).sweep(sweep);
+        self.query(hir::db::AstIdMapQuery).sweep(sweep);
+        self.query(hir::db::AstIdToNodeQuery).sweep(sweep);
 
         self.query(hir::db::RawItemsWithSourceMapQuery).sweep(sweep);
         self.query(hir::db::BodyWithSourceMapQuery).sweep(sweep);
diff --git a/crates/ra_ide_api/src/diagnostics.rs b/crates/ra_ide_api/src/diagnostics.rs
index 156f28ca3..5a78e94d8 100644
--- a/crates/ra_ide_api/src/diagnostics.rs
+++ b/crates/ra_ide_api/src/diagnostics.rs
@@ -1,10 +1,11 @@
+use std::cell::RefCell;
+
 use itertools::Itertools;
-use hir::{Problem, source_binder};
+use hir::{source_binder, diagnostics::{Diagnostic as _, DiagnosticSink}};
 use ra_db::SourceDatabase;
 use ra_syntax::{
     Location, SourceFile, SyntaxKind, TextRange, SyntaxNode,
     ast::{self, AstNode},
-
 };
 use ra_text_edit::{TextEdit, TextEditBuilder};
 
@@ -26,11 +27,31 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
         check_unnecessary_braces_in_use_statement(&mut res, file_id, node);
         check_struct_shorthand_initialization(&mut res, file_id, node);
     }
-
+    let res = RefCell::new(res);
+    let mut sink = DiagnosticSink::new(|d| {
+        res.borrow_mut().push(Diagnostic {
+            message: d.message(),
+            range: d.highlight_range(),
+            severity: Severity::Error,
+            fix: None,
+        })
+    })
+    .on::<hir::diagnostics::UnresolvedModule, _>(|d| {
+        let source_root = db.file_source_root(d.file().original_file(db));
+        let create_file = FileSystemEdit::CreateFile { source_root, path: d.candidate.clone() };
+        let fix = SourceChange::file_system_edit("create module", create_file);
+        res.borrow_mut().push(Diagnostic {
+            range: d.highlight_range(),
+            message: d.message(),
+            severity: Severity::Error,
+            fix: Some(fix),
+        })
+    });
     if let Some(m) = source_binder::module_from_file_id(db, file_id) {
-        check_module(&mut res, db, file_id, m);
+        m.diagnostics(db, &mut sink);
     };
-    res
+    drop(sink);
+    res.into_inner()
 }
 
 fn syntax_errors(acc: &mut Vec<Diagnostic>, source_file: &SourceFile) {
@@ -128,34 +149,12 @@ fn check_struct_shorthand_initialization(
     Some(())
 }
 
-fn check_module(
-    acc: &mut Vec<Diagnostic>,
-    db: &RootDatabase,
-    file_id: FileId,
-    module: hir::Module,
-) {
-    let source_root = db.file_source_root(file_id);
-    for (name_node, problem) in module.problems(db) {
-        let diag = match problem {
-            Problem::UnresolvedModule { candidate } => {
-                let create_file =
-                    FileSystemEdit::CreateFile { source_root, path: candidate.clone() };
-                let fix = SourceChange::file_system_edit("create module", create_file);
-                Diagnostic {
-                    range: name_node.range(),
-                    message: "unresolved module".to_string(),
-                    severity: Severity::Error,
-                    fix: Some(fix),
-                }
-            }
-        };
-        acc.push(diag)
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use test_utils::assert_eq_text;
+    use insta::assert_debug_snapshot_matches;
+
+    use crate::mock_analysis::single_file;
 
     use super::*;
 
@@ -185,6 +184,34 @@ mod tests {
     }
 
     #[test]
+    fn test_unresolved_module_diagnostic() {
+        let (analysis, file_id) = single_file("mod foo;");
+        let diagnostics = analysis.diagnostics(file_id).unwrap();
+        assert_debug_snapshot_matches!(diagnostics, @r####"[
+    Diagnostic {
+        message: "unresolved module",
+        range: [0; 8),
+        fix: Some(
+            SourceChange {
+                label: "create module",
+                source_file_edits: [],
+                file_system_edits: [
+                    CreateFile {
+                        source_root: SourceRootId(
+                            0
+                        ),
+                        path: "foo.rs"
+                    }
+                ],
+                cursor_position: None
+            }
+        ),
+        severity: Error
+    }
+]"####);
+    }
+
+    #[test]
     fn test_check_unnecessary_braces_in_use_statement() {
         check_not_applicable(
             "
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 8aa3eb088..9063f78a9 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -6,9 +6,6 @@
 //! database, and the `ra_hir` crate, where majority of the analysis happens.
 //! However, IDE specific bits of the analysis (most notably completion) happen
 //! in this crate.
-//!
-//! The sibling `ra_ide_api_light` handles those bits of IDE functionality
-//! which are restricted to a single file and need only syntax.
 
 // For proving that RootDatabase is RefUnwindSafe.
 #![recursion_limit = "128"]
@@ -33,10 +30,11 @@ mod impls;
 mod assists;
 mod diagnostics;
 mod syntax_tree;
-mod line_index;
 mod folding_ranges;
+mod line_index;
 mod line_index_utils;
 mod join_lines;
+mod structure;
 mod typing;
 mod matching_brace;
 
@@ -72,9 +70,10 @@ pub use crate::{
     line_index_utils::translate_offset_with_edit,
     folding_ranges::{Fold, FoldKind},
     syntax_highlighting::HighlightedRange,
+    structure::{StructureNode, file_structure},
     diagnostics::Severity,
 };
-pub use ra_ide_api_light::StructureNode;
+
 pub use ra_db::{
     Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, SourceRootId,
     Edition
@@ -388,7 +387,7 @@ impl Analysis {
     /// file outline.
     pub fn file_structure(&self, file_id: FileId) -> Vec<StructureNode> {
         let file = self.db.parse(file_id);
-        ra_ide_api_light::file_structure(&file)
+        structure::file_structure(&file)
     }
 
     /// Returns the set of folding ranges.
diff --git a/crates/ra_ide_api/src/parent_module.rs b/crates/ra_ide_api/src/parent_module.rs
index 603c3db6a..27788c984 100644
--- a/crates/ra_ide_api/src/parent_module.rs
+++ b/crates/ra_ide_api/src/parent_module.rs
@@ -28,7 +28,11 @@ pub(crate) fn crate_for(db: &RootDatabase, file_id: FileId) -> Vec<CrateId> {
 
 #[cfg(test)]
 mod tests {
-    use crate::mock_analysis::analysis_and_position;
+    use crate::{
+        AnalysisChange, CrateGraph,
+        mock_analysis::{analysis_and_position, MockAnalysis},
+        Edition::Edition2018,
+};
 
     #[test]
     fn test_resolve_parent_module() {
@@ -59,4 +63,28 @@ mod tests {
         let nav = analysis.parent_module(pos).unwrap().pop().unwrap();
         nav.assert_match("baz MODULE FileId(1) [32; 44)");
     }
+
+    #[test]
+    fn test_resolve_crate_root() {
+        let mock = MockAnalysis::with_files(
+            "
+        //- /bar.rs
+        mod foo;
+        //- /foo.rs
+        // empty <|>
+    ",
+        );
+        let root_file = mock.id_of("/bar.rs");
+        let mod_file = mock.id_of("/foo.rs");
+        let mut host = mock.analysis_host();
+        assert!(host.analysis().crate_for(mod_file).unwrap().is_empty());
+
+        let mut crate_graph = CrateGraph::default();
+        let crate_id = crate_graph.add_crate_root(root_file, Edition2018);
+        let mut change = AnalysisChange::new();
+        change.set_crate_graph(crate_graph);
+        host.apply_change(change);
+
+        assert_eq!(host.analysis().crate_for(mod_file).unwrap(), vec![crate_id]);
+    }
 }
diff --git a/crates/ra_ide_api/src/references.rs b/crates/ra_ide_api/src/references.rs
index 22741445a..20bbf11a3 100644
--- a/crates/ra_ide_api/src/references.rs
+++ b/crates/ra_ide_api/src/references.rs
@@ -216,10 +216,56 @@ mod tests {
     use crate::{
         mock_analysis::single_file_with_position,
         mock_analysis::analysis_and_position,
-        FileId
+        FileId, ReferenceSearchResult
 };
 
     #[test]
+    fn test_find_all_refs_for_local() {
+        let code = r#"
+    fn main() {
+        let mut i = 1;
+        let j = 1;
+        i = i<|> + j;
+
+        {
+            i = 0;
+        }
+
+        i = 5;
+    }"#;
+
+        let refs = get_all_refs(code);
+        assert_eq!(refs.len(), 5);
+    }
+
+    #[test]
+    fn test_find_all_refs_for_param_inside() {
+        let code = r#"
+    fn foo(i : u32) -> u32 {
+        i<|>
+    }"#;
+
+        let refs = get_all_refs(code);
+        assert_eq!(refs.len(), 2);
+    }
+
+    #[test]
+    fn test_find_all_refs_for_fn_param() {
+        let code = r#"
+    fn foo(i<|> : u32) -> u32 {
+        i
+    }"#;
+
+        let refs = get_all_refs(code);
+        assert_eq!(refs.len(), 2);
+    }
+
+    fn get_all_refs(text: &str) -> ReferenceSearchResult {
+        let (analysis, position) = single_file_with_position(text);
+        analysis.find_all_refs(position).unwrap().unwrap()
+    }
+
+    #[test]
     fn test_rename_for_local() {
         test_rename(
             r#"
diff --git a/crates/ra_ide_api/src/snapshots/tests__file_structure.snap b/crates/ra_ide_api/src/snapshots/tests__file_structure.snap
new file mode 100644
index 000000000..2efa8e22c
--- /dev/null
+++ b/crates/ra_ide_api/src/snapshots/tests__file_structure.snap
@@ -0,0 +1,182 @@
+---
+created: "2019-02-05T22:03:50.763530100Z"
+creator: [email protected]
+source: crates/ra_ide_api/src/structure.rs
+expression: structure
+---
+[
+    StructureNode {
+        parent: None,
+        label: "Foo",
+        navigation_range: [8; 11),
+        node_range: [1; 26),
+        kind: STRUCT_DEF,
+        detail: None,
+        deprecated: false
+    },
+    StructureNode {
+        parent: Some(
+            0
+        ),
+        label: "x",
+        navigation_range: [18; 19),
+        node_range: [18; 24),
+        kind: NAMED_FIELD_DEF,
+        detail: Some(
+            "i32"
+        ),
+        deprecated: false
+    },
+    StructureNode {
+        parent: None,
+        label: "m",
+        navigation_range: [32; 33),
+        node_range: [28; 158),
+        kind: MODULE,
+        detail: None,
+        deprecated: false
+    },
+    StructureNode {
+        parent: Some(
+            2
+        ),
+        label: "bar1",
+        navigation_range: [43; 47),
+        node_range: [40; 52),
+        kind: FN_DEF,
+        detail: Some(
+            "fn()"
+        ),
+        deprecated: false
+    },
+    StructureNode {
+        parent: Some(
+            2
+        ),
+        label: "bar2",
+        navigation_range: [60; 64),
+        node_range: [57; 81),
+        kind: FN_DEF,
+        detail: Some(
+            "fn<T>(t: T) -> T"
+        ),
+        deprecated: false
+    },
+    StructureNode {
+        parent: Some(
+            2
+        ),
+        label: "bar3",
+        navigation_range: [89; 93),
+        node_range: [86; 156),
+        kind: FN_DEF,
+        detail: Some(
+            "fn<A, B>(a: A, b: B) -> Vec< u32 >"
+        ),
+        deprecated: false
+    },
+    StructureNode {
+        parent: None,
+        label: "E",
+        navigation_range: [165; 166),
+        node_range: [160; 180),
+        kind: ENUM_DEF,
+        detail: None,
+        deprecated: false
+    },
+    StructureNode {
+        parent: Some(
+            6
+        ),
+        label: "X",
+        navigation_range: [169; 170),
+        node_range: [169; 170),
+        kind: ENUM_VARIANT,
+        detail: None,
+        deprecated: false
+    },
+    StructureNode {
+        parent: Some(
+            6
+        ),
+        label: "Y",
+        navigation_range: [172; 173),
+        node_range: [172; 178),
+        kind: ENUM_VARIANT,
+        detail: None,
+        deprecated: false
+    },
+    StructureNode {
+        parent: None,
+        label: "T",
+        navigation_range: [186; 187),
+        node_range: [181; 193),
+        kind: TYPE_ALIAS_DEF,
+        detail: Some(
+            "()"
+        ),
+        deprecated: false
+    },
+    StructureNode {
+        parent: None,
+        label: "S",
+        navigation_range: [201; 202),
+        node_range: [194; 213),
+        kind: STATIC_DEF,
+        detail: Some(
+            "i32"
+        ),
+        deprecated: false
+    },
+    StructureNode {
+        parent: None,
+        label: "C",
+        navigation_range: [220; 221),
+        node_range: [214; 232),
+        kind: CONST_DEF,
+        detail: Some(
+            "i32"
+        ),
+        deprecated: false
+    },
+    StructureNode {
+        parent: None,
+        label: "impl E",
+        navigation_range: [239; 240),
+        node_range: [234; 243),
+        kind: IMPL_BLOCK,
+        detail: None,
+        deprecated: false
+    },
+    StructureNode {
+        parent: None,
+        label: "impl fmt::Debug for E",
+        navigation_range: [265; 266),
+        node_range: [245; 269),
+        kind: IMPL_BLOCK,
+        detail: None,
+        deprecated: false
+    },
+    StructureNode {
+        parent: None,
+        label: "obsolete",
+        navigation_range: [288; 296),
+        node_range: [271; 301),
+        kind: FN_DEF,
+        detail: Some(
+            "fn()"
+        ),
+        deprecated: true
+    },
+    StructureNode {
+        parent: None,
+        label: "very_obsolete",
+        navigation_range: [341; 354),
+        node_range: [303; 359),
+        kind: FN_DEF,
+        detail: Some(
+            "fn()"
+        ),
+        deprecated: true
+    }
+]
diff --git a/crates/ra_ide_api/src/structure.rs b/crates/ra_ide_api/src/structure.rs
new file mode 100644
index 000000000..ec2c9bbc6
--- /dev/null
+++ b/crates/ra_ide_api/src/structure.rs
@@ -0,0 +1,190 @@
+use crate::TextRange;
+
+use ra_syntax::{
+    algo::visit::{visitor, Visitor},
+    ast::{self, AttrsOwner, NameOwner, TypeParamsOwner, TypeAscriptionOwner},
+    AstNode, SourceFile, SyntaxKind, SyntaxNode, WalkEvent,
+};
+
+#[derive(Debug, Clone)]
+pub struct StructureNode {
+    pub parent: Option<usize>,
+    pub label: String,
+    pub navigation_range: TextRange,
+    pub node_range: TextRange,
+    pub kind: SyntaxKind,
+    pub detail: Option<String>,
+    pub deprecated: bool,
+}
+
+pub fn file_structure(file: &SourceFile) -> Vec<StructureNode> {
+    let mut res = Vec::new();
+    let mut stack = Vec::new();
+
+    for event in file.syntax().preorder() {
+        match event {
+            WalkEvent::Enter(node) => {
+                if let Some(mut symbol) = structure_node(node) {
+                    symbol.parent = stack.last().map(|&n| n);
+                    stack.push(res.len());
+                    res.push(symbol);
+                }
+            }
+            WalkEvent::Leave(node) => {
+                if structure_node(node).is_some() {
+                    stack.pop().unwrap();
+                }
+            }
+        }
+    }
+    res
+}
+
+fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
+    fn decl<N: NameOwner + AttrsOwner>(node: &N) -> Option<StructureNode> {
+        decl_with_detail(node, None)
+    }
+
+    fn decl_with_ascription<N: NameOwner + AttrsOwner + TypeAscriptionOwner>(
+        node: &N,
+    ) -> Option<StructureNode> {
+        decl_with_type_ref(node, node.ascribed_type())
+    }
+
+    fn decl_with_type_ref<N: NameOwner + AttrsOwner>(
+        node: &N,
+        type_ref: Option<&ast::TypeRef>,
+    ) -> Option<StructureNode> {
+        let detail = type_ref.map(|type_ref| {
+            let mut detail = String::new();
+            collapse_ws(type_ref.syntax(), &mut detail);
+            detail
+        });
+        decl_with_detail(node, detail)
+    }
+
+    fn decl_with_detail<N: NameOwner + AttrsOwner>(
+        node: &N,
+        detail: Option<String>,
+    ) -> Option<StructureNode> {
+        let name = node.name()?;
+
+        Some(StructureNode {
+            parent: None,
+            label: name.text().to_string(),
+            navigation_range: name.syntax().range(),
+            node_range: node.syntax().range(),
+            kind: node.syntax().kind(),
+            detail,
+            deprecated: node.attrs().filter_map(|x| x.as_named()).any(|x| x == "deprecated"),
+        })
+    }
+
+    fn collapse_ws(node: &SyntaxNode, output: &mut String) {
+        let mut can_insert_ws = false;
+        for line in node.text().chunks().flat_map(|chunk| chunk.lines()) {
+            let line = line.trim();
+            if line.is_empty() {
+                if can_insert_ws {
+                    output.push_str(" ");
+                    can_insert_ws = false;
+                }
+            } else {
+                output.push_str(line);
+                can_insert_ws = true;
+            }
+        }
+    }
+
+    visitor()
+        .visit(|fn_def: &ast::FnDef| {
+            let mut detail = String::from("fn");
+            if let Some(type_param_list) = fn_def.type_param_list() {
+                collapse_ws(type_param_list.syntax(), &mut detail);
+            }
+            if let Some(param_list) = fn_def.param_list() {
+                collapse_ws(param_list.syntax(), &mut detail);
+            }
+            if let Some(ret_type) = fn_def.ret_type() {
+                detail.push_str(" ");
+                collapse_ws(ret_type.syntax(), &mut detail);
+            }
+
+            decl_with_detail(fn_def, Some(detail))
+        })
+        .visit(decl::<ast::StructDef>)
+        .visit(decl::<ast::EnumDef>)
+        .visit(decl::<ast::EnumVariant>)
+        .visit(decl::<ast::TraitDef>)
+        .visit(decl::<ast::Module>)
+        .visit(|td: &ast::TypeAliasDef| decl_with_type_ref(td, td.type_ref()))
+        .visit(decl_with_ascription::<ast::NamedFieldDef>)
+        .visit(decl_with_ascription::<ast::ConstDef>)
+        .visit(decl_with_ascription::<ast::StaticDef>)
+        .visit(|im: &ast::ImplBlock| {
+            let target_type = im.target_type()?;
+            let target_trait = im.target_trait();
+            let label = match target_trait {
+                None => format!("impl {}", target_type.syntax().text()),
+                Some(t) => {
+                    format!("impl {} for {}", t.syntax().text(), target_type.syntax().text(),)
+                }
+            };
+
+            let node = StructureNode {
+                parent: None,
+                label,
+                navigation_range: target_type.syntax().range(),
+                node_range: im.syntax().range(),
+                kind: im.syntax().kind(),
+                detail: None,
+                deprecated: false,
+            };
+            Some(node)
+        })
+        .accept(node)?
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use insta::assert_debug_snapshot_matches;
+
+    #[test]
+    fn test_file_structure() {
+        let file = SourceFile::parse(
+            r#"
+struct Foo {
+    x: i32
+}
+
+mod m {
+    fn bar1() {}
+    fn bar2<T>(t: T) -> T {}
+    fn bar3<A,
+        B>(a: A,
+        b: B) -> Vec<
+        u32
+    > {}
+}
+
+enum E { X, Y(i32) }
+type T = ();
+static S: i32 = 92;
+const C: i32 = 92;
+
+impl E {}
+
+impl fmt::Debug for E {}
+
+#[deprecated]
+fn obsolete() {}
+
+#[deprecated(note = "for awhile")]
+fn very_obsolete() {}
+"#,
+        );
+        let structure = file_structure(&file);
+        assert_debug_snapshot_matches!("file_structure", structure);
+    }
+}
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs
index 0978d164a..0eadc4e71 100644
--- a/crates/ra_ide_api/src/symbol_index.rs
+++ b/crates/ra_ide_api/src/symbol_index.rs
@@ -270,3 +270,61 @@ fn to_file_symbol(node: &SyntaxNode, file_id: FileId) -> Option<FileSymbol> {
         container_name: None,
     })
 }
+
+#[cfg(test)]
+mod tests {
+    use ra_syntax::SmolStr;
+    use crate::{
+        navigation_target::NavigationTarget,
+        mock_analysis::single_file,
+        Query,
+};
+
+    #[test]
+    fn test_world_symbols_with_no_container() {
+        let code = r#"
+    enum FooInner { }
+    "#;
+
+        let mut symbols = get_symbols_matching(code, "FooInner");
+
+        let s = symbols.pop().unwrap();
+
+        assert_eq!(s.name(), "FooInner");
+        assert!(s.container_name().is_none());
+    }
+
+    #[test]
+    fn test_world_symbols_include_container_name() {
+        let code = r#"
+fn foo() {
+    enum FooInner { }
+}
+    "#;
+
+        let mut symbols = get_symbols_matching(code, "FooInner");
+
+        let s = symbols.pop().unwrap();
+
+        assert_eq!(s.name(), "FooInner");
+        assert_eq!(s.container_name(), Some(&SmolStr::new("foo")));
+
+        let code = r#"
+mod foo {
+    struct FooInner;
+}
+    "#;
+
+        let mut symbols = get_symbols_matching(code, "FooInner");
+
+        let s = symbols.pop().unwrap();
+
+        assert_eq!(s.name(), "FooInner");
+        assert_eq!(s.container_name(), Some(&SmolStr::new("foo")));
+    }
+
+    fn get_symbols_matching(text: &str, query: &str) -> Vec<NavigationTarget> {
+        let (analysis, _) = single_file(text);
+        analysis.symbol_search(Query::new(query.into())).unwrap()
+    }
+}
diff --git a/crates/ra_ide_api/src/syntax_tree.rs b/crates/ra_ide_api/src/syntax_tree.rs
index bbe9222b4..276f8a8c8 100644
--- a/crates/ra_ide_api/src/syntax_tree.rs
+++ b/crates/ra_ide_api/src/syntax_tree.rs
@@ -85,3 +85,260 @@ fn syntax_tree_for_token<T: AstToken>(node: &T, text_range: TextRange) -> Option
 

     None

 }

+

+#[cfg(test)]

+mod tests {

+    use crate::mock_analysis::{single_file, single_file_with_range};

+

+    #[test]

+    fn test_syntax_tree_without_range() {

+        // Basic syntax

+        let (analysis, file_id) = single_file(r#"fn foo() {}"#);

+        let syn = analysis.syntax_tree(file_id, None);

+

+        assert_eq!(

+            syn.trim(),

+            r#"

+SOURCE_FILE@[0; 11)

+  FN_DEF@[0; 11)

+    FN_KW@[0; 2)

+    WHITESPACE@[2; 3)

+    NAME@[3; 6)

+      IDENT@[3; 6) "foo"

+    PARAM_LIST@[6; 8)

+      L_PAREN@[6; 7)

+      R_PAREN@[7; 8)

+    WHITESPACE@[8; 9)

+    BLOCK@[9; 11)

+      L_CURLY@[9; 10)

+      R_CURLY@[10; 11)

+    "#

+            .trim()

+        );

+

+        let (analysis, file_id) = single_file(

+            r#"

+fn test() {

+    assert!("

+    fn foo() {

+    }

+    ", "");

+}"#

+            .trim(),

+        );

+        let syn = analysis.syntax_tree(file_id, None);

+

+        assert_eq!(

+            syn.trim(),

+            r#"

+SOURCE_FILE@[0; 60)

+  FN_DEF@[0; 60)

+    FN_KW@[0; 2)

+    WHITESPACE@[2; 3)

+    NAME@[3; 7)

+      IDENT@[3; 7) "test"

+    PARAM_LIST@[7; 9)

+      L_PAREN@[7; 8)

+      R_PAREN@[8; 9)

+    WHITESPACE@[9; 10)

+    BLOCK@[10; 60)

+      L_CURLY@[10; 11)

+      WHITESPACE@[11; 16)

+      EXPR_STMT@[16; 58)

+        MACRO_CALL@[16; 57)

+          PATH@[16; 22)

+            PATH_SEGMENT@[16; 22)

+              NAME_REF@[16; 22)

+                IDENT@[16; 22) "assert"

+          EXCL@[22; 23)

+          TOKEN_TREE@[23; 57)

+            L_PAREN@[23; 24)

+            STRING@[24; 52)

+            COMMA@[52; 53)

+            WHITESPACE@[53; 54)

+            STRING@[54; 56)

+            R_PAREN@[56; 57)

+        SEMI@[57; 58)

+      WHITESPACE@[58; 59)

+      R_CURLY@[59; 60)

+    "#

+            .trim()

+        );

+    }

+

+    #[test]

+    fn test_syntax_tree_with_range() {

+        let (analysis, range) = single_file_with_range(r#"<|>fn foo() {}<|>"#.trim());

+        let syn = analysis.syntax_tree(range.file_id, Some(range.range));

+

+        assert_eq!(

+            syn.trim(),

+            r#"

+FN_DEF@[0; 11)

+  FN_KW@[0; 2)

+  WHITESPACE@[2; 3)

+  NAME@[3; 6)

+    IDENT@[3; 6) "foo"

+  PARAM_LIST@[6; 8)

+    L_PAREN@[6; 7)

+    R_PAREN@[7; 8)

+  WHITESPACE@[8; 9)

+  BLOCK@[9; 11)

+    L_CURLY@[9; 10)

+    R_CURLY@[10; 11)

+    "#

+            .trim()

+        );

+

+        let (analysis, range) = single_file_with_range(

+            r#"fn test() {

+    <|>assert!("

+    fn foo() {

+    }

+    ", "");<|>

+}"#

+            .trim(),

+        );

+        let syn = analysis.syntax_tree(range.file_id, Some(range.range));

+

+        assert_eq!(

+            syn.trim(),

+            r#"

+EXPR_STMT@[16; 58)

+  MACRO_CALL@[16; 57)

+    PATH@[16; 22)

+      PATH_SEGMENT@[16; 22)

+        NAME_REF@[16; 22)

+          IDENT@[16; 22) "assert"

+    EXCL@[22; 23)

+    TOKEN_TREE@[23; 57)

+      L_PAREN@[23; 24)

+      STRING@[24; 52)

+      COMMA@[52; 53)

+      WHITESPACE@[53; 54)

+      STRING@[54; 56)

+      R_PAREN@[56; 57)

+  SEMI@[57; 58)

+    "#

+            .trim()

+        );

+    }

+

+    #[test]

+    fn test_syntax_tree_inside_string() {

+        let (analysis, range) = single_file_with_range(

+            r#"fn test() {

+    assert!("

+<|>fn foo() {

+}<|>

+fn bar() {

+}

+    ", "");

+}"#

+            .trim(),

+        );

+        let syn = analysis.syntax_tree(range.file_id, Some(range.range));

+        assert_eq!(

+            syn.trim(),

+            r#"

+SOURCE_FILE@[0; 12)

+  FN_DEF@[0; 12)

+    FN_KW@[0; 2)

+    WHITESPACE@[2; 3)

+    NAME@[3; 6)

+      IDENT@[3; 6) "foo"

+    PARAM_LIST@[6; 8)

+      L_PAREN@[6; 7)

+      R_PAREN@[7; 8)

+    WHITESPACE@[8; 9)

+    BLOCK@[9; 12)

+      L_CURLY@[9; 10)

+      WHITESPACE@[10; 11)

+      R_CURLY@[11; 12)

+"#

+            .trim()

+        );

+

+        // With a raw string

+        let (analysis, range) = single_file_with_range(

+            r###"fn test() {

+    assert!(r#"

+<|>fn foo() {

+}<|>

+fn bar() {

+}

+    "#, "");

+}"###

+                .trim(),

+        );

+        let syn = analysis.syntax_tree(range.file_id, Some(range.range));

+        assert_eq!(

+            syn.trim(),

+            r#"

+SOURCE_FILE@[0; 12)

+  FN_DEF@[0; 12)

+    FN_KW@[0; 2)

+    WHITESPACE@[2; 3)

+    NAME@[3; 6)

+      IDENT@[3; 6) "foo"

+    PARAM_LIST@[6; 8)

+      L_PAREN@[6; 7)

+      R_PAREN@[7; 8)

+    WHITESPACE@[8; 9)

+    BLOCK@[9; 12)

+      L_CURLY@[9; 10)

+      WHITESPACE@[10; 11)

+      R_CURLY@[11; 12)

+"#

+            .trim()

+        );

+

+        // With a raw string

+        let (analysis, range) = single_file_with_range(

+            r###"fn test() {

+    assert!(r<|>#"

+fn foo() {

+}

+fn bar() {

+}"<|>#, "");

+}"###

+                .trim(),

+        );

+        let syn = analysis.syntax_tree(range.file_id, Some(range.range));

+        assert_eq!(

+            syn.trim(),

+            r#"

+SOURCE_FILE@[0; 25)

+  FN_DEF@[0; 12)

+    FN_KW@[0; 2)

+    WHITESPACE@[2; 3)

+    NAME@[3; 6)

+      IDENT@[3; 6) "foo"

+    PARAM_LIST@[6; 8)

+      L_PAREN@[6; 7)

+      R_PAREN@[7; 8)

+    WHITESPACE@[8; 9)

+    BLOCK@[9; 12)

+      L_CURLY@[9; 10)

+      WHITESPACE@[10; 11)

+      R_CURLY@[11; 12)

+  WHITESPACE@[12; 13)

+  FN_DEF@[13; 25)

+    FN_KW@[13; 15)

+    WHITESPACE@[15; 16)

+    NAME@[16; 19)

+      IDENT@[16; 19) "bar"

+    PARAM_LIST@[19; 21)

+      L_PAREN@[19; 20)

+      R_PAREN@[20; 21)

+    WHITESPACE@[21; 22)

+    BLOCK@[22; 25)

+      L_CURLY@[22; 23)

+      WHITESPACE@[23; 24)

+      R_CURLY@[24; 25)

+

+"#

+            .trim()

+        );

+    }

+}