50 files changed, 952 insertions, 824 deletions
diff --git a/crates/assists/src/assist_config.rs b/crates/assists/src/assist_config.rs
index 786224cfa..c458d9054 100644
--- a/crates/assists/src/assist_config.rs
+++ b/crates/assists/src/assist_config.rs
@@ -5,7 +5,7 @@
 //! assists if we are allowed to.
 use hir::PrefixKind;
-use ide_db::helpers::insert_use::MergeBehaviour;
+use ide_db::helpers::insert_use::MergeBehavior;
 use crate::AssistKind;
@@ -39,12 +39,12 @@ impl Default for AssistConfig {
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct InsertUseConfig {
-    pub merge: Option<MergeBehaviour>,
+    pub merge: Option<MergeBehavior>,
    pub prefix_kind: PrefixKind,
 }
 impl Default for InsertUseConfig {
    fn default() -> Self {
-        InsertUseConfig { merge: Some(MergeBehaviour::Full), prefix_kind: PrefixKind::Plain }
+        InsertUseConfig { merge: Some(MergeBehavior::Full), prefix_kind: PrefixKind::Plain }
    }
 }
diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs
index b7e853994..2f0dc7831 100644
--- a/crates/assists/src/handlers/merge_imports.rs
+++ b/crates/assists/src/handlers/merge_imports.rs
@@ -1,4 +1,4 @@
-use ide_db::helpers::insert_use::{try_merge_imports, try_merge_trees, MergeBehaviour};
+use ide_db::helpers::insert_use::{try_merge_imports, try_merge_trees, MergeBehavior};
 use syntax::{
    algo::{neighbor, SyntaxRewriter},
    ast, AstNode,
@@ -30,7 +30,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<()
    if let Some(use_item) = tree.syntax().parent().and_then(ast::Use::cast) {
        let (merged, to_delete) =
            next_prev().filter_map(|dir| neighbor(&use_item, dir)).find_map(|use_item2| {
-                try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full).zip(Some(use_item2))
+                try_merge_imports(&use_item, &use_item2, MergeBehavior::Full).zip(Some(use_item2))
            })?;
        rewriter.replace_ast(&use_item, &merged);
@@ -42,7 +42,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<()
    } else {
        let (merged, to_delete) =
            next_prev().filter_map(|dir| neighbor(&tree, dir)).find_map(|use_tree| {
-                try_merge_trees(&tree, &use_tree, MergeBehaviour::Full).zip(Some(use_tree))
+                try_merge_trees(&tree, &use_tree, MergeBehavior::Full).zip(Some(use_tree))
            })?;
        rewriter.replace_ast(&tree, &merged);
diff --git a/crates/base_db/src/lib.rs b/crates/base_db/src/lib.rs
index 5571af495..595f28ada 100644
--- a/crates/base_db/src/lib.rs
+++ b/crates/base_db/src/lib.rs
@@ -18,7 +18,7 @@ pub use crate::{
    },
 };
 pub use salsa;
-pub use vfs::{file_set::FileSet, FileId, VfsPath};
+pub use vfs::{file_set::FileSet, AnchoredPath, AnchoredPathBuf, FileId, VfsPath};
 #[macro_export]
 macro_rules! impl_intern_key {
@@ -91,12 +91,7 @@ pub const DEFAULT_LRU_CAP: usize = 128;
 pub trait FileLoader {
    /// Text of the file.
    fn file_text(&self, file_id: FileId) -> Arc<String>;
-    /// Note that we intentionally accept a `&str` and not a `&Path` here. This
+    fn resolve_path(&self, path: AnchoredPath) -> Option<FileId>;
-    /// method exists to handle `#[path = "/some/path.rs"] mod foo;` and such,
-    /// so the input is guaranteed to be utf-8 string. One might be tempted to
-    /// introduce some kind of "utf-8 path with / separators", but that's a bad idea. Behold
-    /// `#[path = "C://no/way"]`
-    fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId>;
    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>>;
 }
@@ -155,11 +150,11 @@ impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
    fn file_text(&self, file_id: FileId) -> Arc<String> {
        SourceDatabaseExt::file_text(self.0, file_id)
    }
-    fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
+    fn resolve_path(&self, path: AnchoredPath) -> Option<FileId> {
        // FIXME: this *somehow* should be platform agnostic...
-        let source_root = self.0.file_source_root(anchor);
+        let source_root = self.0.file_source_root(path.anchor);
        let source_root = self.0.source_root(source_root);
-        source_root.file_set.resolve_path(anchor, path)
+        source_root.file_set.resolve_path(path)
    }
    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
diff --git a/crates/completion/src/completions/unqualified_path.rs b/crates/completion/src/completions/unqualified_path.rs
index 4e4e2b36f..2b0924ae5 100644
--- a/crates/completion/src/completions/unqualified_path.rs
+++ b/crates/completion/src/completions/unqualified_path.rs
@@ -45,7 +45,7 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
    });
    if ctx.config.enable_autoimport_completions && ctx.config.resolve_additional_edits_lazily() {
-        fuzzy_completion(acc, ctx).unwrap_or_default()
+        fuzzy_completion(acc, ctx);
    }
 }
@@ -100,10 +100,10 @@ fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext, ty: &T
 // To avoid an excessive amount of the results returned, completion input is checked for inclusion in the identifiers only
 // (i.e. in `HashMap` in the `std::collections::HashMap` path), also not in the module indentifiers.
 //
-// .Merge Behaviour
+// .Merge Behavior
 //
-// It is possible to configure how use-trees are merged with the `importMergeBehaviour` setting.
+// It is possible to configure how use-trees are merged with the `importMergeBehavior` setting.
-// Mimics the corresponding behaviour of the `Auto Import` feature.
+// Mimics the corresponding behavior of the `Auto Import` feature.
 //
 // .LSP and performance implications
 //
@@ -147,11 +147,7 @@ fn fuzzy_completion(acc: &mut Completions, ctx: &CompletionContext) -> Option<()
    .filter_map(|(import_path, definition)| {
        render_resolution_with_import(
            RenderContext::new(ctx),
-            ImportEdit {
+            ImportEdit { import_path: import_path.clone(), import_scope: import_scope.clone() },
-                import_path: import_path.clone(),
-                import_scope: import_scope.clone(),
-                merge_behaviour: ctx.config.merge,
-            },
            &definition,
        )
    });
diff --git a/crates/completion/src/config.rs b/crates/completion/src/config.rs
index 5175b9d69..30577dc11 100644
--- a/crates/completion/src/config.rs
+++ b/crates/completion/src/config.rs
@@ -4,7 +4,7 @@
 //! module, and we use to statically check that we only produce snippet
 //! completions if we are allowed to.
-use ide_db::helpers::insert_use::MergeBehaviour;
+use ide_db::helpers::insert_use::MergeBehavior;
 use rustc_hash::FxHashSet;
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -14,7 +14,7 @@ pub struct CompletionConfig {
    pub add_call_parenthesis: bool,
    pub add_call_argument_snippets: bool,
    pub snippet_cap: Option<SnippetCap>,
-    pub merge: Option<MergeBehaviour>,
+    pub merge: Option<MergeBehavior>,
    /// A set of capabilities, enabled on the client and supported on the server.
    pub active_resolve_capabilities: FxHashSet<CompletionResolveCapability>,
 }
@@ -56,7 +56,7 @@ impl Default for CompletionConfig {
            add_call_parenthesis: true,
            add_call_argument_snippets: true,
            snippet_cap: Some(SnippetCap { _private: () }),
-            merge: Some(MergeBehaviour::Full),
+            merge: Some(MergeBehavior::Full),
            active_resolve_capabilities: FxHashSet::default(),
        }
    }
diff --git a/crates/completion/src/item.rs b/crates/completion/src/item.rs
index bd94402d7..65f8353e7 100644
--- a/crates/completion/src/item.rs
+++ b/crates/completion/src/item.rs
@@ -4,7 +4,7 @@ use std::fmt;
 use hir::{Documentation, ModPath, Mutability};
 use ide_db::helpers::{
-    insert_use::{self, ImportScope, MergeBehaviour},
+    insert_use::{self, ImportScope, MergeBehavior},
    mod_path_to_ast,
 };
 use syntax::{algo, TextRange};
@@ -271,19 +271,18 @@ impl CompletionItem {
 pub struct ImportEdit {
    pub import_path: ModPath,
    pub import_scope: ImportScope,
-    pub merge_behaviour: Option<MergeBehaviour>,
 }
 impl ImportEdit {
    /// Attempts to insert the import to the given scope, producing a text edit.
    /// May return no edit in edge cases, such as scope already containing the import.
-    pub fn to_text_edit(&self) -> Option<TextEdit> {
+    pub fn to_text_edit(&self, merge_behavior: Option<MergeBehavior>) -> Option<TextEdit> {
        let _p = profile::span("ImportEdit::to_text_edit");
        let rewriter = insert_use::insert_use(
            &self.import_scope,
            mod_path_to_ast(&self.import_path),
-            self.merge_behaviour,
+            merge_behavior,
        );
        let old_ast = rewriter.rewrite_root()?;
        let mut import_insert = TextEdit::builder();
diff --git a/crates/completion/src/lib.rs b/crates/completion/src/lib.rs
index f60f87243..8e27bb153 100644
--- a/crates/completion/src/lib.rs
+++ b/crates/completion/src/lib.rs
@@ -153,9 +153,7 @@ pub fn resolve_completion_edits(
        })
        .find(|mod_path| mod_path.to_string() == full_import_path)?;
-    ImportEdit { import_path, import_scope, merge_behaviour: config.merge }
+    ImportEdit { import_path, import_scope }.to_text_edit(config.merge).map(|edit| vec![edit])
-        .to_text_edit()
-        .map(|edit| vec![edit])
 }
 #[cfg(test)]
diff --git a/crates/completion/src/test_utils.rs b/crates/completion/src/test_utils.rs
index 25f5f4924..db896b2df 100644
--- a/crates/completion/src/test_utils.rs
+++ b/crates/completion/src/test_utils.rs
@@ -98,7 +98,8 @@ pub(crate) fn check_edit_with_config(
    let mut actual = db.file_text(position.file_id).to_string();
    let mut combined_edit = completion.text_edit().to_owned();
-    if let Some(import_text_edit) = completion.import_to_add().and_then(|edit| edit.to_text_edit())
+    if let Some(import_text_edit) =
+        completion.import_to_add().and_then(|edit| edit.to_text_edit(config.merge))
    {
        combined_edit.union(import_text_edit).expect(
            "Failed to apply completion resolve changes: change ranges overlap, but should not",
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index c7c7377d7..302a52491 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -39,7 +39,7 @@ pub use crate::{
        Struct, Trait, Type, TypeAlias, TypeParam, Union, VariantDef,
    },
    has_source::HasSource,
-    semantics::{original_range, PathResolution, Semantics, SemanticsScope},
+    semantics::{PathResolution, Semantics, SemanticsScope},
 };
 pub use hir_def::{
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
index c61a430e1..4315ad48b 100644
--- a/crates/hir/src/semantics.rs
+++ b/crates/hir/src/semantics.rs
@@ -13,10 +13,7 @@ use hir_expand::{hygiene::Hygiene, name::AsName, ExpansionInfo};
 use hir_ty::associated_type_shorthand_candidates;
 use itertools::Itertools;
 use rustc_hash::{FxHashMap, FxHashSet};
-use syntax::{
+use syntax::{algo::find_node_at_offset, ast, AstNode, SyntaxNode, SyntaxToken, TextSize};
-    algo::{find_node_at_offset, skip_trivia_token},
-    ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextSize,
-};
 use crate::{
    code_model::Access,
@@ -25,7 +22,7 @@ use crate::{
    semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
    source_analyzer::{resolve_hir_path, SourceAnalyzer},
    AssocItem, Callable, Crate, Field, Function, HirFileId, ImplDef, InFile, Local, MacroDef,
-    Module, ModuleDef, Name, Origin, Path, ScopeDef, Trait, Type, TypeAlias, TypeParam, VariantDef,
+    Module, ModuleDef, Name, Path, ScopeDef, Trait, Type, TypeAlias, TypeParam, VariantDef,
 };
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -372,7 +369,7 @@ impl<'db> SemanticsImpl<'db> {
    fn original_range(&self, node: &SyntaxNode) -> FileRange {
        let node = self.find_file(node.clone());
-        original_range(self.db, node.as_ref())
+        node.as_ref().original_file_range(self.db.upcast())
    }
    fn diagnostics_display_range(&self, diagnostics: &dyn Diagnostic) -> FileRange {
@@ -380,7 +377,7 @@ impl<'db> SemanticsImpl<'db> {
        let root = self.db.parse_or_expand(src.file_id).unwrap();
        let node = src.value.to_node(&root);
        self.cache(root, src.file_id);
-        original_range(self.db, src.with_value(&node))
+        src.with_value(&node).original_file_range(self.db.upcast())
    }
    fn ancestors_with_macros(&self, node: SyntaxNode) -> impl Iterator<Item = SyntaxNode> + '_ {
@@ -771,68 +768,3 @@ impl<'a> SemanticsScope<'a> {
        resolve_hir_path(self.db, &self.resolver, &path)
    }
 }
-// FIXME: Change `HasSource` trait to work with `Semantics` and remove this?
-pub fn original_range(db: &dyn HirDatabase, node: InFile<&SyntaxNode>) -> FileRange {
-    if let Some(range) = original_range_opt(db, node) {
-        let original_file = range.file_id.original_file(db.upcast());
-        if range.file_id == original_file.into() {
-            return FileRange { file_id: original_file, range: range.value };
-        }
-        log::error!("Fail to mapping up more for {:?}", range);
-        return FileRange { file_id: range.file_id.original_file(db.upcast()), range: range.value };
-    }
-    // Fall back to whole macro call
-    if let Some(expansion) = node.file_id.expansion_info(db.upcast()) {
-        if let Some(call_node) = expansion.call_node() {
-            return FileRange {
-                file_id: call_node.file_id.original_file(db.upcast()),
-                range: call_node.value.text_range(),
-            };
-        }
-    }
-    FileRange { file_id: node.file_id.original_file(db.upcast()), range: node.value.text_range() }
-}
-fn original_range_opt(
-    db: &dyn HirDatabase,
-    node: InFile<&SyntaxNode>,
-) -> Option<InFile<TextRange>> {
-    let expansion = node.file_id.expansion_info(db.upcast())?;
-    // the input node has only one token ?
-    let single = skip_trivia_token(node.value.first_token()?, Direction::Next)?
-        == skip_trivia_token(node.value.last_token()?, Direction::Prev)?;
-    Some(node.value.descendants().find_map(|it| {
-        let first = skip_trivia_token(it.first_token()?, Direction::Next)?;
-        let first = ascend_call_token(db, &expansion, node.with_value(first))?;
-        let last = skip_trivia_token(it.last_token()?, Direction::Prev)?;
-        let last = ascend_call_token(db, &expansion, node.with_value(last))?;
-        if (!single && first == last) || (first.file_id != last.file_id) {
-            return None;
-        }
-        Some(first.with_value(first.value.text_range().cover(last.value.text_range())))
-    })?)
-}
-fn ascend_call_token(
-    db: &dyn HirDatabase,
-    expansion: &ExpansionInfo,
-    token: InFile<SyntaxToken>,
-) -> Option<InFile<SyntaxToken>> {
-    let (mapped, origin) = expansion.map_token_up(token.as_ref())?;
-    if origin != Origin::Call {
-        return None;
-    }
-    if let Some(info) = mapped.file_id.expansion_info(db.upcast()) {
-        return ascend_call_token(db, &info, mapped);
-    }
-    Some(mapped)
-}
diff --git a/crates/hir_def/src/attr.rs b/crates/hir_def/src/attr.rs
index 12f4b02e2..228d706db 100644
--- a/crates/hir_def/src/attr.rs
+++ b/crates/hir_def/src/attr.rs
@@ -9,7 +9,7 @@ use itertools::Itertools;
 use mbe::ast_to_token_tree;
 use syntax::{
    ast::{self, AstNode, AttrsOwner},
-    AstToken, SmolStr,
+    match_ast, AstToken, SmolStr, SyntaxNode,
 };
 use tt::Subtree;
@@ -110,7 +110,17 @@ impl Attrs {
    }
    pub(crate) fn new(owner: &dyn AttrsOwner, hygiene: &Hygiene) -> Attrs {
-        let docs = ast::CommentIter::from_syntax_node(owner.syntax()).map(|docs_text| {
+        let (inner_attrs, inner_docs) = inner_attributes(owner.syntax())
+            .map_or((None, None), |(attrs, docs)| ((Some(attrs), Some(docs))));
+        let outer_attrs = owner.attrs().filter(|attr| attr.excl_token().is_none());
+        let attrs = outer_attrs
+            .chain(inner_attrs.into_iter().flatten())
+            .map(|attr| (attr.syntax().text_range().start(), Attr::from_src(attr, hygiene)));
+        let outer_docs =
+            ast::CommentIter::from_syntax_node(owner.syntax()).filter(ast::Comment::is_outer);
+        let docs = outer_docs.chain(inner_docs.into_iter().flatten()).map(|docs_text| {
            (
                docs_text.syntax().text_range().start(),
                docs_text.doc_comment().map(|doc| Attr {
@@ -119,9 +129,6 @@ impl Attrs {
                }),
            )
        });
-        let attrs = owner
-            .attrs()
-            .map(|attr| (attr.syntax().text_range().start(), Attr::from_src(attr, hygiene)));
        // sort here by syntax node offset because the source can have doc attributes and doc strings be interleaved
        let attrs: Vec<_> = docs.chain(attrs).sorted_by_key(|&(offset, _)| offset).collect();
        let entries = if attrs.is_empty() {
@@ -184,6 +191,41 @@ impl Attrs {
    }
 }
+fn inner_attributes(
+    syntax: &SyntaxNode,
+) -> Option<(impl Iterator<Item = ast::Attr>, impl Iterator<Item = ast::Comment>)> {
+    let (attrs, docs) = match_ast! {
+        match syntax {
+            ast::SourceFile(it) => (it.attrs(), ast::CommentIter::from_syntax_node(it.syntax())),
+            ast::ExternBlock(it) => {
+                let extern_item_list = it.extern_item_list()?;
+                (extern_item_list.attrs(), ast::CommentIter::from_syntax_node(extern_item_list.syntax()))
+            },
+            ast::Fn(it) => {
+                let body = it.body()?;
+                (body.attrs(), ast::CommentIter::from_syntax_node(body.syntax()))
+            },
+            ast::Impl(it) => {
+                let assoc_item_list = it.assoc_item_list()?;
+                (assoc_item_list.attrs(), ast::CommentIter::from_syntax_node(assoc_item_list.syntax()))
+            },
+            ast::Module(it) => {
+                let item_list = it.item_list()?;
+                (item_list.attrs(), ast::CommentIter::from_syntax_node(item_list.syntax()))
+            },
+            // FIXME: BlockExpr's only accept inner attributes in specific cases
+            // Excerpt from the reference:
+            // Block expressions accept outer and inner attributes, but only when they are the outer
+            // expression of an expression statement or the final expression of another block expression.
+            ast::BlockExpr(it) => return None,
+            _ => return None,
+        }
+    };
+    let attrs = attrs.filter(|attr| attr.excl_token().is_some());
+    let docs = docs.filter(|doc| doc.is_inner());
+    Some((attrs, docs))
+}
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Attr {
    pub(crate) path: ModPath,
diff --git a/crates/hir_def/src/body.rs b/crates/hir_def/src/body.rs
index 92bcc1705..c5d6f5fb0 100644
--- a/crates/hir_def/src/body.rs
+++ b/crates/hir_def/src/body.rs
@@ -103,8 +103,7 @@ impl Expander {
        local_scope: Option<&ItemScope>,
        macro_call: ast::MacroCall,
    ) -> ExpandResult<Option<(Mark, T)>> {
-        self.recursion_limit += 1;
+        if self.recursion_limit + 1 > EXPANSION_RECURSION_LIMIT {
-        if self.recursion_limit > EXPANSION_RECURSION_LIMIT {
            mark::hit!(your_stack_belongs_to_me);
            return ExpandResult::str_err("reached recursion limit during macro expansion".into());
        }
@@ -165,6 +164,7 @@ impl Expander {
        log::debug!("macro expansion {:#?}", node.syntax());
+        self.recursion_limit += 1;
        let mark = Mark {
            file_id: self.current_file_id,
            ast_id_map: mem::take(&mut self.ast_id_map),
diff --git a/crates/hir_def/src/body/tests.rs b/crates/hir_def/src/body/tests.rs
index 6dba9817d..de77d5fc9 100644
--- a/crates/hir_def/src/body/tests.rs
+++ b/crates/hir_def/src/body/tests.rs
@@ -134,3 +134,31 @@ fn f() {
      "#,
    );
 }
+#[test]
+fn dollar_crate_in_builtin_macro() {
+    check_diagnostics(
+        r#"
+#[macro_export]
+#[rustc_builtin_macro]
+macro_rules! format_args {}
+#[macro_export]
+macro_rules! arg {
+    () => {}
+}
+#[macro_export]
+macro_rules! outer {
+    () => {
+        $crate::format_args!( "", $crate::arg!(1) )
+    };
+}
+fn f() {
+    outer!();
+  //^^^^^^^^ leftover tokens
+}
+        "#,
+    )
+}
diff --git a/crates/hir_def/src/data.rs b/crates/hir_def/src/data.rs
index 146045938..dd3a906af 100644
--- a/crates/hir_def/src/data.rs
+++ b/crates/hir_def/src/data.rs
@@ -28,6 +28,7 @@ pub struct FunctionData {
    pub has_body: bool,
    pub is_unsafe: bool,
    pub is_varargs: bool,
+    pub is_extern: bool,
    pub visibility: RawVisibility,
 }
@@ -46,6 +47,7 @@ impl FunctionData {
            has_body: func.has_body,
            is_unsafe: func.is_unsafe,
            is_varargs: func.is_varargs,
+            is_extern: func.is_extern,
            visibility: item_tree[func.visibility].clone(),
        })
    }
@@ -191,6 +193,7 @@ pub struct StaticData {
    pub type_ref: TypeRef,
    pub visibility: RawVisibility,
    pub mutable: bool,
+    pub is_extern: bool,
 }
 impl StaticData {
@@ -204,6 +207,7 @@ impl StaticData {
            type_ref: statik.type_ref.clone(),
            visibility: item_tree[statik.visibility].clone(),
            mutable: statik.mutable,
+            is_extern: statik.is_extern,
        })
    }
 }
diff --git a/crates/hir_def/src/item_tree.rs b/crates/hir_def/src/item_tree.rs
index 7eb388bae..c017b352d 100644
--- a/crates/hir_def/src/item_tree.rs
+++ b/crates/hir_def/src/item_tree.rs
@@ -1,8 +1,6 @@
 //! A simplified AST that only contains items.
 mod lower;
-#[cfg(test)]
-mod tests;
 use std::{
    any::type_name,
@@ -507,6 +505,9 @@ pub struct Function {
    pub has_self_param: bool,
    pub has_body: bool,
    pub is_unsafe: bool,
+    /// Whether the function is located in an `extern` block (*not* whether it is an
+    /// `extern "abi" fn`).
+    pub is_extern: bool,
    pub params: Box<[TypeRef]>,
    pub is_varargs: bool,
    pub ret_type: TypeRef,
@@ -565,6 +566,8 @@ pub struct Static {
    pub name: Name,
    pub visibility: RawVisibilityId,
    pub mutable: bool,
+    /// Whether the static is in an `extern` block.
+    pub is_extern: bool,
    pub type_ref: TypeRef,
    pub ast_id: FileAstId<ast::Static>,
 }
diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs
index ca7fb4a43..63b2826f8 100644
--- a/crates/hir_def/src/item_tree/lower.rs
+++ b/crates/hir_def/src/item_tree/lower.rs
@@ -340,6 +340,7 @@ impl Ctx {
            has_self_param,
            has_body,
            is_unsafe: func.unsafe_token().is_some(),
+            is_extern: false,
            params: params.into_boxed_slice(),
            is_varargs,
            ret_type,
@@ -378,7 +379,7 @@ impl Ctx {
        let visibility = self.lower_visibility(static_);
        let mutable = static_.mut_token().is_some();
        let ast_id = self.source_ast_id_map.ast_id(static_);
-        let res = Static { name, visibility, mutable, type_ref, ast_id };
+        let res = Static { name, visibility, mutable, type_ref, ast_id, is_extern: false };
        Some(id(self.data().statics.alloc(res)))
    }
@@ -554,13 +555,15 @@ impl Ctx {
                    let attrs = Attrs::new(&item, &self.hygiene);
                    let id: ModItem = match item {
                        ast::ExternItem::Fn(ast) => {
-                            let func = self.lower_function(&ast)?;
+                            let func_id = self.lower_function(&ast)?;
-                            self.data().functions[func.index].is_unsafe =
+                            let func = &mut self.data().functions[func_id.index];
-                                is_intrinsic_fn_unsafe(&self.data().functions[func.index].name);
+                            func.is_unsafe = is_intrinsic_fn_unsafe(&func.name);
-                            func.into()
+                            func.is_extern = true;
+                            func_id.into()
                        }
                        ast::ExternItem::Static(ast) => {
                            let statik = self.lower_static(&ast)?;
+                            self.data().statics[statik.index].is_extern = true;
                            statik.into()
                        }
                        ast::ExternItem::TypeAlias(ty) => {
diff --git a/crates/hir_def/src/item_tree/tests.rs b/crates/hir_def/src/item_tree/tests.rs
deleted file mode 100644
index 4b354c4c1..000000000
--- a/crates/hir_def/src/item_tree/tests.rs
+++ /dev/null
@@ -1,439 +0,0 @@
-use base_db::fixture::WithFixture;
-use expect_test::{expect, Expect};
-use hir_expand::{db::AstDatabase, HirFileId, InFile};
-use rustc_hash::FxHashSet;
-use std::sync::Arc;
-use stdx::format_to;
-use syntax::{ast, AstNode};
-use crate::{db::DefDatabase, test_db::TestDB};
-use super::{ItemTree, ModItem, ModKind};
-fn test_inner_items(ra_fixture: &str) {
-    let (db, file_id) = TestDB::with_single_file(ra_fixture);
-    let file_id = HirFileId::from(file_id);
-    let tree = db.item_tree(file_id);
-    let root = db.parse_or_expand(file_id).unwrap();
-    let ast_id_map = db.ast_id_map(file_id);
-    // Traverse the item tree and collect all module/impl/trait-level items as AST nodes.
-    let mut outer_items = FxHashSet::default();
-    let mut worklist = tree.top_level_items().to_vec();
-    while let Some(item) = worklist.pop() {
-        let node: ast::Item = match item {
-            ModItem::Import(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::ExternCrate(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Function(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Struct(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Union(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Enum(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Const(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Static(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::TypeAlias(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Mod(it) => {
-                if let ModKind::Inline { items } = &tree[it].kind {
-                    worklist.extend(&**items);
-                }
-                tree.source(&db, InFile::new(file_id, it)).into()
-            }
-            ModItem::Trait(it) => {
-                worklist.extend(tree[it].items.iter().map(|item| ModItem::from(*item)));
-                tree.source(&db, InFile::new(file_id, it)).into()
-            }
-            ModItem::Impl(it) => {
-                worklist.extend(tree[it].items.iter().map(|item| ModItem::from(*item)));
-                tree.source(&db, InFile::new(file_id, it)).into()
-            }
-            ModItem::MacroCall(_) => continue,
-        };
-        outer_items.insert(node);
-    }
-    // Now descend the root node and check that all `ast::ModuleItem`s are either recorded above, or
-    // registered as inner items.
-    for item in root.descendants().skip(1).filter_map(ast::Item::cast) {
-        if outer_items.contains(&item) {
-            continue;
-        }
-        let ast_id = ast_id_map.ast_id(&item);
-        assert!(!tree.inner_items(ast_id).is_empty());
-    }
-}
-fn item_tree(ra_fixture: &str) -> Arc<ItemTree> {
-    let (db, file_id) = TestDB::with_single_file(ra_fixture);
-    db.item_tree(file_id.into())
-}
-fn print_item_tree(ra_fixture: &str) -> String {
-    let tree = item_tree(ra_fixture);
-    let mut out = String::new();
-    format_to!(out, "inner attrs: {:?}\n\n", tree.top_level_attrs());
-    format_to!(out, "top-level items:\n");
-    for item in tree.top_level_items() {
-        fmt_mod_item(&mut out, &tree, *item);
-        format_to!(out, "\n");
-    }
-    if !tree.inner_items.is_empty() {
-        format_to!(out, "\ninner items:\n\n");
-        for (ast_id, items) in &tree.inner_items {
-            format_to!(out, "for AST {:?}:\n", ast_id);
-            for inner in items {
-                fmt_mod_item(&mut out, &tree, *inner);
-                format_to!(out, "\n\n");
-            }
-        }
-    }
-    out
-}
-fn fmt_mod_item(out: &mut String, tree: &ItemTree, item: ModItem) {
-    let attrs = tree.attrs(item.into());
-    if !attrs.is_empty() {
-        format_to!(out, "#[{:?}]\n", attrs);
-    }
-    let mut children = String::new();
-    match item {
-        ModItem::ExternCrate(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Import(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Function(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Struct(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Union(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Enum(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Const(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Static(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Trait(it) => {
-            format_to!(out, "{:?}", tree[it]);
-            for item in &*tree[it].items {
-                fmt_mod_item(&mut children, tree, ModItem::from(*item));
-                format_to!(children, "\n");
-            }
-        }
-        ModItem::Impl(it) => {
-            format_to!(out, "{:?}", tree[it]);
-            for item in &*tree[it].items {
-                fmt_mod_item(&mut children, tree, ModItem::from(*item));
-                format_to!(children, "\n");
-            }
-        }
-        ModItem::TypeAlias(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Mod(it) => {
-            format_to!(out, "{:?}", tree[it]);
-            match &tree[it].kind {
-                ModKind::Inline { items } => {
-                    for item in &**items {
-                        fmt_mod_item(&mut children, tree, *item);
-                        format_to!(children, "\n");
-                    }
-                }
-                ModKind::Outline {} => {}
-            }
-        }
-        ModItem::MacroCall(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-    }
-    for line in children.lines() {
-        format_to!(out, "\n> {}", line);
-    }
-}
-fn check(ra_fixture: &str, expect: Expect) {
-    let actual = print_item_tree(ra_fixture);
-    expect.assert_eq(&actual);
-}
-#[test]
-fn smoke() {
-    check(
-        r"
-        #![attr]
-        #[attr_on_use]
-        use {a, b::*};
-        #[ext_crate]
-        extern crate krate;
-        #[on_trait]
-        trait Tr<U> {
-            #[assoc_ty]
-            type AssocTy: Tr<()>;
-            #[assoc_const]
-            const CONST: u8;
-            #[assoc_method]
-            fn method(&self);
-            #[assoc_dfl_method]
-            fn dfl_method(&mut self) {}
-        }
-        #[struct0]
-        struct Struct0<T = ()>;
-        #[struct1]
-        struct Struct1<T>(#[struct1fld] u8);
-        #[struct2]
-        struct Struct2<T> {
-            #[struct2fld]
-            fld: (T, ),
-        }
-        #[en]
-        enum En {
-            #[enum_variant]
-            Variant {
-                #[enum_field]
-                field: u8,
-            },
-        }
-        #[un]
-        union Un {
-            #[union_fld]
-            fld: u16,
-        }
-    ",
-        expect![[r##"
-            inner attrs: Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr"))] }, input: None }]) }
-            top-level items:
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
-            Import { path: ModPath { kind: Plain, segments: [Name(Text("a"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: false, is_prelude: false, ast_id: FileAstId::<syntax::ast::generated::nodes::Use>(0), index: 0 }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
-            Import { path: ModPath { kind: Plain, segments: [Name(Text("b"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: true, is_prelude: false, ast_id: FileAstId::<syntax::ast::generated::nodes::Use>(0), index: 1 }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("ext_crate"))] }, input: None }]) }]
-            ExternCrate { name: Name(Text("krate")), alias: None, visibility: RawVisibilityId("pub(self)"), is_macro_use: false, ast_id: FileAstId::<syntax::ast::generated::nodes::ExternCrate>(1) }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_trait"))] }, input: None }]) }]
-            Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [TypeAlias(Idx::<TypeAlias>(0)), Const(Idx::<Const>(0)), Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Trait>(2) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_ty"))] }, input: None }]) }]
-            > TypeAlias { name: Name(Text("AssocTy")), visibility: RawVisibilityId("pub(self)"), bounds: [Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Tr"))] }, generic_args: [Some(GenericArgs { args: [Type(Tuple([]))], has_self_type: false, bindings: [] })] })], generic_params: GenericParamsId(4294967295), type_ref: None, is_extern: false, ast_id: FileAstId::<syntax::ast::generated::nodes::TypeAlias>(8) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_const"))] }, input: None }]) }]
-            > Const { name: Some(Name(Text("CONST"))), visibility: RawVisibilityId("pub(self)"), type_ref: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("u8"))] }, generic_args: [None] }), ast_id: FileAstId::<syntax::ast::generated::nodes::Const>(9) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_method"))] }, input: None }]) }]
-            > Function { name: Name(Text("method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, has_body: false, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Shared)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(10) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_dfl_method"))] }, input: None }]) }]
-            > Function { name: Name(Text("dfl_method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, has_body: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Mut)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(11) }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct0"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct0")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), fields: Unit, ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(3), kind: Unit }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct1"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct1")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(2), fields: Tuple(IdRange::<hir_def::item_tree::Field>(0..1)), ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(4), kind: Tuple }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct2"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct2")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(3), fields: Record(IdRange::<hir_def::item_tree::Field>(1..2)), ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(5), kind: Record }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("en"))] }, input: None }]) }]
-            Enum { name: Name(Text("En")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), variants: IdRange::<hir_def::item_tree::Variant>(0..1), ast_id: FileAstId::<syntax::ast::generated::nodes::Enum>(6) }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("un"))] }, input: None }]) }]
-            Union { name: Name(Text("Un")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), fields: Record(IdRange::<hir_def::item_tree::Field>(3..4)), ast_id: FileAstId::<syntax::ast::generated::nodes::Union>(7) }
-        "##]],
-    );
-}
-#[test]
-fn simple_inner_items() {
-    check(
-        r"
-        impl<T:A> D for Response<T> {
-            fn foo() {
-                end();
-                fn end<W: Write>() {
-                    let _x: T = loop {};
-                }
-            }
-        }
-    ",
-        expect![[r#"
-            inner attrs: Attrs { entries: None }
-            top-level items:
-            Impl { generic_params: GenericParamsId(0), target_trait: Some(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("D"))] }, generic_args: [None] })), target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Response"))] }, generic_args: [Some(GenericArgs { args: [Type(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("T"))] }, generic_args: [None] }))], has_self_type: false, bindings: [] })] }), is_negative: false, items: [Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Impl>(0) }
-            > Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
-            inner items:
-            for AST FileAstId::<syntax::ast::generated::nodes::Item>(2):
-            Function { name: Name(Text("end")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
-        "#]],
-    );
-}
-#[test]
-fn extern_attrs() {
-    check(
-        r#"
-        #[block_attr]
-        extern "C" {
-            #[attr_a]
-            fn a() {}
-            #[attr_b]
-            fn b() {}
-        }
-    "#,
-        expect![[r##"
-            inner attrs: Attrs { entries: None }
-            top-level items:
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }]
-            Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }]
-            Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
-        "##]],
-    );
-}
-#[test]
-fn trait_attrs() {
-    check(
-        r#"
-        #[trait_attr]
-        trait Tr {
-            #[attr_a]
-            fn a() {}
-            #[attr_b]
-            fn b() {}
-        }
-    "#,
-        expect![[r##"
-            inner attrs: Attrs { entries: None }
-            top-level items:
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("trait_attr"))] }, input: None }]) }]
-            Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Trait>(0) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }]
-            > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }]
-            > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
-        "##]],
-    );
-}
-#[test]
-fn impl_attrs() {
-    check(
-        r#"
-        #[impl_attr]
-        impl Ty {
-            #[attr_a]
-            fn a() {}
-            #[attr_b]
-            fn b() {}
-        }
-    "#,
-        expect![[r##"
-            inner attrs: Attrs { entries: None }
-            top-level items:
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("impl_attr"))] }, input: None }]) }]
-            Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Ty"))] }, generic_args: [None] }), is_negative: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Impl>(0) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }]
-            > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }]
-            > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
-        "##]],
-    );
-}
-#[test]
-fn cursed_inner_items() {
-    test_inner_items(
-        r"
-        struct S<T: Trait = [u8; { fn f() {} 0 }]>(T);
-        enum En {
-            Var1 {
-                t: [(); { trait Inner {} 0 }],
-            },
-            Var2([u16; { enum Inner {} 0 }]),
-        }
-        type Ty = [En; { struct Inner; 0 }];
-        impl En {
-            fn assoc() {
-                trait InnerTrait<T = [u8; { fn f() {} }]> {}
-                struct InnerStruct<T = [u8; { fn f() {} }]> {}
-                impl<T = [u8; { fn f() {} }]> InnerTrait for InnerStruct {}
-            }
-        }
-        trait Tr<T = [u8; { fn f() {} }]> {
-            type AssocTy = [u8; { fn f() {} }];
-            const AssocConst: [u8; { fn f() {} }];
-        }
-    ",
-    );
-}
-#[test]
-fn inner_item_attrs() {
-    check(
-        r"
-        fn foo() {
-            #[on_inner]
-            fn inner() {}
-        }
-    ",
-        expect![[r##"
-            inner attrs: Attrs { entries: None }
-            top-level items:
-            Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(0) }
-            inner items:
-            for AST FileAstId::<syntax::ast::generated::nodes::Item>(1):
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_inner"))] }, input: None }]) }]
-            Function { name: Name(Text("inner")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
-        "##]],
-    );
-}
-#[test]
-fn assoc_item_macros() {
-    check(
-        r"
-        impl S {
-            items!();
-        }
-    ",
-        expect![[r#"
-            inner attrs: Attrs { entries: None }
-            top-level items:
-            Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("S"))] }, generic_args: [None] }), is_negative: false, items: [MacroCall(Idx::<MacroCall>(0))], ast_id: FileAstId::<syntax::ast::generated::nodes::Impl>(0) }
-            > MacroCall { name: None, path: ModPath { kind: Plain, segments: [Name(Text("items"))] }, is_export: false, is_local_inner: false, is_builtin: false, ast_id: FileAstId::<syntax::ast::generated::nodes::MacroCall>(1) }
-        "#]],
-    );
-}
diff --git a/crates/hir_def/src/nameres/mod_resolution.rs b/crates/hir_def/src/nameres/mod_resolution.rs
index c0c789cae..b4ccd4488 100644
--- a/crates/hir_def/src/nameres/mod_resolution.rs
+++ b/crates/hir_def/src/nameres/mod_resolution.rs
@@ -1,5 +1,5 @@
 //! This module resolves `mod foo;` declaration to file.
-use base_db::FileId;
+use base_db::{AnchoredPath, FileId};
 use hir_expand::name::Name;
 use syntax::SmolStr;
 use test_utils::mark;
@@ -77,7 +77,8 @@ impl ModDir {
        };
        for candidate in candidate_files.iter() {
-            if let Some(file_id) = db.resolve_path(file_id, candidate.as_str()) {
+            let path = AnchoredPath { anchor: file_id, path: candidate.as_str() };
+            if let Some(file_id) = db.resolve_path(path) {
                let is_mod_rs = candidate.ends_with("mod.rs");
                let (dir_path, root_non_dir_owner) = if is_mod_rs || attr_path.is_some() {
diff --git a/crates/hir_def/src/test_db.rs b/crates/hir_def/src/test_db.rs
index 00fe711fe..574c0201a 100644
--- a/crates/hir_def/src/test_db.rs
+++ b/crates/hir_def/src/test_db.rs
@@ -5,8 +5,8 @@ use std::{
    sync::{Arc, Mutex},
 };
-use base_db::SourceDatabase;
 use base_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, Upcast};
+use base_db::{AnchoredPath, SourceDatabase};
 use hir_expand::db::AstDatabase;
 use hir_expand::diagnostics::Diagnostic;
 use hir_expand::diagnostics::DiagnosticSinkBuilder;
@@ -63,8 +63,8 @@ impl FileLoader for TestDB {
    fn file_text(&self, file_id: FileId) -> Arc<String> {
        FileLoaderDelegate(self).file_text(file_id)
    }
-    fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
+    fn resolve_path(&self, path: AnchoredPath) -> Option<FileId> {
-        FileLoaderDelegate(self).resolve_path(anchor, path)
+        FileLoaderDelegate(self).resolve_path(path)
    }
    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
        FileLoaderDelegate(self).relevant_crates(file_id)
@@ -157,11 +157,12 @@ impl TestDB {
        db.diagnostics(|d| {
            let src = d.display_source();
            let root = db.parse_or_expand(src.file_id).unwrap();
-            // FIXME: macros...
-            let file_id = src.file_id.original_file(db);
+            let node = src.map(|ptr| ptr.to_node(&root));
-            let range = src.value.to_node(&root).text_range();
+            let frange = node.as_ref().original_file_range(db);
            let message = d.message().to_owned();
-            actual.entry(file_id).or_default().push((range, message));
+            actual.entry(frange.file_id).or_default().push((frange.range, message));
        });
        for (file_id, diags) in actual.iter_mut() {
diff --git a/crates/hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs
index 44a5556b6..477192a09 100644
--- a/crates/hir_expand/src/builtin_macro.rs
+++ b/crates/hir_expand/src/builtin_macro.rs
@@ -4,7 +4,7 @@ use crate::{
    MacroDefId, MacroDefKind, TextSize,
 };
-use base_db::FileId;
+use base_db::{AnchoredPath, FileId};
 use either::Either;
 use mbe::{parse_to_token_tree, ExpandResult};
 use parser::FragmentKind;
@@ -245,6 +245,12 @@ fn format_args_expand(
    if args.is_empty() {
        return ExpandResult::only_err(mbe::ExpandError::NoMatchingRule);
    }
+    for arg in &mut args {
+        // Remove `key =`.
+        if matches!(arg.get(1), Some(tt::TokenTree::Leaf(tt::Leaf::Punct(p))) if p.char == '=') {
+            arg.drain(..2);
+        }
+    }
    let _format_string = args.remove(0);
    let arg_tts = args.into_iter().flat_map(|arg| {
        quote! { std::fmt::ArgumentV1::new(&(##arg), std::fmt::Display::fmt), }
@@ -287,23 +293,34 @@ fn concat_expand(
    _arg_id: EagerMacroId,
    tt: &tt::Subtree,
 ) -> ExpandResult<Option<(tt::Subtree, FragmentKind)>> {
+    let mut err = None;
    let mut text = String::new();
    for (i, t) in tt.token_trees.iter().enumerate() {
        match t {
            tt::TokenTree::Leaf(tt::Leaf::Literal(it)) if i % 2 == 0 => {
-                text += &match unquote_str(&it) {
+                // concat works with string and char literals, so remove any quotes.
-                    Some(s) => s,
+                // It also works with integer, float and boolean literals, so just use the rest
-                    None => {
+                // as-is.
-                        return ExpandResult::only_err(mbe::ExpandError::ConversionError);
-                    }
+                text += it
-                };
+                    .text
+                    .trim_start_matches(|c| match c {
+                        'r' | '#' | '\'' | '"' => true,
+                        _ => false,
+                    })
+                    .trim_end_matches(|c| match c {
+                        '#' | '\'' | '"' => true,
+                        _ => false,
+                    });
            }
            tt::TokenTree::Leaf(tt::Leaf::Punct(punct)) if i % 2 == 1 && punct.char == ',' => (),
-            _ => return ExpandResult::only_err(mbe::ExpandError::UnexpectedToken),
+            _ => {
+                err.get_or_insert(mbe::ExpandError::UnexpectedToken);
+            }
        }
    }
-    ExpandResult::ok(Some((quote!(#text), FragmentKind::Expr)))
+    ExpandResult { value: Some((quote!(#text), FragmentKind::Expr)), err }
 }
 fn relative_file(
@@ -313,7 +330,8 @@ fn relative_file(
    allow_recursion: bool,
 ) -> Option<FileId> {
    let call_site = call_id.as_file().original_file(db);
-    let res = db.resolve_path(call_site, path)?;
+    let path = AnchoredPath { anchor: call_site, path };
+    let res = db.resolve_path(path)?;
    // Prevent include itself
    if res == call_site && !allow_recursion {
        None
@@ -686,4 +704,19 @@ mod tests {
        assert_eq!(expanded, r#"b"""#);
    }
+    #[test]
+    fn test_concat_expand() {
+        let expanded = expand_builtin_macro(
+            r##"
+            #[rustc_builtin_macro]
+            macro_rules! concat {}
+            concat!("foo", 0, r#"bar"#);
+            "##,
+        );
+        assert_eq!(expanded, r#""foo0bar""#);
+        // FIXME: `true`/`false` literals don't work.
+    }
 }
diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs
index 2633fd8f7..1a9428514 100644
--- a/crates/hir_expand/src/lib.rs
+++ b/crates/hir_expand/src/lib.rs
@@ -20,11 +20,11 @@ pub use mbe::{ExpandError, ExpandResult};
 use std::hash::Hash;
 use std::sync::Arc;
-use base_db::{impl_intern_key, salsa, CrateId, FileId};
+use base_db::{impl_intern_key, salsa, CrateId, FileId, FileRange};
 use syntax::{
-    algo,
+    algo::{self, skip_trivia_token},
    ast::{self, AstNode},
-    SyntaxNode, SyntaxToken, TextSize,
+    Direction, SyntaxNode, SyntaxToken, TextRange, TextSize,
 };
 use crate::ast_id_map::FileAstId;
@@ -445,6 +445,70 @@ impl InFile<SyntaxNode> {
    }
 }
+impl<'a> InFile<&'a SyntaxNode> {
+    pub fn original_file_range(self, db: &dyn db::AstDatabase) -> FileRange {
+        if let Some(range) = original_range_opt(db, self) {
+            let original_file = range.file_id.original_file(db);
+            if range.file_id == original_file.into() {
+                return FileRange { file_id: original_file, range: range.value };
+            }
+            log::error!("Fail to mapping up more for {:?}", range);
+            return FileRange { file_id: range.file_id.original_file(db), range: range.value };
+        }
+        // Fall back to whole macro call.
+        let mut node = self.cloned();
+        while let Some(call_node) = node.file_id.call_node(db) {
+            node = call_node;
+        }
+        let orig_file = node.file_id.original_file(db);
+        assert_eq!(node.file_id, orig_file.into());
+        FileRange { file_id: orig_file, range: node.value.text_range() }
+    }
+}
+fn original_range_opt(
+    db: &dyn db::AstDatabase,
+    node: InFile<&SyntaxNode>,
+) -> Option<InFile<TextRange>> {
+    let expansion = node.file_id.expansion_info(db)?;
+    // the input node has only one token ?
+    let single = skip_trivia_token(node.value.first_token()?, Direction::Next)?
+        == skip_trivia_token(node.value.last_token()?, Direction::Prev)?;
+    Some(node.value.descendants().find_map(|it| {
+        let first = skip_trivia_token(it.first_token()?, Direction::Next)?;
+        let first = ascend_call_token(db, &expansion, node.with_value(first))?;
+        let last = skip_trivia_token(it.last_token()?, Direction::Prev)?;
+        let last = ascend_call_token(db, &expansion, node.with_value(last))?;
+        if (!single && first == last) || (first.file_id != last.file_id) {
+            return None;
+        }
+        Some(first.with_value(first.value.text_range().cover(last.value.text_range())))
+    })?)
+}
+fn ascend_call_token(
+    db: &dyn db::AstDatabase,
+    expansion: &ExpansionInfo,
+    token: InFile<SyntaxToken>,
+) -> Option<InFile<SyntaxToken>> {
+    let (mapped, origin) = expansion.map_token_up(token.as_ref())?;
+    if origin != Origin::Call {
+        return None;
+    }
+    if let Some(info) = mapped.file_id.expansion_info(db) {
+        return ascend_call_token(db, &info, mapped);
+    }
+    Some(mapped)
+}
 impl InFile<SyntaxToken> {
    pub fn ancestors_with_macros(
        self,
diff --git a/crates/hir_expand/src/test_db.rs b/crates/hir_expand/src/test_db.rs
index fca501e1f..7168a9462 100644
--- a/crates/hir_expand/src/test_db.rs
+++ b/crates/hir_expand/src/test_db.rs
@@ -5,7 +5,7 @@ use std::{
    sync::{Arc, Mutex},
 };
-use base_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate};
+use base_db::{salsa, AnchoredPath, CrateId, FileId, FileLoader, FileLoaderDelegate};
 use rustc_hash::FxHashSet;
 #[salsa::database(
@@ -40,8 +40,8 @@ impl FileLoader for TestDB {
    fn file_text(&self, file_id: FileId) -> Arc<String> {
        FileLoaderDelegate(self).file_text(file_id)
    }
-    fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
+    fn resolve_path(&self, path: AnchoredPath) -> Option<FileId> {
-        FileLoaderDelegate(self).resolve_path(anchor, path)
+        FileLoaderDelegate(self).resolve_path(path)
    }
    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
        FileLoaderDelegate(self).relevant_crates(file_id)
diff --git a/crates/hir_ty/src/diagnostics/decl_check.rs b/crates/hir_ty/src/diagnostics/decl_check.rs
index 4b3e2fa8f..25587e116 100644
--- a/crates/hir_ty/src/diagnostics/decl_check.rs
+++ b/crates/hir_ty/src/diagnostics/decl_check.rs
@@ -26,6 +26,7 @@ use syntax::{
    ast::{self, NameOwner},
    AstNode, AstPtr,
 };
+use test_utils::mark;
 use crate::{
    db::HirDatabase,
@@ -87,6 +88,11 @@ impl<'a, 'b> DeclValidator<'a, 'b> {
    fn validate_func(&mut self, db: &dyn HirDatabase, func: FunctionId) {
        let data = db.function_data(func);
+        if data.is_extern {
+            mark::hit!(extern_func_incorrect_case_ignored);
+            return;
+        }
        let body = db.body(func.into());
        // Recursively validate inner scope items, such as static variables and constants.
@@ -648,6 +654,10 @@ impl<'a, 'b> DeclValidator<'a, 'b> {
    fn validate_static(&mut self, db: &dyn HirDatabase, static_id: StaticId) {
        let data = db.static_data(static_id);
+        if data.is_extern {
+            mark::hit!(extern_static_incorrect_case_ignored);
+            return;
+        }
        if self.allowed(db, static_id.into(), allow::NON_UPPER_CASE_GLOBAL) {
            return;
@@ -709,6 +719,8 @@ fn pat_equals_to_name(pat: Option<ast::Pat>, name: &Name) -> bool {
 #[cfg(test)]
 mod tests {
+    use test_utils::mark;
    use crate::diagnostics::tests::check_diagnostics;
    #[test]
@@ -920,4 +932,18 @@ fn main() {
    "#,
        );
    }
+    #[test]
+    fn ignores_extern_items() {
+        mark::check!(extern_func_incorrect_case_ignored);
+        mark::check!(extern_static_incorrect_case_ignored);
+        check_diagnostics(
+            r#"
+extern {
+    fn NonSnakeCaseName(SOME_VAR: u8) -> u8;
+    pub static SomeStatic: u8 = 10;
+}
+            "#,
+        );
+    }
 }
diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
index 14e8c0633..e77481906 100644
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir_ty/src/display.rs
@@ -297,26 +297,7 @@ impl HirDisplay for ApplicationTy {
            }
            TypeCtor::FnPtr { is_varargs, .. } => {
                let sig = FnSig::from_fn_ptr_substs(&self.parameters, is_varargs);
-                write!(f, "fn(")?;
+                sig.hir_fmt(f)?;
-                f.write_joined(sig.params(), ", ")?;
-                if is_varargs {
-                    if sig.params().is_empty() {
-                        write!(f, "...")?;
-                    } else {
-                        write!(f, ", ...")?;
-                    }
-                }
-                write!(f, ")")?;
-                let ret = sig.ret();
-                if *ret != Ty::unit() {
-                    let ret_display = ret.into_displayable(
-                        f.db,
-                        f.max_size,
-                        f.omit_verbose_types,
-                        f.display_target,
-                    );
-                    write!(f, " -> {}", ret_display)?;
-                }
            }
            TypeCtor::FnDef(def) => {
                let sig = f.db.callable_item_signature(def).subst(&self.parameters);
@@ -584,6 +565,28 @@ impl HirDisplay for Ty {
    }
 }
+impl HirDisplay for FnSig {
+    fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
+        write!(f, "fn(")?;
+        f.write_joined(self.params(), ", ")?;
+        if self.is_varargs {
+            if self.params().is_empty() {
+                write!(f, "...")?;
+            } else {
+                write!(f, ", ...")?;
+            }
+        }
+        write!(f, ")")?;
+        let ret = self.ret();
+        if *ret != Ty::unit() {
+            let ret_display =
+                ret.into_displayable(f.db, f.max_size, f.omit_verbose_types, f.display_target);
+            write!(f, " -> {}", ret_display)?;
+        }
+        Ok(())
+    }
+}
 fn write_bounds_like_dyn_trait(
    predicates: &[GenericPredicate],
    f: &mut HirFormatter,
diff --git a/crates/hir_ty/src/test_db.rs b/crates/hir_ty/src/test_db.rs
index 22254b765..646e16bbe 100644
--- a/crates/hir_ty/src/test_db.rs
+++ b/crates/hir_ty/src/test_db.rs
@@ -5,7 +5,9 @@ use std::{
    sync::{Arc, Mutex},
 };
-use base_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast};
+use base_db::{
+    salsa, AnchoredPath, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast,
+};
 use hir_def::{db::DefDatabase, ModuleId};
 use hir_expand::db::AstDatabase;
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -67,8 +69,8 @@ impl FileLoader for TestDB {
    fn file_text(&self, file_id: FileId) -> Arc<String> {
        FileLoaderDelegate(self).file_text(file_id)
    }
-    fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
+    fn resolve_path(&self, path: AnchoredPath) -> Option<FileId> {
-        FileLoaderDelegate(self).resolve_path(anchor, path)
+        FileLoaderDelegate(self).resolve_path(path)
    }
    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
        FileLoaderDelegate(self).relevant_crates(file_id)
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 9157704dc..049f808dc 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -613,10 +613,12 @@ fn test_fn() {
                                    source_file_edits: [],
                                    file_system_edits: [
                                        CreateFile {
-                                            anchor: FileId(
+                                            dst: AnchoredPathBuf {
-                                                0,
+                                                anchor: FileId(
-                                            ),
+                                                    0,
-                                            dst: "foo.rs",
+                                                ),
+                                                path: "foo.rs",
+                                            },
                                        },
                                    ],
                                    is_snippet: false,
diff --git a/crates/ide/src/diagnostics/fixes.rs b/crates/ide/src/diagnostics/fixes.rs
index ba046232a..13240672f 100644
--- a/crates/ide/src/diagnostics/fixes.rs
+++ b/crates/ide/src/diagnostics/fixes.rs
@@ -6,9 +6,9 @@ use hir::{
        Diagnostic, IncorrectCase, MissingFields, MissingOkInTailExpr, NoSuchField,
        RemoveThisSemicolon, UnresolvedModule,
    },
-    HasSource, HirDisplay, Semantics, VariantDef,
+    HasSource, HirDisplay, InFile, Semantics, VariantDef,
 };
-use ide_db::base_db::FileId;
+use ide_db::base_db::{AnchoredPathBuf, FileId};
 use ide_db::{
    source_change::{FileSystemEdit, SourceFileEdit},
    RootDatabase,
@@ -36,8 +36,10 @@ impl DiagnosticWithFix for UnresolvedModule {
        Some(Fix::new(
            "Create module",
            FileSystemEdit::CreateFile {
-                anchor: self.file.original_file(sema.db),
+                dst: AnchoredPathBuf {
-                dst: self.candidate.clone(),
+                    anchor: self.file.original_file(sema.db),
+                    path: self.candidate.clone(),
+                },
            }
            .into(),
            unresolved_module.syntax().text_range(),
@@ -68,7 +70,8 @@ impl DiagnosticWithFix for MissingFields {
        }
        let root = sema.db.parse_or_expand(self.file)?;
-        let old_field_list = self.field_list_parent.to_node(&root).record_expr_field_list()?;
+        let field_list_parent = self.field_list_parent.to_node(&root);
+        let old_field_list = field_list_parent.record_expr_field_list()?;
        let mut new_field_list = old_field_list.clone();
        for f in self.missed_fields.iter() {
            let field =
@@ -85,7 +88,7 @@ impl DiagnosticWithFix for MissingFields {
        Some(Fix::new(
            "Fill struct fields",
            SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into(),
-            sema.original_range(&old_field_list.syntax()).range,
+            sema.original_range(&field_list_parent.syntax()).range,
        ))
    }
 }
@@ -128,9 +131,9 @@ impl DiagnosticWithFix for IncorrectCase {
        let root = sema.db.parse_or_expand(self.file)?;
        let name_node = self.ident.to_node(&root);
-        let file_id = self.file.original_file(sema.db);
+        let name_node = InFile::new(self.file, name_node.syntax());
-        let offset = name_node.syntax().text_range().start();
+        let frange = name_node.original_file_range(sema.db);
-        let file_position = FilePosition { file_id, offset };
+        let file_position = FilePosition { file_id: frange.file_id, offset: frange.range.start() };
        let rename_changes =
            rename_with_semantics(sema, file_position, &self.suggested_text).ok()?;
diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs
index 0c429a262..4790d648a 100644
--- a/crates/ide/src/display/navigation_target.rs
+++ b/crates/ide/src/display/navigation_target.rs
@@ -1,7 +1,7 @@
 //! FIXME: write short doc here
 use either::Either;
-use hir::{original_range, AssocItem, FieldSource, HasSource, InFile, ModuleSource};
+use hir::{AssocItem, FieldSource, HasSource, InFile, ModuleSource};
 use ide_db::base_db::{FileId, SourceDatabase};
 use ide_db::{defs::Definition, RootDatabase};
 use syntax::{
@@ -62,7 +62,8 @@ impl NavigationTarget {
    pub(crate) fn from_module_to_decl(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
        let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
        if let Some(src) = module.declaration_source(db) {
-            let frange = original_range(db, src.as_ref().map(|it| it.syntax()));
+            let node = src.as_ref().map(|it| it.syntax());
+            let frange = node.original_file_range(db);
            let mut res = NavigationTarget::from_syntax(
                frange.file_id,
                name,
@@ -104,8 +105,8 @@ impl NavigationTarget {
        let name =
            node.value.name().map(|it| it.text().clone()).unwrap_or_else(|| SmolStr::new("_"));
        let focus_range =
-            node.value.name().map(|it| original_range(db, node.with_value(it.syntax())).range);
+            node.value.name().map(|it| node.with_value(it.syntax()).original_file_range(db).range);
-        let frange = original_range(db, node.map(|it| it.syntax()));
+        let frange = node.map(|it| it.syntax()).original_file_range(db);
        NavigationTarget::from_syntax(
            frange.file_id,
@@ -124,7 +125,7 @@ impl NavigationTarget {
    ) -> NavigationTarget {
        let name =
            named.value.name().map(|it| it.text().clone()).unwrap_or_else(|| SmolStr::new("_"));
-        let frange = original_range(db, node.map(|it| it.syntax()));
+        let frange = node.map(|it| it.syntax()).original_file_range(db);
        NavigationTarget::from_syntax(
            frange.file_id,
@@ -236,7 +237,7 @@ impl ToNav for hir::Module {
                (node.syntax(), node.name().map(|it| it.syntax().text_range()))
            }
        };
-        let frange = original_range(db, src.with_value(syntax));
+        let frange = src.with_value(syntax).original_file_range(db);
        NavigationTarget::from_syntax(frange.file_id, name, focus, frange.range, syntax.kind())
    }
 }
@@ -246,14 +247,14 @@ impl ToNav for hir::ImplDef {
        let src = self.source(db);
        let derive_attr = self.is_builtin_derive(db);
        let frange = if let Some(item) = &derive_attr {
-            original_range(db, item.syntax())
+            item.syntax().original_file_range(db)
        } else {
-            original_range(db, src.as_ref().map(|it| it.syntax()))
+            src.as_ref().map(|it| it.syntax()).original_file_range(db)
        };
        let focus_range = if derive_attr.is_some() {
            None
        } else {
-            src.value.self_ty().map(|ty| original_range(db, src.with_value(ty.syntax())).range)
+            src.value.self_ty().map(|ty| src.with_value(ty.syntax()).original_file_range(db).range)
        };
        NavigationTarget::from_syntax(
@@ -278,7 +279,7 @@ impl ToNav for hir::Field {
                res
            }
            FieldSource::Pos(it) => {
-                let frange = original_range(db, src.with_value(it.syntax()));
+                let frange = src.with_value(it.syntax()).original_file_range(db);
                NavigationTarget::from_syntax(
                    frange.file_id,
                    "".into(),
@@ -331,7 +332,7 @@ impl ToNav for hir::Local {
            }
            Either::Right(it) => it.syntax().clone(),
        };
-        let full_range = original_range(db, src.with_value(&node));
+        let full_range = src.with_value(&node).original_file_range(db);
        let name = match self.name(db) {
            Some(it) => it.to_string().into(),
            None => "".into(),
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 1b6ff6d21..cf04c3de0 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -3357,4 +3357,66 @@ impl Foo {
            "#]],
        );
    }
+    #[test]
+    fn hover_doc_outer_inner() {
+        check(
+            r#"
+/// Be quick;
+mod Foo<|> {
+    //! time is mana
+    /// This comment belongs to the function
+    fn foo() {}
+}
+"#,
+            expect![[r#"
+                *Foo*
+                ```rust
+                test
+                ```
+                ```rust
+                mod Foo
+                ```
+                ---
+                Be quick;
+                time is mana
+            "#]],
+        );
+    }
+    #[test]
+    fn hover_doc_outer_inner_attribue() {
+        check(
+            r#"
+#[doc = "Be quick;"]
+mod Foo<|> {
+    #![doc = "time is mana"]
+    #[doc = "This comment belongs to the function"]
+    fn foo() {}
+}
+"#,
+            expect![[r#"
+                *Foo*
+                ```rust
+                test
+                ```
+                ```rust
+                mod Foo
+                ```
+                ---
+                Be quick;
+                time is mana
+            "#]],
+        );
+    }
 }
diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs
index 64fe8bd65..44081f210 100644
--- a/crates/ide/src/references/rename.rs
+++ b/crates/ide/src/references/rename.rs
@@ -6,7 +6,7 @@ use std::{
 };
 use hir::{Module, ModuleDef, ModuleSource, Semantics};
-use ide_db::base_db::{FileRange, SourceDatabaseExt};
+use ide_db::base_db::{AnchoredPathBuf, FileRange, SourceDatabaseExt};
 use ide_db::{
    defs::{Definition, NameClass, NameRefClass},
    RootDatabase,
@@ -182,12 +182,13 @@ fn rename_mod(
    match src.value {
        ModuleSource::SourceFile(..) => {
            // mod is defined in path/to/dir/mod.rs
-            let dst = if module.is_mod_rs(sema.db) {
+            let path = if module.is_mod_rs(sema.db) {
                format!("../{}/mod.rs", new_name)
            } else {
                format!("{}.rs", new_name)
            };
-            let move_file = FileSystemEdit::MoveFile { src: file_id, anchor: file_id, dst };
+            let dst = AnchoredPathBuf { anchor: file_id, path };
+            let move_file = FileSystemEdit::MoveFile { src: file_id, dst };
            file_system_edits.push(move_file);
        }
        ModuleSource::Module(..) => {}
@@ -771,10 +772,12 @@ mod foo<|>;
                                src: FileId(
                                    2,
                                ),
-                                anchor: FileId(
+                                dst: AnchoredPathBuf {
-                                    2,
+                                    anchor: FileId(
-                                ),
+                                        2,
-                                dst: "foo2.rs",
+                                    ),
+                                    path: "foo2.rs",
+                                },
                            },
                        ],
                        is_snippet: false,
@@ -837,10 +840,12 @@ use crate::foo<|>::FooContent;
                                src: FileId(
                                    1,
                                ),
-                                anchor: FileId(
+                                dst: AnchoredPathBuf {
-                                    1,
+                                    anchor: FileId(
-                                ),
+                                        1,
-                                dst: "quux.rs",
+                                    ),
+                                    path: "quux.rs",
+                                },
                            },
                        ],
                        is_snippet: false,
@@ -884,10 +889,12 @@ mod fo<|>o;
                                src: FileId(
                                    1,
                                ),
-                                anchor: FileId(
+                                dst: AnchoredPathBuf {
-                                    1,
+                                    anchor: FileId(
-                                ),
+                                        1,
-                                dst: "../foo2/mod.rs",
+                                    ),
+                                    path: "../foo2/mod.rs",
+                                },
                            },
                        ],
                        is_snippet: false,
@@ -932,10 +939,12 @@ mod outer { mod fo<|>o; }
                                src: FileId(
                                    1,
                                ),
-                                anchor: FileId(
+                                dst: AnchoredPathBuf {
-                                    1,
+                                    anchor: FileId(
-                                ),
+                                        1,
-                                dst: "bar.rs",
+                                    ),
+                                    path: "bar.rs",
+                                },
                            },
                        ],
                        is_snippet: false,
@@ -1016,10 +1025,12 @@ pub mod foo<|>;
                                src: FileId(
                                    2,
                                ),
-                                anchor: FileId(
+                                dst: AnchoredPathBuf {
-                                    2,
+                                    anchor: FileId(
-                                ),
+                                        2,
-                                dst: "foo2.rs",
+                                    ),
+                                    path: "foo2.rs",
+                                },
                            },
                        ],
                        is_snippet: false,
diff --git a/crates/ide_db/src/helpers/insert_use.rs b/crates/ide_db/src/helpers/insert_use.rs
index 040843990..9be36d59b 100644
--- a/crates/ide_db/src/helpers/insert_use.rs
+++ b/crates/ide_db/src/helpers/insert_use.rs
@@ -93,7 +93,7 @@ fn is_inner_comment(token: SyntaxToken) -> bool {
 pub fn insert_use<'a>(
    scope: &ImportScope,
    path: ast::Path,
-    merge: Option<MergeBehaviour>,
+    merge: Option<MergeBehavior>,
 ) -> SyntaxRewriter<'a> {
    let _p = profile::span("insert_use");
    let mut rewriter = SyntaxRewriter::default();
@@ -183,7 +183,7 @@ fn eq_visibility(vis0: Option<ast::Visibility>, vis1: Option<ast::Visibility>) -
 pub fn try_merge_imports(
    lhs: &ast::Use,
    rhs: &ast::Use,
-    merge_behaviour: MergeBehaviour,
+    merge_behavior: MergeBehavior,
 ) -> Option<ast::Use> {
    // don't merge imports with different visibilities
    if !eq_visibility(lhs.visibility(), rhs.visibility()) {
@@ -191,14 +191,14 @@ pub fn try_merge_imports(
    }
    let lhs_tree = lhs.use_tree()?;
    let rhs_tree = rhs.use_tree()?;
-    let merged = try_merge_trees(&lhs_tree, &rhs_tree, merge_behaviour)?;
+    let merged = try_merge_trees(&lhs_tree, &rhs_tree, merge_behavior)?;
    Some(lhs.with_use_tree(merged))
 }
 pub fn try_merge_trees(
    lhs: &ast::UseTree,
    rhs: &ast::UseTree,
-    merge: MergeBehaviour,
+    merge: MergeBehavior,
 ) -> Option<ast::UseTree> {
    let lhs_path = lhs.path()?;
    let rhs_path = rhs.path()?;
@@ -220,7 +220,7 @@ pub fn try_merge_trees(
 fn recursive_merge(
    lhs: &ast::UseTree,
    rhs: &ast::UseTree,
-    merge: MergeBehaviour,
+    merge: MergeBehavior,
 ) -> Option<ast::UseTree> {
    let mut use_trees = lhs
        .use_tree_list()
@@ -301,7 +301,7 @@ fn recursive_merge(
                }
            }
            Err(_)
-                if merge == MergeBehaviour::Last
+                if merge == MergeBehavior::Last
                    && use_trees.len() > 0
                    && rhs_t.use_tree_list().is_some() =>
            {
@@ -438,20 +438,20 @@ fn path_segment_cmp(a: &ast::PathSegment, b: &ast::PathSegment) -> Ordering {
 /// What type of merges are allowed.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum MergeBehaviour {
+pub enum MergeBehavior {
    /// Merge everything together creating deeply nested imports.
    Full,
    /// Only merge the last import level, doesn't allow import nesting.
    Last,
 }
-impl MergeBehaviour {
+impl MergeBehavior {
    #[inline]
    fn is_tree_allowed(&self, tree: &ast::UseTree) -> bool {
        match self {
-            MergeBehaviour::Full => true,
+            MergeBehavior::Full => true,
            // only simple single segment paths are allowed
-            MergeBehaviour::Last => {
+            MergeBehavior::Last => {
                tree.use_tree_list().is_none() && tree.path().map(path_len) <= Some(1)
            }
        }
diff --git a/crates/ide_db/src/helpers/insert_use/tests.rs b/crates/ide_db/src/helpers/insert_use/tests.rs
index 86bfa5b41..9e194354e 100644
--- a/crates/ide_db/src/helpers/insert_use/tests.rs
+++ b/crates/ide_db/src/helpers/insert_use/tests.rs
@@ -533,7 +533,7 @@ fn merge_last_fail() {
    check_merge_only_fail(
        r"use foo::bar::{baz::{Qux, Fez}};",
        r"use foo::bar::{baaz::{Quux, Feez}};",
-        MergeBehaviour::Last,
+        MergeBehavior::Last,
    );
 }
@@ -542,7 +542,7 @@ fn merge_last_fail1() {
    check_merge_only_fail(
        r"use foo::bar::{baz::{Qux, Fez}};",
        r"use foo::bar::baaz::{Quux, Feez};",
-        MergeBehaviour::Last,
+        MergeBehavior::Last,
    );
 }
@@ -551,7 +551,7 @@ fn merge_last_fail2() {
    check_merge_only_fail(
        r"use foo::bar::baz::{Qux, Fez};",
        r"use foo::bar::{baaz::{Quux, Feez}};",
-        MergeBehaviour::Last,
+        MergeBehavior::Last,
    );
 }
@@ -560,7 +560,7 @@ fn merge_last_fail3() {
    check_merge_only_fail(
        r"use foo::bar::baz::{Qux, Fez};",
        r"use foo::bar::baaz::{Quux, Feez};",
-        MergeBehaviour::Last,
+        MergeBehavior::Last,
    );
 }
@@ -568,7 +568,7 @@ fn check(
    path: &str,
    ra_fixture_before: &str,
    ra_fixture_after: &str,
-    mb: Option<MergeBehaviour>,
+    mb: Option<MergeBehavior>,
    module: bool,
 ) {
    let mut syntax = ast::SourceFile::parse(ra_fixture_before).tree().syntax().clone();
@@ -589,18 +589,18 @@ fn check(
 }
 fn check_full(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
-    check(path, ra_fixture_before, ra_fixture_after, Some(MergeBehaviour::Full), false)
+    check(path, ra_fixture_before, ra_fixture_after, Some(MergeBehavior::Full), false)
 }
 fn check_last(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
-    check(path, ra_fixture_before, ra_fixture_after, Some(MergeBehaviour::Last), false)
+    check(path, ra_fixture_before, ra_fixture_after, Some(MergeBehavior::Last), false)
 }
 fn check_none(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
    check(path, ra_fixture_before, ra_fixture_after, None, false)
 }
-fn check_merge_only_fail(ra_fixture0: &str, ra_fixture1: &str, mb: MergeBehaviour) {
+fn check_merge_only_fail(ra_fixture0: &str, ra_fixture1: &str, mb: MergeBehavior) {
    let use0 = ast::SourceFile::parse(ra_fixture0)
        .tree()
        .syntax()
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index fceaa089a..118c090d7 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -19,8 +19,8 @@ use std::{fmt, sync::Arc};
 use base_db::{
    salsa::{self, Durability},
-    Canceled, CheckCanceled, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase,
+    AnchoredPath, Canceled, CheckCanceled, CrateId, FileId, FileLoader, FileLoaderDelegate,
-    Upcast,
+    SourceDatabase, Upcast,
 };
 use hir::db::{AstDatabase, DefDatabase, HirDatabase};
 use rustc_hash::FxHashSet;
@@ -72,8 +72,8 @@ impl FileLoader for RootDatabase {
    fn file_text(&self, file_id: FileId) -> Arc<String> {
        FileLoaderDelegate(self).file_text(file_id)
    }
-    fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
+    fn resolve_path(&self, path: AnchoredPath) -> Option<FileId> {
-        FileLoaderDelegate(self).resolve_path(anchor, path)
+        FileLoaderDelegate(self).resolve_path(path)
    }
    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
        FileLoaderDelegate(self).relevant_crates(file_id)
diff --git a/crates/ide_db/src/source_change.rs b/crates/ide_db/src/source_change.rs
index f1590ec66..e87d98dad 100644
--- a/crates/ide_db/src/source_change.rs
+++ b/crates/ide_db/src/source_change.rs
@@ -3,7 +3,7 @@
 //!
 //! It can be viewed as a dual for `AnalysisChange`.
-use base_db::FileId;
+use base_db::{AnchoredPathBuf, FileId};
 use text_edit::TextEdit;
 #[derive(Default, Debug, Clone)]
@@ -44,8 +44,8 @@ impl From<Vec<SourceFileEdit>> for SourceChange {
 #[derive(Debug, Clone)]
 pub enum FileSystemEdit {
-    CreateFile { anchor: FileId, dst: String },
+    CreateFile { dst: AnchoredPathBuf },
-    MoveFile { src: FileId, anchor: FileId, dst: String },
+    MoveFile { src: FileId, dst: AnchoredPathBuf },
 }
 impl From<FileSystemEdit> for SourceChange {
diff --git a/crates/proc_macro_srv/src/lib.rs b/crates/proc_macro_srv/src/lib.rs
index 6e890f8e2..9cca96994 100644
--- a/crates/proc_macro_srv/src/lib.rs
+++ b/crates/proc_macro_srv/src/lib.rs
@@ -40,7 +40,8 @@ impl ProcMacroSrv {
        match expander.expand(&task.macro_name, &task.macro_body, task.attributes.as_ref()) {
            Ok(expansion) => Ok(ExpansionResult { expansion }),
            Err(msg) => {
-                Err(format!("Cannot perform expansion for {}: error {:?}", &task.macro_name, msg))
+                let msg = msg.as_str().unwrap_or("<unknown error>");
+                Err(format!("proc-macro panicked: {}", msg))
            }
        }
    }
diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs
index c5fe3591e..503f4c101 100644
--- a/crates/proc_macro_srv/src/rustc_server.rs
+++ b/crates/proc_macro_srv/src/rustc_server.rs
@@ -184,8 +184,7 @@ pub mod token_stream {
            let (subtree, _token_map) =
                mbe::parse_to_token_tree(src).ok_or("Failed to parse from mbe")?;
-            let tt: tt::TokenTree = subtree.into();
+            Ok(TokenStream { subtree })
-            Ok(tt.into())
        }
    }
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 0a055b039..039976e4b 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -27,7 +27,7 @@ pico-args = "0.3.1"
 oorandom = "11.1.2"
 rustc-hash = "1.1.0"
 serde = { version = "1.0.106", features = ["derive"] }
-serde_json = "1.0.48"
+serde_json = { version = "1.0.48", features = ["preserve_order"] }
 threadpool = "1.7.1"
 rayon = "1.5"
 mimalloc = { version = "0.1.19", default-features = false, optional = true }
diff --git a/crates/rust-analyzer/src/bin/args.rs b/crates/rust-analyzer/src/bin/args.rs
index 8ddf1e031..0a471154e 100644
--- a/crates/rust-analyzer/src/bin/args.rs
+++ b/crates/rust-analyzer/src/bin/args.rs
@@ -28,6 +28,7 @@ pub(crate) enum Command {
    StructuredSearch { debug_snippet: Option<String>, patterns: Vec<SsrPattern> },
    ProcMacro,
    RunServer,
+    PrintConfigSchema,
    Version,
    Help,
 }
@@ -135,6 +136,10 @@ impl Args {
            return Ok(Args { verbosity, log_file: None, command: Command::Help });
        }
+        if matches.contains("--print-config-schema") {
+            return Ok(Args { verbosity, log_file, command: Command::PrintConfigSchema });
+        }
        let subcommand = match matches.subcommand()? {
            Some(it) => it,
            None => {
diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
index 21fba8302..defdcbd74 100644
--- a/crates/rust-analyzer/src/bin/main.rs
+++ b/crates/rust-analyzer/src/bin/main.rs
@@ -31,6 +31,9 @@ fn try_main() -> Result<()> {
    setup_logging(args.log_file)?;
    match args.command {
        args::Command::RunServer => run_server()?,
+        args::Command::PrintConfigSchema => {
+            println!("{:#}", Config::json_schema());
+        }
        args::Command::ProcMacro => proc_macro_srv::cli::run()?,
        args::Command::Parse { no_dump } => cli::parse(no_dump)?,
diff --git a/crates/rust-analyzer/src/cli/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs
index 98ef0cd68..58d284d47 100644
--- a/crates/rust-analyzer/src/cli/analysis_stats.rs
+++ b/crates/rust-analyzer/src/cli/analysis_stats.rs
@@ -8,7 +8,7 @@ use std::{
 use hir::{
    db::{AstDatabase, DefDatabase, HirDatabase},
-    original_range, AssocItem, Crate, HasSource, HirDisplay, ModuleDef,
+    AssocItem, Crate, HasSource, HirDisplay, ModuleDef,
 };
 use hir_def::FunctionId;
 use hir_ty::{Ty, TypeWalk};
@@ -232,7 +232,7 @@ impl AnalysisStatsCmd {
                            // But also, we should just turn the type mismatches into diagnostics and provide these
                            let root = db.parse_or_expand(src.file_id).unwrap();
                            let node = src.map(|e| e.to_node(&root).syntax().clone());
-                            let original_range = original_range(db, node.as_ref());
+                            let original_range = node.as_ref().original_file_range(db);
                            let path = vfs.file_path(original_range.file_id);
                            let line_index =
                                host.analysis().file_line_index(original_range.file_id).unwrap();
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs
index d51f4a93a..e5ab6c73b 100644
--- a/crates/rust-analyzer/src/cli/load_cargo.rs
+++ b/crates/rust-analyzer/src/cli/load_cargo.rs
@@ -73,7 +73,7 @@ fn load(
            }
            vfs::loader::Message::Loaded { files } => {
                for (path, contents) in files {
-                    vfs.set_file_contents(path.into(), contents)
+                    vfs.set_file_contents(path.into(), contents);
                }
            }
        }
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 5243b50c8..1f4b5c24c 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -12,15 +12,167 @@ use std::{convert::TryFrom, ffi::OsString, path::PathBuf};
 use flycheck::FlycheckConfig;
 use hir::PrefixKind;
 use ide::{AssistConfig, CompletionConfig, DiagnosticsConfig, HoverConfig, InlayHintsConfig};
-use ide_db::helpers::insert_use::MergeBehaviour;
+use ide_db::helpers::insert_use::MergeBehavior;
+use itertools::Itertools;
 use lsp_types::{ClientCapabilities, MarkupKind};
 use project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
 use rustc_hash::FxHashSet;
-use serde::Deserialize;
+use serde::{de::DeserializeOwned, Deserialize};
 use vfs::AbsPathBuf;
 use crate::{caps::enabled_completions_resolve_capabilities, diagnostics::DiagnosticsMapConfig};
+config_data! {
+    struct ConfigData {
+        /// The strategy to use when inserting new imports or merging imports.
+        assist_importMergeBehaviour: MergeBehaviorDef = "\"full\"",
+        /// The path structure for newly inserted paths to use.
+        assist_importPrefix: ImportPrefixDef           = "\"plain\"",
+        /// Show function name and docs in parameter hints.
+        callInfo_full: bool = "true",
+        /// Automatically refresh project info via `cargo metadata` on
+        /// Cargo.toml changes.
+        cargo_autoreload: bool           = "true",
+        /// Activate all available features.
+        cargo_allFeatures: bool          = "false",
+        /// List of features to activate.
+        cargo_features: Vec<String>      = "[]",
+        /// Run `cargo check` on startup to get the correct value for package
+        /// OUT_DIRs.
+        cargo_loadOutDirsFromCheck: bool = "false",
+        /// Do not activate the `default` feature.
+        cargo_noDefaultFeatures: bool    = "false",
+        /// Compilation target (target triple).
+        cargo_target: Option<String>     = "null",
+        /// Internal config for debugging, disables loading of sysroot crates.
+        cargo_noSysroot: bool            = "false",
+        /// Run specified `cargo check` command for diagnostics on save.
+        checkOnSave_enable: bool                         = "true",
+        /// Check with all features (will be passed as `--all-features`).
+        /// Defaults to `rust-analyzer.cargo.allFeatures`.
+        checkOnSave_allFeatures: Option<bool>            = "null",
+        /// Check all targets and tests (will be passed as `--all-targets`).
+        checkOnSave_allTargets: bool                     = "true",
+        /// Cargo command to use for `cargo check`.
+        checkOnSave_command: String                      = "\"check\"",
+        /// Do not activate the `default` feature.
+        checkOnSave_noDefaultFeatures: Option<bool>      = "null",
+        /// Check for a specific target. Defaults to
+        /// `rust-analyzer.cargo.target`.
+        checkOnSave_target: Option<String>               = "null",
+        /// Extra arguments for `cargo check`.
+        checkOnSave_extraArgs: Vec<String>               = "[]",
+        /// List of features to activate. Defaults to
+        /// `rust-analyzer.cargo.features`.
+        checkOnSave_features: Option<Vec<String>>        = "null",
+        /// Advanced option, fully override the command rust-analyzer uses for
+        /// checking. The command should include `--message-format=json` or
+        /// similar option.
+        checkOnSave_overrideCommand: Option<Vec<String>> = "null",
+        /// Whether to add argument snippets when completing functions.
+        completion_addCallArgumentSnippets: bool = "true",
+        /// Whether to add parenthesis when completing functions.
+        completion_addCallParenthesis: bool      = "true",
+        /// Whether to show postfix snippets like `dbg`, `if`, `not`, etc.
+        completion_postfix_enable: bool          = "true",
+        /// Toggles the additional completions that automatically add imports when completed.
+        /// Note that your client have to specify the `additionalTextEdits` LSP client capability to truly have this feature enabled.
+        completion_autoimport_enable: bool       = "true",
+        /// Whether to show native rust-analyzer diagnostics.
+        diagnostics_enable: bool                = "true",
+        /// Whether to show experimental rust-analyzer diagnostics that might
+        /// have more false positives than usual.
+        diagnostics_enableExperimental: bool    = "true",
+        /// List of rust-analyzer diagnostics to disable.
+        diagnostics_disabled: FxHashSet<String> = "[]",
+        /// List of warnings that should be displayed with info severity.\nThe
+        /// warnings will be indicated by a blue squiggly underline in code and
+        /// a blue icon in the problems panel.
+        diagnostics_warningsAsHint: Vec<String> = "[]",
+        /// List of warnings that should be displayed with hint severity.\nThe
+        /// warnings will be indicated by faded text or three dots in code and
+        /// will not show up in the problems panel.
+        diagnostics_warningsAsInfo: Vec<String> = "[]",
+        /// Controls file watching implementation.
+        files_watcher: String = "\"client\"",
+        /// Whether to show `Debug` action. Only applies when
+        /// `#rust-analyzer.hoverActions.enable#` is set.
+        hoverActions_debug: bool           = "true",
+        /// Whether to show HoverActions in Rust files.
+        hoverActions_enable: bool          = "true",
+        /// Whether to show `Go to Type Definition` action. Only applies when
+        /// `#rust-analyzer.hoverActions.enable#` is set.
+        hoverActions_gotoTypeDef: bool     = "true",
+        /// Whether to show `Implementations` action. Only applies when
+        /// `#rust-analyzer.hoverActions.enable#` is set.
+        hoverActions_implementations: bool = "true",
+        /// Whether to show `Run` action. Only applies when
+        /// `#rust-analyzer.hoverActions.enable#` is set.
+        hoverActions_run: bool             = "true",
+        /// Use markdown syntax for links in hover.
+        hoverActions_linksInHover: bool    = "true",
+        /// Whether to show inlay type hints for method chains.
+        inlayHints_chainingHints: bool      = "true",
+        /// Maximum length for inlay hints.
+        inlayHints_maxLength: Option<usize> = "null",
+        /// Whether to show function parameter name inlay hints at the call
+        /// site.
+        inlayHints_parameterHints: bool     = "true",
+        /// Whether to show inlay type hints for variables.
+        inlayHints_typeHints: bool          = "true",
+        /// Whether to show `Debug` lens. Only applies when
+        /// `#rust-analyzer.lens.enable#` is set.
+        lens_debug: bool            = "true",
+        /// Whether to show CodeLens in Rust files.
+        lens_enable: bool           = "true",
+        /// Whether to show `Implementations` lens. Only applies when
+        /// `#rust-analyzer.lens.enable#` is set.
+        lens_implementations: bool  = "true",
+        /// Whether to show `Run` lens. Only applies when
+        /// `#rust-analyzer.lens.enable#` is set.
+        lens_run: bool              = "true",
+        /// Whether to show `Method References` lens. Only applies when
+        /// `#rust-analyzer.lens.enable#` is set.
+        lens_methodReferences: bool = "false",
+        /// Disable project auto-discovery in favor of explicitly specified set
+        /// of projects.  \nElements must be paths pointing to Cargo.toml,
+        /// rust-project.json, or JSON objects in rust-project.json format.
+        linkedProjects: Vec<ManifestOrProjectJson> = "[]",
+        /// Number of syntax trees rust-analyzer keeps in memory.
+        lruCapacity: Option<usize>                 = "null",
+        /// Whether to show `can't find Cargo.toml` error message.
+        notifications_cargoTomlNotFound: bool      = "true",
+        /// Enable Proc macro support, cargo.loadOutDirsFromCheck must be
+        /// enabled.
+        procMacro_enable: bool                     = "false",
+        /// Command to be executed instead of 'cargo' for runnables.
+        runnables_overrideCargo: Option<String> = "null",
+        /// Additional arguments to be passed to cargo for runnables such as
+        /// tests or binaries.\nFor example, it may be '--release'.
+        runnables_cargoExtraArgs: Vec<String>   = "[]",
+        /// Path to the rust compiler sources, for usage in rustc_private projects.
+        rustcSource : Option<String> = "null",
+        /// Additional arguments to rustfmt.
+        rustfmt_extraArgs: Vec<String>               = "[]",
+        /// Advanced option, fully override the command rust-analyzer uses for
+        /// formatting.
+        rustfmt_overrideCommand: Option<Vec<String>> = "null",
+    }
+}
 #[derive(Debug, Clone)]
 pub struct Config {
    pub client_caps: ClientCapsConfig,
@@ -46,6 +198,7 @@ pub struct Config {
    pub lens: LensConfig,
    pub hover: HoverConfig,
    pub semantic_tokens_refresh: bool,
+    pub code_lens_refresh: bool,
    pub linked_projects: Vec<LinkedProject>,
    pub root_path: AbsPathBuf,
@@ -149,25 +302,27 @@ pub struct ClientCapsConfig {
 impl Config {
    pub fn new(root_path: AbsPathBuf) -> Self {
-        Config {
+        // Defaults here don't matter, we'll immediately re-write them with
+        // ConfigData.
+        let mut res = Config {
            client_caps: ClientCapsConfig::default(),
-            publish_diagnostics: true,
+            publish_diagnostics: false,
            diagnostics: DiagnosticsConfig::default(),
            diagnostics_map: DiagnosticsMapConfig::default(),
            lru_capacity: None,
            proc_macro_srv: None,
            files: FilesConfig { watcher: FilesWatcher::Notify, exclude: Vec::new() },
-            notifications: NotificationsConfig { cargo_toml_not_found: true },
+            notifications: NotificationsConfig { cargo_toml_not_found: false },
-            cargo_autoreload: true,
+            cargo_autoreload: false,
            cargo: CargoConfig::default(),
            rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() },
            flycheck: Some(FlycheckConfig::CargoCommand {
-                command: "check".to_string(),
+                command: String::new(),
                target_triple: None,
                no_default_features: false,
-                all_targets: true,
+                all_targets: false,
                all_features: false,
                extra_args: Vec::new(),
                features: Vec::new(),
@@ -175,35 +330,33 @@ impl Config {
            runnables: RunnablesConfig::default(),
            inlay_hints: InlayHintsConfig {
-                type_hints: true,
+                type_hints: false,
-                parameter_hints: true,
+                parameter_hints: false,
-                chaining_hints: true,
+                chaining_hints: false,
                max_length: None,
            },
-            completion: CompletionConfig {
+            completion: CompletionConfig::default(),
-                enable_postfix_completions: true,
-                enable_autoimport_completions: true,
-                add_call_parenthesis: true,
-                add_call_argument_snippets: true,
-                ..CompletionConfig::default()
-            },
            assist: AssistConfig::default(),
-            call_info_full: true,
+            call_info_full: false,
            lens: LensConfig::default(),
            hover: HoverConfig::default(),
            semantic_tokens_refresh: false,
+            code_lens_refresh: false,
            linked_projects: Vec::new(),
            root_path,
-        }
+        };
+        res.do_update(serde_json::json!({}));
+        res
    }
    pub fn update(&mut self, json: serde_json::Value) {
        log::info!("Config::update({:#})", json);
        if json.is_null() || json.as_object().map_or(false, |it| it.is_empty()) {
            return;
        }
+        self.do_update(json);
+        log::info!("Config::update() = {:#?}", self);
+    }
+    fn do_update(&mut self, json: serde_json::Value) {
        let data = ConfigData::from_json(json);
        self.publish_diagnostics = data.diagnostics_enable;
@@ -294,9 +447,9 @@ impl Config {
        };
        self.assist.insert_use.merge = match data.assist_importMergeBehaviour {
-            MergeBehaviourDef::None => None,
+            MergeBehaviorDef::None => None,
-            MergeBehaviourDef::Full => Some(MergeBehaviour::Full),
+            MergeBehaviorDef::Full => Some(MergeBehavior::Full),
-            MergeBehaviourDef::Last => Some(MergeBehaviour::Last),
+            MergeBehaviorDef::Last => Some(MergeBehavior::Last),
        };
        self.assist.insert_use.prefix_kind = match data.assist_importPrefix {
            ImportPrefixDef::Plain => PrefixKind::Plain,
@@ -349,8 +502,6 @@ impl Config {
            links_in_hover: data.hoverActions_linksInHover,
            markdown: true,
        };
-        log::info!("Config::update() = {:#?}", self);
    }
    pub fn update_caps(&mut self, caps: &ClientCapabilities) {
@@ -432,8 +583,18 @@ impl Config {
            {
                self.semantic_tokens_refresh = refresh_support;
            }
+            if let Some(refresh_support) =
+                workspace_caps.code_lens.as_ref().and_then(|it| it.refresh_support)
+            {
+                self.code_lens_refresh = refresh_support;
+            }
        }
    }
+    pub fn json_schema() -> serde_json::Value {
+        ConfigData::json_schema()
+    }
 }
 #[derive(Deserialize)]
@@ -445,7 +606,7 @@ enum ManifestOrProjectJson {
 #[derive(Deserialize)]
 #[serde(rename_all = "snake_case")]
-enum MergeBehaviourDef {
+enum MergeBehaviorDef {
    None,
    Full,
    Last,
@@ -459,94 +620,206 @@ enum ImportPrefixDef {
    ByCrate,
 }
-macro_rules! config_data {
+macro_rules! _config_data {
-    (struct $name:ident { $($field:ident: $ty:ty = $default:expr,)*}) => {
+    (struct $name:ident {
+        $(
+            $(#[doc=$doc:literal])*
+            $field:ident: $ty:ty = $default:expr,
+        )*
+    }) => {
        #[allow(non_snake_case)]
        struct $name { $($field: $ty,)* }
        impl $name {
            fn from_json(mut json: serde_json::Value) -> $name {
                $name {$(
-                    $field: {
+                    $field: get_field(&mut json, stringify!($field), $default),
-                        let pointer = stringify!($field).replace('_', "/");
-                        let pointer = format!("/{}", pointer);
-                        json.pointer_mut(&pointer)
-                            .and_then(|it| serde_json::from_value(it.take()).ok())
-                            .unwrap_or($default)
-                    },
                )*}
            }
-        }
+            fn json_schema() -> serde_json::Value {
+                schema(&[
+                    $({
+                        let field = stringify!($field);
+                        let ty = stringify!($ty);
+                        (field, ty, &[$($doc),*], $default)
+                    },)*
+                ])
+            }
+            #[cfg(test)]
+            fn manual() -> String {
+                manual(&[
+                    $({
+                        let field = stringify!($field);
+                        let ty = stringify!($ty);
+                        (field, ty, &[$($doc),*], $default)
+                    },)*
+                ])
+            }
+        }
    };
 }
+use _config_data as config_data;
+fn get_field<T: DeserializeOwned>(
+    json: &mut serde_json::Value,
+    field: &'static str,
+    default: &str,
+) -> T {
+    let default = serde_json::from_str(default).unwrap();
+    let mut pointer = field.replace('_', "/");
+    pointer.insert(0, '/');
+    json.pointer_mut(&pointer)
+        .and_then(|it| serde_json::from_value(it.take()).ok())
+        .unwrap_or(default)
+}
-config_data! {
+fn schema(fields: &[(&'static str, &'static str, &[&str], &str)]) -> serde_json::Value {
-    struct ConfigData {
+    for ((f1, ..), (f2, ..)) in fields.iter().zip(&fields[1..]) {
-        assist_importMergeBehaviour: MergeBehaviourDef = MergeBehaviourDef::Full,
+        fn key(f: &str) -> &str {
-        assist_importPrefix: ImportPrefixDef           = ImportPrefixDef::Plain,
+            f.splitn(2, "_").next().unwrap()
+        };
-        callInfo_full: bool = true,
+        assert!(key(f1) <= key(f2), "wrong field order: {:?} {:?}", f1, f2);
+    }
-        cargo_autoreload: bool           = true,
-        cargo_allFeatures: bool          = false,
+    let map = fields
-        cargo_features: Vec<String>      = Vec::new(),
+        .iter()
-        cargo_loadOutDirsFromCheck: bool = false,
+        .map(|(field, ty, doc, default)| {
-        cargo_noDefaultFeatures: bool    = false,
+            let name = field.replace("_", ".");
-        cargo_target: Option<String>     = None,
+            let name = format!("rust-analyzer.{}", name);
-        cargo_noSysroot: bool            = false,
+            let props = field_props(field, ty, doc, default);
+            (name, props)
-        checkOnSave_enable: bool                         = true,
+        })
-        checkOnSave_allFeatures: Option<bool>            = None,
+        .collect::<serde_json::Map<_, _>>();
-        checkOnSave_allTargets: bool                     = true,
+    map.into()
-        checkOnSave_command: String                      = "check".into(),
+}
-        checkOnSave_noDefaultFeatures: Option<bool>      = None,
-        checkOnSave_target: Option<String>               = None,
+fn field_props(field: &str, ty: &str, doc: &[&str], default: &str) -> serde_json::Value {
-        checkOnSave_extraArgs: Vec<String>               = Vec::new(),
+    let doc = doc.iter().map(|it| it.trim()).join(" ");
-        checkOnSave_features: Option<Vec<String>>        = None,
+    assert!(
-        checkOnSave_overrideCommand: Option<Vec<String>> = None,
+        doc.ends_with('.') && doc.starts_with(char::is_uppercase),
+        "bad docs for {}: {:?}",
-        completion_addCallArgumentSnippets: bool = true,
+        field,
-        completion_addCallParenthesis: bool      = true,
+        doc
-        completion_postfix_enable: bool          = true,
+    );
-        completion_autoimport_enable: bool       = true,
+    let default = default.parse::<serde_json::Value>().unwrap();
-        diagnostics_enable: bool                = true,
+    let mut map = serde_json::Map::default();
-        diagnostics_enableExperimental: bool    = true,
+    macro_rules! set {
-        diagnostics_disabled: FxHashSet<String> = FxHashSet::default(),
+        ($($key:literal: $value:tt),*$(,)?) => {{$(
-        diagnostics_warningsAsHint: Vec<String> = Vec::new(),
+            map.insert($key.into(), serde_json::json!($value));
-        diagnostics_warningsAsInfo: Vec<String> = Vec::new(),
+        )*}};
+    }
-        files_watcher: String = "client".into(),
+    set!("markdownDescription": doc);
+    set!("default": default);
-        hoverActions_debug: bool           = true,
-        hoverActions_enable: bool          = true,
+    match ty {
-        hoverActions_gotoTypeDef: bool     = true,
+        "bool" => set!("type": "boolean"),
-        hoverActions_implementations: bool = true,
+        "String" => set!("type": "string"),
-        hoverActions_run: bool             = true,
+        "Vec<String>" => set! {
-        hoverActions_linksInHover: bool    = true,
+            "type": "array",
+            "items": { "type": "string" },
-        inlayHints_chainingHints: bool      = true,
+        },
-        inlayHints_maxLength: Option<usize> = None,
+        "FxHashSet<String>" => set! {
-        inlayHints_parameterHints: bool     = true,
+            "type": "array",
-        inlayHints_typeHints: bool          = true,
+            "items": { "type": "string" },
+            "uniqueItems": true,
-        lens_debug: bool            = true,
+        },
-        lens_enable: bool           = true,
+        "Option<usize>" => set! {
-        lens_implementations: bool  = true,
+            "type": ["null", "integer"],
-        lens_run: bool              = true,
+            "minimum": 0,
-        lens_methodReferences: bool = false,
+        },
+        "Option<String>" => set! {
-        linkedProjects: Vec<ManifestOrProjectJson> = Vec::new(),
+            "type": ["null", "string"],
-        lruCapacity: Option<usize>                 = None,
+        },
-        notifications_cargoTomlNotFound: bool      = true,
+        "Option<bool>" => set! {
-        procMacro_enable: bool                     = false,
+            "type": ["null", "boolean"],
+        },
-        runnables_overrideCargo: Option<String> = None,
+        "Option<Vec<String>>" => set! {
-        runnables_cargoExtraArgs: Vec<String>   = Vec::new(),
+            "type": ["null", "array"],
+            "items": { "type": "string" },
-        rustfmt_extraArgs: Vec<String>               = Vec::new(),
+        },
-        rustfmt_overrideCommand: Option<Vec<String>> = None,
+        "MergeBehaviorDef" => set! {
+            "type": "string",
-        rustcSource : Option<String> = None,
+            "enum": ["none", "full", "last"],
+            "enumDescriptions": [
+                "No merging",
+                "Merge all layers of the import trees",
+                "Only merge the last layer of the import trees"
+            ],
+        },
+        "ImportPrefixDef" => set! {
+            "type": "string",
+            "enum": [
+                "plain",
+                "by_self",
+                "by_crate"
+            ],
+            "enumDescriptions": [
+                "Insert import paths relative to the current module, using up to one `super` prefix if the parent module contains the requested item.",
+                "Prefix all import paths with `self` if they don't begin with `self`, `super`, `crate` or a crate name",
+                "Force import paths to be absolute by always starting them with `crate` or the crate name they refer to."
+            ],
+        },
+        "Vec<ManifestOrProjectJson>" => set! {
+            "type": "array",
+            "items": { "type": ["string", "object"] },
+        },
+        _ => panic!("{}: {}", ty, default),
+    }
+    map.into()
+}
+#[cfg(test)]
+fn manual(fields: &[(&'static str, &'static str, &[&str], &str)]) -> String {
+    fields
+        .iter()
+        .map(|(field, _ty, doc, default)| {
+            let name = field.replace("_", ".");
+            let name = format!("rust-analyzer.{} (default: `{}`)", name, default);
+            format!("{}::\n{}\n", name, doc.join(" "))
+        })
+        .collect::<String>()
+}
+#[cfg(test)]
+mod tests {
+    use std::fs;
+    use test_utils::project_dir;
+    use super::*;
+    #[test]
+    fn schema_in_sync_with_package_json() {
+        let s = Config::json_schema();
+        let schema = format!("{:#}", s);
+        let schema = schema.trim_start_matches('{').trim_end_matches('}');
+        let package_json = project_dir().join("editors/code/package.json");
+        let package_json = fs::read_to_string(&package_json).unwrap();
+        let p = remove_ws(&package_json);
+        let s = remove_ws(&schema);
+        assert!(p.contains(&s), "update config in package.json. New config:\n{:#}", schema);
+    }
+    #[test]
+    fn schema_in_sync_with_docs() {
+        let docs_path = project_dir().join("docs/user/generated_config.adoc");
+        let current = fs::read_to_string(&docs_path).unwrap();
+        let expected = ConfigData::manual();
+        if remove_ws(&current) != remove_ws(&expected) {
+            fs::write(&docs_path, expected).unwrap();
+            panic!("updated config manual");
+        }
+    }
+    fn remove_ws(text: &str) -> String {
+        text.replace(char::is_whitespace, "")
    }
 }
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs
index a27495d0d..71dc56915 100644
--- a/crates/rust-analyzer/src/global_state.rs
+++ b/crates/rust-analyzer/src/global_state.rs
@@ -13,6 +13,7 @@ use lsp_types::{SemanticTokens, Url};
 use parking_lot::{Mutex, RwLock};
 use project_model::{CargoWorkspace, ProcMacroClient, ProjectWorkspace, Target};
 use rustc_hash::FxHashMap;
+use vfs::AnchoredPathBuf;
 use crate::{
    config::Config,
@@ -268,10 +269,10 @@ impl GlobalStateSnapshot {
        Some(self.mem_docs.get(&path)?.version)
    }
-    pub(crate) fn anchored_path(&self, file_id: FileId, path: &str) -> Url {
+    pub(crate) fn anchored_path(&self, path: &AnchoredPathBuf) -> Url {
-        let mut base = self.vfs.read().0.file_path(file_id);
+        let mut base = self.vfs.read().0.file_path(path.anchor);
        base.pop();
-        let path = base.join(path).unwrap();
+        let path = base.join(&path.path).unwrap();
        let path = path.as_path().unwrap();
        url_from_abs_path(&path)
    }
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 95be2ebd3..a5f7647b8 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -255,7 +255,7 @@ impl GlobalState {
                            for (path, contents) in files {
                                let path = VfsPath::from(path);
                                if !self.mem_docs.contains_key(&path) {
-                                    vfs.set_file_contents(path, contents)
+                                    vfs.set_file_contents(path, contents);
                                }
                            }
                        }
@@ -369,6 +369,11 @@ impl GlobalState {
                self.semantic_tokens_cache.lock().clear();
                self.send_request::<lsp_types::request::SemanticTokensRefesh>((), |_, _| ());
            }
+            // Refresh code lens if the client supports it.
+            if self.config.code_lens_refresh {
+                self.send_request::<lsp_types::request::CodeLensRefresh>((), |_, _| ());
+            }
        }
        if let Some(diagnostic_changes) = self.diagnostics.take_changes() {
@@ -503,11 +508,21 @@ impl GlobalState {
                    {
                        log::error!("duplicate DidOpenTextDocument: {}", path)
                    }
-                    this.vfs
+                    let changed = this
+                        .vfs
                        .write()
                        .0
                        .set_file_contents(path, Some(params.text_document.text.into_bytes()));
-                    this.maybe_update_diagnostics();
+                    // If the VFS contents are unchanged, update diagnostics, since `handle_event`
+                    // won't see any changes. This avoids missing diagnostics when opening a file.
+                    //
+                    // If the file *was* changed, `handle_event` will already recompute and send
+                    // diagnostics. We can't do it here, since the *current* file contents might be
+                    // unset in salsa, since the VFS change hasn't been applied to the database yet.
+                    if !changed {
+                        this.maybe_update_diagnostics();
+                    }
                }
                Ok(())
            })?
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 01eabe852..715f8927a 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -628,17 +628,17 @@ pub(crate) fn resource_op(
    file_system_edit: FileSystemEdit,
 ) -> lsp_types::ResourceOp {
    match file_system_edit {
-        FileSystemEdit::CreateFile { anchor, dst } => {
+        FileSystemEdit::CreateFile { dst } => {
-            let uri = snap.anchored_path(anchor, &dst);
+            let uri = snap.anchored_path(&dst);
            lsp_types::ResourceOp::Create(lsp_types::CreateFile {
                uri,
                options: None,
                annotation: None,
            })
        }
-        FileSystemEdit::MoveFile { src, anchor, dst } => {
+        FileSystemEdit::MoveFile { src, dst } => {
            let old_uri = snap.file_id_to_url(src);
-            let new_uri = snap.anchored_path(anchor, &dst);
+            let new_uri = snap.anchored_path(&dst);
            lsp_types::ResourceOp::Rename(lsp_types::RenameFile {
                old_uri,
                new_uri,
diff --git a/crates/syntax/src/ast/token_ext.rs b/crates/syntax/src/ast/token_ext.rs
index a10b14778..52b7285dd 100644
--- a/crates/syntax/src/ast/token_ext.rs
+++ b/crates/syntax/src/ast/token_ext.rs
@@ -17,6 +17,14 @@ impl ast::Comment {
        CommentKind::from_text(self.text())
    }
+    pub fn is_inner(&self) -> bool {
+        self.kind().doc == Some(CommentPlacement::Inner)
+    }
+    pub fn is_outer(&self) -> bool {
+        self.kind().doc == Some(CommentPlacement::Outer)
+    }
    pub fn prefix(&self) -> &'static str {
        let &(prefix, _kind) = CommentKind::BY_PREFIX
            .iter()
diff --git a/crates/test_utils/src/lib.rs b/crates/test_utils/src/lib.rs
index a49be4602..05940a546 100644
--- a/crates/test_utils/src/lib.rs
+++ b/crates/test_utils/src/lib.rs
@@ -321,12 +321,11 @@ fn lines_match_works() {
 /// as paths). You can use a `"{...}"` string literal as a wildcard for
 /// arbitrary nested JSON. Arrays are sorted before comparison.
 pub fn find_mismatch<'a>(expected: &'a Value, actual: &'a Value) -> Option<(&'a Value, &'a Value)> {
-    use serde_json::Value::*;
    match (expected, actual) {
-        (&Number(ref l), &Number(ref r)) if l == r => None,
+        (Value::Number(l), Value::Number(r)) if l == r => None,
-        (&Bool(l), &Bool(r)) if l == r => None,
+        (Value::Bool(l), Value::Bool(r)) if l == r => None,
-        (&String(ref l), &String(ref r)) if lines_match(l, r) => None,
+        (Value::String(l), Value::String(r)) if lines_match(l, r) => None,
-        (&Array(ref l), &Array(ref r)) => {
+        (Value::Array(l), Value::Array(r)) => {
            if l.len() != r.len() {
                return Some((expected, actual));
            }
@@ -350,17 +349,26 @@ pub fn find_mismatch<'a>(expected: &'a Value, actual: &'a Value) -> Option<(&'a
                None
            }
        }
-        (&Object(ref l), &Object(ref r)) => {
+        (Value::Object(l), Value::Object(r)) => {
+            fn sorted_values(obj: &serde_json::Map<String, Value>) -> Vec<&Value> {
+                let mut entries = obj.iter().collect::<Vec<_>>();
+                entries.sort_by_key(|it| it.0);
+                entries.into_iter().map(|(_k, v)| v).collect::<Vec<_>>()
+            }
            let same_keys = l.len() == r.len() && l.keys().all(|k| r.contains_key(k));
            if !same_keys {
                return Some((expected, actual));
            }
-            l.values().zip(r.values()).filter_map(|(l, r)| find_mismatch(l, r)).next()
+            let l = sorted_values(l);
+            let r = sorted_values(r);
+            l.into_iter().zip(r).filter_map(|(l, r)| find_mismatch(l, r)).next()
        }
-        (&Null, &Null) => None,
+        (Value::Null, Value::Null) => None,
        // magic string literal "{...}" acts as wildcard for any sub-JSON
-        (&String(ref l), _) if l == "{...}" => None,
+        (Value::String(l), _) if l == "{...}" => None,
        _ => Some((expected, actual)),
    }
 }
diff --git a/crates/vfs/src/anchored_path.rs b/crates/vfs/src/anchored_path.rs
new file mode 100644
index 000000000..02720a32e
--- /dev/null
+++ b/crates/vfs/src/anchored_path.rs
@@ -0,0 +1,39 @@
+//! Analysis-level representation of file-system paths.
+//!
+//! The primary goal of this is to losslessly represent paths like
+//!
+//! ```
+//! #[path = "./bar.rs"]
+//! mod foo;
+//! ```
+//!
+//! The first approach one might reach for is to use `PathBuf`. The problem here
+//! is that `PathBuf` depends on host target (windows or linux), but
+//! rust-analyzer should be capable to process `#[path = r"C:\bar.rs"]` on Unix.
+//!
+//! The second try is to use a `String`. This also fails, however. Consider a
+//! hypothetical scenario, where rust-analyzer operates in a
+//! networked/distributed mode. There's one global instance of rust-analyzer,
+//! which processes requests from different machines. Now, the semantics of
+//! `#[path = "/abs/path.rs"]` actually depends on which file-system we are at!
+//! That is, even absolute paths exist relative to a file system!
+//!
+//! A more realistic scenario here is virtual VFS paths we use for testing. More
+//! generally, there can be separate "universes" of VFS paths.
+//!
+//! That's why we use anchored representation -- each path carries an info about
+//! a file this path originates from. We can fetch fs/"universe" information
+//! from the anchor than.
+use crate::FileId;
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct AnchoredPathBuf {
+    pub anchor: FileId,
+    pub path: String,
+}
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub struct AnchoredPath<'a> {
+    pub anchor: FileId,
+    pub path: &'a str,
+}
diff --git a/crates/vfs/src/file_set.rs b/crates/vfs/src/file_set.rs
index 9093fbd97..49ca593ac 100644
--- a/crates/vfs/src/file_set.rs
+++ b/crates/vfs/src/file_set.rs
@@ -7,7 +7,7 @@ use std::fmt;
 use fst::{IntoStreamer, Streamer};
 use rustc_hash::FxHashMap;
-use crate::{FileId, Vfs, VfsPath};
+use crate::{AnchoredPath, FileId, Vfs, VfsPath};
 #[derive(Default, Clone, Eq, PartialEq)]
 pub struct FileSet {
@@ -19,10 +19,10 @@ impl FileSet {
    pub fn len(&self) -> usize {
        self.files.len()
    }
-    pub fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
+    pub fn resolve_path(&self, path: AnchoredPath<'_>) -> Option<FileId> {
-        let mut base = self.paths[&anchor].clone();
+        let mut base = self.paths[&path.anchor].clone();
        base.pop();
-        let path = base.join(path)?;
+        let path = base.join(path.path)?;
        self.files.get(&path).copied()
    }
diff --git a/crates/vfs/src/lib.rs b/crates/vfs/src/lib.rs
index cdf6f1fd0..9cf2afd33 100644
--- a/crates/vfs/src/lib.rs
+++ b/crates/vfs/src/lib.rs
@@ -36,6 +36,7 @@
 //! have a single `FileSet` which unions the two sources.
 mod vfs_path;
 mod path_interner;
+mod anchored_path;
 pub mod file_set;
 pub mod loader;
@@ -43,7 +44,10 @@ use std::{fmt, mem};
 use crate::path_interner::PathInterner;
-pub use crate::vfs_path::VfsPath;
+pub use crate::{
+    anchored_path::{AnchoredPath, AnchoredPathBuf},
+    vfs_path::VfsPath,
+};
 pub use paths::{AbsPath, AbsPathBuf};
 #[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash)]
@@ -99,18 +103,19 @@ impl Vfs {
                (file_id, path)
            })
    }
-    pub fn set_file_contents(&mut self, path: VfsPath, contents: Option<Vec<u8>>) {
+    pub fn set_file_contents(&mut self, path: VfsPath, contents: Option<Vec<u8>>) -> bool {
        let file_id = self.alloc_file_id(path);
        let change_kind = match (&self.get(file_id), &contents) {
-            (None, None) => return,
+            (None, None) => return false,
            (None, Some(_)) => ChangeKind::Create,
            (Some(_), None) => ChangeKind::Delete,
-            (Some(old), Some(new)) if old == new => return,
+            (Some(old), Some(new)) if old == new => return false,
            (Some(_), Some(_)) => ChangeKind::Modify,
        };
        *self.get_mut(file_id) = contents;
-        self.changes.push(ChangedFile { file_id, change_kind })
+        self.changes.push(ChangedFile { file_id, change_kind });
+        true
    }
    pub fn has_changes(&self) -> bool {
        !self.changes.is_empty()