54 files changed, 1635 insertions, 1548 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 9ea1765cb..91a932549 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1174,6 +1174,7 @@ dependencies = [
  "anyhow",
  "cargo_metadata",
  "log",
+ "paths",
  "ra_arena",
  "ra_cfg",
  "ra_db",
diff --git a/crates/paths/src/lib.rs b/crates/paths/src/lib.rs
index 45b19c45a..1b259682d 100644
--- a/crates/paths/src/lib.rs
+++ b/crates/paths/src/lib.rs
@@ -28,6 +28,12 @@ impl AsRef<Path> for AbsPathBuf {
     }
 }
 
+impl AsRef<AbsPath> for AbsPathBuf {
+    fn as_ref(&self) -> &AbsPath {
+        self.as_path()
+    }
+}
+
 impl TryFrom<PathBuf> for AbsPathBuf {
     type Error = PathBuf;
     fn try_from(path_buf: PathBuf) -> Result<AbsPathBuf, PathBuf> {
@@ -45,9 +51,19 @@ impl TryFrom<&str> for AbsPathBuf {
     }
 }
 
+impl PartialEq<AbsPath> for AbsPathBuf {
+    fn eq(&self, other: &AbsPath) -> bool {
+        self.as_path() == other
+    }
+}
+
 impl AbsPathBuf {
+    pub fn assert(path: PathBuf) -> AbsPathBuf {
+        AbsPathBuf::try_from(path)
+            .unwrap_or_else(|path| panic!("expected absolute path, got {}", path.display()))
+    }
     pub fn as_path(&self) -> &AbsPath {
-        AbsPath::new_unchecked(self.0.as_path())
+        AbsPath::assert(self.0.as_path())
     }
     pub fn pop(&mut self) -> bool {
         self.0.pop()
@@ -77,15 +93,19 @@ impl<'a> TryFrom<&'a Path> for &'a AbsPath {
         if !path.is_absolute() {
             return Err(path);
         }
-        Ok(AbsPath::new_unchecked(path))
+        Ok(AbsPath::assert(path))
     }
 }
 
 impl AbsPath {
-    fn new_unchecked(path: &Path) -> &AbsPath {
+    pub fn assert(path: &Path) -> &AbsPath {
+        assert!(path.is_absolute());
         unsafe { &*(path as *const Path as *const AbsPath) }
     }
 
+    pub fn parent(&self) -> Option<&AbsPath> {
+        self.0.parent().map(AbsPath::assert)
+    }
     pub fn join(&self, path: impl AsRef<Path>) -> AbsPathBuf {
         self.as_ref().join(path).try_into().unwrap()
     }
diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs
index ddf46e6c4..4f4fb4494 100644
--- a/crates/ra_db/src/fixture.rs
+++ b/crates/ra_db/src/fixture.rs
@@ -132,10 +132,17 @@ fn with_files(
 
     let mut file_position = None;
 
-    for entry in fixture.iter() {
-        let meta = match ParsedMeta::from(entry) {
-            ParsedMeta::File(it) => it,
+    for entry in fixture {
+        let text = if entry.text.contains(CURSOR_MARKER) {
+            let (range_or_offset, text) = extract_range_or_offset(&entry.text);
+            assert!(file_position.is_none());
+            file_position = Some((file_id, range_or_offset));
+            text.to_string()
+        } else {
+            entry.text.clone()
         };
+
+        let meta = FileMeta::from(entry);
         assert!(meta.path.starts_with(&source_root_prefix));
 
         if let Some(krate) = meta.krate {
@@ -157,15 +164,6 @@ fn with_files(
             default_crate_root = Some(file_id);
         }
 
-        let text = if entry.text.contains(CURSOR_MARKER) {
-            let (range_or_offset, text) = extract_range_or_offset(&entry.text);
-            assert!(file_position.is_none());
-            file_position = Some((file_id, range_or_offset));
-            text.to_string()
-        } else {
-            entry.text.to_string()
-        };
-
         db.set_file_text(file_id, Arc::new(text));
         db.set_file_source_root(file_id, source_root_id);
         let path = VfsPath::new_virtual_path(meta.path);
@@ -198,10 +196,6 @@ fn with_files(
     (file_position, files)
 }
 
-enum ParsedMeta {
-    File(FileMeta),
-}
-
 struct FileMeta {
     path: String,
     krate: Option<String>,
@@ -211,22 +205,22 @@ struct FileMeta {
     env: Env,
 }
 
-impl From<&Fixture> for ParsedMeta {
-    fn from(f: &Fixture) -> Self {
+impl From<Fixture> for FileMeta {
+    fn from(f: Fixture) -> FileMeta {
         let mut cfg = CfgOptions::default();
         f.cfg_atoms.iter().for_each(|it| cfg.insert_atom(it.into()));
         f.cfg_key_values.iter().for_each(|(k, v)| cfg.insert_key_value(k.into(), v.into()));
 
-        Self::File(FileMeta {
-            path: f.path.to_owned(),
-            krate: f.crate_name.to_owned(),
-            deps: f.deps.to_owned(),
+        FileMeta {
+            path: f.path,
+            krate: f.krate,
+            deps: f.deps,
             cfg,
             edition: f
                 .edition
                 .as_ref()
                 .map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap()),
             env: Env::from(f.env.iter()),
-        })
+        }
     }
 }
diff --git a/crates/ra_hir_ty/src/infer/pat.rs b/crates/ra_hir_ty/src/infer/pat.rs
index 4006f595d..23de2bd6b 100644
--- a/crates/ra_hir_ty/src/infer/pat.rs
+++ b/crates/ra_hir_ty/src/infer/pat.rs
@@ -4,7 +4,7 @@ use std::iter::repeat;
 use std::sync::Arc;
 
 use hir_def::{
-    expr::{BindingAnnotation, Pat, PatId, RecordFieldPat},
+    expr::{BindingAnnotation, Expr, Literal, Pat, PatId, RecordFieldPat},
     path::Path,
     type_ref::Mutability,
     FieldId,
@@ -90,18 +90,7 @@ impl<'a> InferenceContext<'a> {
     ) -> Ty {
         let body = Arc::clone(&self.body); // avoid borrow checker problem
 
-        let is_non_ref_pat = match &body[pat] {
-            Pat::Tuple { .. }
-            | Pat::Or(..)
-            | Pat::TupleStruct { .. }
-            | Pat::Record { .. }
-            | Pat::Range { .. }
-            | Pat::Slice { .. } => true,
-            // FIXME: Path/Lit might actually evaluate to ref, but inference is unimplemented.
-            Pat::Path(..) | Pat::Lit(..) => true,
-            Pat::Wild | Pat::Bind { .. } | Pat::Ref { .. } | Pat::Missing => false,
-        };
-        if is_non_ref_pat {
+        if is_non_ref_pat(&body, pat) {
             while let Some((inner, mutability)) = expected.as_reference() {
                 expected = inner;
                 default_bm = match default_bm {
@@ -227,3 +216,21 @@ impl<'a> InferenceContext<'a> {
         ty
     }
 }
+
+fn is_non_ref_pat(body: &hir_def::body::Body, pat: PatId) -> bool {
+    match &body[pat] {
+        Pat::Tuple { .. }
+        | Pat::TupleStruct { .. }
+        | Pat::Record { .. }
+        | Pat::Range { .. }
+        | Pat::Slice { .. } => true,
+        Pat::Or(pats) => pats.iter().all(|p| is_non_ref_pat(body, *p)),
+        // FIXME: Path/Lit might actually evaluate to ref, but inference is unimplemented.
+        Pat::Path(..) => true,
+        Pat::Lit(expr) => match body[*expr] {
+            Expr::Literal(Literal::String(..)) => false,
+            _ => true,
+        },
+        Pat::Wild | Pat::Bind { .. } | Pat::Ref { .. } | Pat::Missing => false,
+    }
+}
diff --git a/crates/ra_hir_ty/src/tests/patterns.rs b/crates/ra_hir_ty/src/tests/patterns.rs
index 8fa296137..e5ef241ca 100644
--- a/crates/ra_hir_ty/src/tests/patterns.rs
+++ b/crates/ra_hir_ty/src/tests/patterns.rs
@@ -271,6 +271,63 @@ fn test() {
 }
 
 #[test]
+fn infer_pattern_match_string_literal() {
+    assert_snapshot!(
+        infer_with_mismatches(r#"
+fn test() {
+    let s: &str = "hello";
+    match s {
+        "hello" => {}
+        _ => {}
+    }
+}
+"#, true),
+    @r###"
+    10..98 '{     ...   } }': ()
+    20..21 's': &str
+    30..37 '"hello"': &str
+    43..96 'match ...     }': ()
+    49..50 's': &str
+    61..68 '"hello"': &str
+    61..68 '"hello"': &str
+    72..74 '{}': ()
+    83..84 '_': &str
+    88..90 '{}': ()
+    "###
+    );
+}
+
+#[test]
+fn infer_pattern_match_or() {
+    assert_snapshot!(
+        infer_with_mismatches(r#"
+fn test() {
+    let s: &str = "hello";
+    match s {
+        "hello" | "world" => {}
+        _ => {}
+    }
+}
+"#, true),
+    @r###"
+    10..108 '{     ...   } }': ()
+    20..21 's': &str
+    30..37 '"hello"': &str
+    43..106 'match ...     }': ()
+    49..50 's': &str
+    61..68 '"hello"': &str
+    61..68 '"hello"': &str
+    61..78 '"hello...world"': &str
+    71..78 '"world"': &str
+    71..78 '"world"': &str
+    82..84 '{}': ()
+    93..94 '_': &str
+    98..100 '{}': ()
+    "###
+    );
+}
+
+#[test]
 fn infer_pattern_match_arr() {
     assert_snapshot!(
         infer(r#"
diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs
index aa039e6fc..a6bdf1c9d 100644
--- a/crates/ra_ide/src/call_info.rs
+++ b/crates/ra_ide/src/call_info.rs
@@ -215,7 +215,7 @@ impl CallInfo {
 mod tests {
     use test_utils::mark;
 
-    use crate::mock_analysis::single_file_with_position;
+    use crate::mock_analysis::analysis_and_position;
 
     use super::*;
 
@@ -231,7 +231,7 @@ mod tests {
     }
 
     fn call_info_helper(text: &str) -> Option<CallInfo> {
-        let (analysis, position) = single_file_with_position(text);
+        let (analysis, position) = analysis_and_position(text);
         analysis.call_info(position).unwrap()
     }
 
@@ -530,7 +530,7 @@ By default this method stops actor's `Context`."#
     #[test]
     fn call_info_bad_offset() {
         mark::check!(call_info_bad_offset);
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             r#"fn foo(x: u32, y: u32) -> u32 {x + y}
                fn bar() { foo <|> (3, ); }"#,
         );
diff --git a/crates/ra_ide/src/completion/complete_attribute.rs b/crates/ra_ide/src/completion/complete_attribute.rs
index ade17a1ff..6beeca457 100644
--- a/crates/ra_ide/src/completion/complete_attribute.rs
+++ b/crates/ra_ide/src/completion/complete_attribute.rs
@@ -333,69 +333,69 @@ mod tests {
         [
             CompletionItem {
                 label: "Clone",
-                source_range: 30..30,
-                delete: 30..30,
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "Clone",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Copy, Clone",
-                source_range: 30..30,
-                delete: 30..30,
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "Copy, Clone",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Debug",
-                source_range: 30..30,
-                delete: 30..30,
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "Debug",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Default",
-                source_range: 30..30,
-                delete: 30..30,
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "Default",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Eq, PartialEq",
-                source_range: 30..30,
-                delete: 30..30,
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "Eq, PartialEq",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Hash",
-                source_range: 30..30,
-                delete: 30..30,
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "Hash",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Ord, PartialOrd, Eq, PartialEq",
-                source_range: 30..30,
-                delete: 30..30,
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "Ord, PartialOrd, Eq, PartialEq",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "PartialEq",
-                source_range: 30..30,
-                delete: 30..30,
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "PartialEq",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "PartialOrd, PartialEq",
-                source_range: 30..30,
-                delete: 30..30,
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "PartialOrd, PartialEq",
                 kind: Attribute,
             },
         ]
-            "###
+        "###
         );
     }
 
@@ -425,62 +425,62 @@ mod tests {
         [
             CompletionItem {
                 label: "Clone",
-                source_range: 59..59,
-                delete: 59..59,
+                source_range: 38..38,
+                delete: 38..38,
                 insert: "Clone",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Copy, Clone",
-                source_range: 59..59,
-                delete: 59..59,
+                source_range: 38..38,
+                delete: 38..38,
                 insert: "Copy, Clone",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Debug",
-                source_range: 59..59,
-                delete: 59..59,
+                source_range: 38..38,
+                delete: 38..38,
                 insert: "Debug",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Default",
-                source_range: 59..59,
-                delete: 59..59,
+                source_range: 38..38,
+                delete: 38..38,
                 insert: "Default",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Eq",
-                source_range: 59..59,
-                delete: 59..59,
+                source_range: 38..38,
+                delete: 38..38,
                 insert: "Eq",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Hash",
-                source_range: 59..59,
-                delete: 59..59,
+                source_range: 38..38,
+                delete: 38..38,
                 insert: "Hash",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "Ord, PartialOrd, Eq",
-                source_range: 59..59,
-                delete: 59..59,
+                source_range: 38..38,
+                delete: 38..38,
                 insert: "Ord, PartialOrd, Eq",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "PartialOrd",
-                source_range: 59..59,
-                delete: 59..59,
+                source_range: 38..38,
+                delete: 38..38,
                 insert: "PartialOrd",
                 kind: Attribute,
             },
         ]
-            "###
+        "###
         );
     }
 
@@ -496,207 +496,207 @@ mod tests {
         [
             CompletionItem {
                 label: "allow(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "allow(${0:lint})",
                 kind: Attribute,
                 lookup: "allow",
             },
             CompletionItem {
                 label: "cfg(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "cfg(${0:predicate})",
                 kind: Attribute,
                 lookup: "cfg",
             },
             CompletionItem {
                 label: "cfg_attr(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "cfg_attr(${1:predicate}, ${0:attr})",
                 kind: Attribute,
                 lookup: "cfg_attr",
             },
             CompletionItem {
                 label: "deny(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "deny(${0:lint})",
                 kind: Attribute,
                 lookup: "deny",
             },
             CompletionItem {
                 label: "deprecated = \"…\"",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "deprecated = \"${0:reason}\"",
                 kind: Attribute,
                 lookup: "deprecated",
             },
             CompletionItem {
                 label: "derive(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "derive(${0:Debug})",
                 kind: Attribute,
                 lookup: "derive",
             },
             CompletionItem {
                 label: "doc = \"…\"",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "doc = \"${0:docs}\"",
                 kind: Attribute,
                 lookup: "doc",
             },
             CompletionItem {
                 label: "forbid(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "forbid(${0:lint})",
                 kind: Attribute,
                 lookup: "forbid",
             },
             CompletionItem {
                 label: "ignore(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "ignore(${0:lint})",
                 kind: Attribute,
                 lookup: "ignore",
             },
             CompletionItem {
                 label: "inline(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "inline(${0:lint})",
                 kind: Attribute,
                 lookup: "inline",
             },
             CompletionItem {
                 label: "link",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "link",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "link_name = \"…\"",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "link_name = \"${0:symbol_name}\"",
                 kind: Attribute,
                 lookup: "link_name",
             },
             CompletionItem {
                 label: "macro_export",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "macro_export",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "macro_use",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "macro_use",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "must_use = \"…\"",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "must_use = \"${0:reason}\"",
                 kind: Attribute,
                 lookup: "must_use",
             },
             CompletionItem {
                 label: "no_mangle",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "no_mangle",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "non_exhaustive",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "non_exhaustive",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "path = \"…\"",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "path =\"${0:path}\"",
                 kind: Attribute,
                 lookup: "path",
             },
             CompletionItem {
                 label: "proc_macro",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "proc_macro",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "proc_macro_attribute",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "proc_macro_attribute",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "proc_macro_derive(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "proc_macro_derive(${0:Trait})",
                 kind: Attribute,
                 lookup: "proc_macro_derive",
             },
             CompletionItem {
                 label: "repr(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "repr(${0:C})",
                 kind: Attribute,
                 lookup: "repr",
             },
             CompletionItem {
                 label: "should_panic(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "should_panic(expected = \"${0:reason}\")",
                 kind: Attribute,
                 lookup: "should_panic",
             },
             CompletionItem {
                 label: "target_feature = \"…\"",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "target_feature = \"${0:feature}\"",
                 kind: Attribute,
                 lookup: "target_feature",
             },
             CompletionItem {
                 label: "test",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "test",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "used",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "used",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "warn(…)",
-                source_range: 19..19,
-                delete: 19..19,
+                source_range: 2..2,
+                delete: 2..2,
                 insert: "warn(${0:lint})",
                 kind: Attribute,
                 lookup: "warn",
@@ -732,252 +732,252 @@ mod tests {
         [
             CompletionItem {
                 label: "allow(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "allow(${0:lint})",
                 kind: Attribute,
                 lookup: "allow",
             },
             CompletionItem {
                 label: "cfg(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "cfg(${0:predicate})",
                 kind: Attribute,
                 lookup: "cfg",
             },
             CompletionItem {
                 label: "cfg_attr(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "cfg_attr(${1:predicate}, ${0:attr})",
                 kind: Attribute,
                 lookup: "cfg_attr",
             },
             CompletionItem {
                 label: "deny(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "deny(${0:lint})",
                 kind: Attribute,
                 lookup: "deny",
             },
             CompletionItem {
                 label: "deprecated = \"…\"",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "deprecated = \"${0:reason}\"",
                 kind: Attribute,
                 lookup: "deprecated",
             },
             CompletionItem {
                 label: "derive(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "derive(${0:Debug})",
                 kind: Attribute,
                 lookup: "derive",
             },
             CompletionItem {
                 label: "doc = \"…\"",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "doc = \"${0:docs}\"",
                 kind: Attribute,
                 lookup: "doc",
             },
             CompletionItem {
                 label: "feature(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "feature(${0:flag})",
                 kind: Attribute,
                 lookup: "feature",
             },
             CompletionItem {
                 label: "forbid(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "forbid(${0:lint})",
                 kind: Attribute,
                 lookup: "forbid",
             },
             CompletionItem {
                 label: "global_allocator",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "global_allocator",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "ignore(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "ignore(${0:lint})",
                 kind: Attribute,
                 lookup: "ignore",
             },
             CompletionItem {
                 label: "inline(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "inline(${0:lint})",
                 kind: Attribute,
                 lookup: "inline",
             },
             CompletionItem {
                 label: "link",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "link",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "link_name = \"…\"",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "link_name = \"${0:symbol_name}\"",
                 kind: Attribute,
                 lookup: "link_name",
             },
             CompletionItem {
                 label: "macro_export",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "macro_export",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "macro_use",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "macro_use",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "must_use = \"…\"",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "must_use = \"${0:reason}\"",
                 kind: Attribute,
                 lookup: "must_use",
             },
             CompletionItem {
                 label: "no_mangle",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "no_mangle",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "no_std",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "no_std",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "non_exhaustive",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "non_exhaustive",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "panic_handler",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "panic_handler",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "path = \"…\"",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "path =\"${0:path}\"",
                 kind: Attribute,
                 lookup: "path",
             },
             CompletionItem {
                 label: "proc_macro",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "proc_macro",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "proc_macro_attribute",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "proc_macro_attribute",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "proc_macro_derive(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "proc_macro_derive(${0:Trait})",
                 kind: Attribute,
                 lookup: "proc_macro_derive",
             },
             CompletionItem {
                 label: "recursion_limit = …",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "recursion_limit = ${0:128}",
                 kind: Attribute,
                 lookup: "recursion_limit",
             },
             CompletionItem {
                 label: "repr(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "repr(${0:C})",
                 kind: Attribute,
                 lookup: "repr",
             },
             CompletionItem {
                 label: "should_panic(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "should_panic(expected = \"${0:reason}\")",
                 kind: Attribute,
                 lookup: "should_panic",
             },
             CompletionItem {
                 label: "target_feature = \"…\"",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "target_feature = \"${0:feature}\"",
                 kind: Attribute,
                 lookup: "target_feature",
             },
             CompletionItem {
                 label: "test",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "test",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "used",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "used",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "warn(…)",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "warn(${0:lint})",
                 kind: Attribute,
                 lookup: "warn",
             },
             CompletionItem {
                 label: "windows_subsystem = \"…\"",
-                source_range: 20..20,
-                delete: 20..20,
+                source_range: 3..3,
+                delete: 3..3,
                 insert: "windows_subsystem = \"${0:subsystem}\"",
                 kind: Attribute,
                 lookup: "windows_subsystem",
diff --git a/crates/ra_ide/src/completion/complete_dot.rs b/crates/ra_ide/src/completion/complete_dot.rs
index 05f825c6f..ee4e24fca 100644
--- a/crates/ra_ide/src/completion/complete_dot.rs
+++ b/crates/ra_ide/src/completion/complete_dot.rs
@@ -94,8 +94,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: 94..94,
-                delete: 94..94,
+                source_range: 45..45,
+                delete: 45..45,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -125,8 +125,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo()",
-                source_range: 187..187,
-                delete: 187..187,
+                source_range: 102..102,
+                delete: 102..102,
                 insert: "foo()$0",
                 kind: Method,
                 lookup: "foo",
@@ -134,8 +134,8 @@ mod tests {
             },
             CompletionItem {
                 label: "the_field",
-                source_range: 187..187,
-                delete: 187..187,
+                source_range: 102..102,
+                delete: 102..102,
                 insert: "the_field",
                 kind: Field,
                 detail: "(u32,)",
@@ -165,8 +165,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo()",
-                source_range: 126..126,
-                delete: 126..126,
+                source_range: 77..77,
+                delete: 77..77,
                 insert: "foo()$0",
                 kind: Method,
                 lookup: "foo",
@@ -174,8 +174,8 @@ mod tests {
             },
             CompletionItem {
                 label: "the_field",
-                source_range: 126..126,
-                delete: 126..126,
+                source_range: 77..77,
+                delete: 77..77,
                 insert: "the_field",
                 kind: Field,
                 detail: "(u32, i32)",
@@ -222,24 +222,24 @@ mod tests {
         [
             CompletionItem {
                 label: "crate_field",
-                source_range: 313..313,
-                delete: 313..313,
+                source_range: 192..192,
+                delete: 192..192,
                 insert: "crate_field",
                 kind: Field,
                 detail: "u32",
             },
             CompletionItem {
                 label: "pub_field",
-                source_range: 313..313,
-                delete: 313..313,
+                source_range: 192..192,
+                delete: 192..192,
                 insert: "pub_field",
                 kind: Field,
                 detail: "u32",
             },
             CompletionItem {
                 label: "super_field",
-                source_range: 313..313,
-                delete: 313..313,
+                source_range: 192..192,
+                delete: 192..192,
                 insert: "super_field",
                 kind: Field,
                 detail: "u32",
@@ -268,16 +268,16 @@ mod tests {
         [
             CompletionItem {
                 label: "field",
-                source_range: 140..140,
-                delete: 140..140,
+                source_range: 67..67,
+                delete: 67..67,
                 insert: "field",
                 kind: Field,
                 detail: "u8",
             },
             CompletionItem {
                 label: "other",
-                source_range: 140..140,
-                delete: 140..140,
+                source_range: 67..67,
+                delete: 67..67,
                 insert: "other",
                 kind: Field,
                 detail: "u16",
@@ -305,8 +305,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: 144..144,
-                delete: 144..144,
+                source_range: 71..71,
+                delete: 71..71,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -338,8 +338,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: 243..243,
-                delete: 243..243,
+                source_range: 134..134,
+                delete: 134..134,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -371,8 +371,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: 256..256,
-                delete: 256..256,
+                source_range: 147..147,
+                delete: 147..147,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -400,8 +400,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: 151..151,
-                delete: 151..151,
+                source_range: 90..90,
+                delete: 90..90,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -429,8 +429,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: 155..155,
-                delete: 155..155,
+                source_range: 94..94,
+                delete: 94..94,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -461,8 +461,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: 219..219,
-                delete: 219..219,
+                source_range: 122..122,
+                delete: 122..122,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -513,8 +513,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: 249..249,
-                delete: 249..249,
+                source_range: 128..128,
+                delete: 128..128,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -540,16 +540,16 @@ mod tests {
         [
             CompletionItem {
                 label: "0",
-                source_range: 75..75,
-                delete: 75..75,
+                source_range: 38..38,
+                delete: 38..38,
                 insert: "0",
                 kind: Field,
                 detail: "i32",
             },
             CompletionItem {
                 label: "1",
-                source_range: 75..75,
-                delete: 75..75,
+                source_range: 38..38,
+                delete: 38..38,
                 insert: "1",
                 kind: Field,
                 detail: "f64",
@@ -583,8 +583,8 @@ mod tests {
         [
             CompletionItem {
                 label: "blah()",
-                source_range: 299..300,
-                delete: 299..300,
+                source_range: 190..191,
+                delete: 190..191,
                 insert: "blah()$0",
                 kind: Method,
                 lookup: "blah",
@@ -610,8 +610,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: 106..106,
-                delete: 106..106,
+                source_range: 69..69,
+                delete: 69..69,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -676,15 +676,15 @@ mod tests {
         [
             CompletionItem {
                 label: "A",
-                source_range: 217..217,
-                delete: 217..217,
+                source_range: 120..120,
+                delete: 120..120,
                 insert: "A",
                 kind: Const,
             },
             CompletionItem {
                 label: "b",
-                source_range: 217..217,
-                delete: 217..217,
+                source_range: 120..120,
+                delete: 120..120,
                 insert: "b",
                 kind: Module,
             },
@@ -709,8 +709,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: 156..157,
-                delete: 156..157,
+                source_range: 91..92,
+                delete: 91..92,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -736,8 +736,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: 156..157,
-                delete: 156..157,
+                source_range: 91..92,
+                delete: 91..92,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -764,8 +764,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: 156..156,
-                delete: 156..156,
+                source_range: 91..91,
+                delete: 91..91,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -791,8 +791,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: 162..163,
-                delete: 162..163,
+                source_range: 97..98,
+                delete: 97..98,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -828,8 +828,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: 552..552,
-                delete: 552..552,
+                source_range: 327..327,
+                delete: 327..327,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -858,8 +858,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: 201..201,
-                delete: 201..201,
+                source_range: 116..116,
+                delete: 116..116,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
diff --git a/crates/ra_ide/src/completion/complete_fn_param.rs b/crates/ra_ide/src/completion/complete_fn_param.rs
index a661932a3..f5573ddf7 100644
--- a/crates/ra_ide/src/completion/complete_fn_param.rs
+++ b/crates/ra_ide/src/completion/complete_fn_param.rs
@@ -75,8 +75,8 @@ mod tests {
         [
             CompletionItem {
                 label: "file_id: FileId",
-                source_range: 110..114,
-                delete: 110..114,
+                source_range: 61..65,
+                delete: 61..65,
                 insert: "file_id: FileId",
                 lookup: "file_id",
             },
@@ -99,8 +99,8 @@ mod tests {
         [
             CompletionItem {
                 label: "file_id: FileId",
-                source_range: 110..114,
-                delete: 110..114,
+                source_range: 61..65,
+                delete: 61..65,
                 insert: "file_id: FileId",
                 lookup: "file_id",
             },
@@ -126,8 +126,8 @@ mod tests {
         [
             CompletionItem {
                 label: "file_id: FileId",
-                source_range: 289..293,
-                delete: 289..293,
+                source_range: 208..212,
+                delete: 208..212,
                 insert: "file_id: FileId",
                 lookup: "file_id",
             },
diff --git a/crates/ra_ide/src/completion/complete_pattern.rs b/crates/ra_ide/src/completion/complete_pattern.rs
index fdd9e928b..367e2bbce 100644
--- a/crates/ra_ide/src/completion/complete_pattern.rs
+++ b/crates/ra_ide/src/completion/complete_pattern.rs
@@ -63,37 +63,37 @@ mod tests {
         [
             CompletionItem {
                 label: "Bar",
-                source_range: 246..246,
-                delete: 246..246,
+                source_range: 137..137,
+                delete: 137..137,
                 insert: "Bar",
                 kind: Struct,
             },
             CompletionItem {
                 label: "E",
-                source_range: 246..246,
-                delete: 246..246,
+                source_range: 137..137,
+                delete: 137..137,
                 insert: "E",
                 kind: Enum,
             },
             CompletionItem {
                 label: "X",
-                source_range: 246..246,
-                delete: 246..246,
+                source_range: 137..137,
+                delete: 137..137,
                 insert: "X",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Z",
-                source_range: 246..246,
-                delete: 246..246,
+                source_range: 137..137,
+                delete: 137..137,
                 insert: "Z",
                 kind: Const,
             },
             CompletionItem {
                 label: "m",
-                source_range: 246..246,
-                delete: 246..246,
+                source_range: 137..137,
+                delete: 137..137,
                 insert: "m",
                 kind: Module,
             },
@@ -119,15 +119,15 @@ mod tests {
         [
             CompletionItem {
                 label: "E",
-                source_range: 151..151,
-                delete: 151..151,
+                source_range: 90..90,
+                delete: 90..90,
                 insert: "E",
                 kind: Enum,
             },
             CompletionItem {
                 label: "m!(…)",
-                source_range: 151..151,
-                delete: 151..151,
+                source_range: 90..90,
+                delete: 90..90,
                 insert: "m!($0)",
                 kind: Macro,
                 detail: "macro_rules! m",
diff --git a/crates/ra_ide/src/completion/complete_postfix.rs b/crates/ra_ide/src/completion/complete_postfix.rs
index b878aeb0a..3bd64804f 100644
--- a/crates/ra_ide/src/completion/complete_postfix.rs
+++ b/crates/ra_ide/src/completion/complete_postfix.rs
@@ -260,64 +260,64 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: 89..89,
-                delete: 85..89,
+                source_range: 40..40,
+                delete: 36..40,
                 insert: "Box::new(bar)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "call",
-                source_range: 89..89,
-                delete: 85..89,
+                source_range: 40..40,
+                delete: 36..40,
                 insert: "${1}(bar)",
                 detail: "function(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: 89..89,
-                delete: 85..89,
+                source_range: 40..40,
+                delete: 36..40,
                 insert: "dbg!(bar)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "if",
-                source_range: 89..89,
-                delete: 85..89,
+                source_range: 40..40,
+                delete: 36..40,
                 insert: "if bar {\n    $0\n}",
                 detail: "if expr {}",
             },
             CompletionItem {
                 label: "match",
-                source_range: 89..89,
-                delete: 85..89,
+                source_range: 40..40,
+                delete: 36..40,
                 insert: "match bar {\n    ${1:_} => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: 89..89,
-                delete: 85..89,
+                source_range: 40..40,
+                delete: 36..40,
                 insert: "!bar",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: 89..89,
-                delete: 85..89,
+                source_range: 40..40,
+                delete: 36..40,
                 insert: "&bar",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: 89..89,
-                delete: 85..89,
+                source_range: 40..40,
+                delete: 36..40,
                 insert: "&mut bar",
                 detail: "&mut expr",
             },
             CompletionItem {
                 label: "while",
-                source_range: 89..89,
-                delete: 85..89,
+                source_range: 40..40,
+                delete: 36..40,
                 insert: "while bar {\n    $0\n}",
                 detail: "while expr {}",
             },
@@ -346,64 +346,64 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: 210..210,
-                delete: 206..210,
+                source_range: 97..97,
+                delete: 93..97,
                 insert: "Box::new(bar)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "call",
-                source_range: 210..210,
-                delete: 206..210,
+                source_range: 97..97,
+                delete: 93..97,
                 insert: "${1}(bar)",
                 detail: "function(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: 210..210,
-                delete: 206..210,
+                source_range: 97..97,
+                delete: 93..97,
                 insert: "dbg!(bar)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "ifl",
-                source_range: 210..210,
-                delete: 206..210,
+                source_range: 97..97,
+                delete: 93..97,
                 insert: "if let Some($1) = bar {\n    $0\n}",
                 detail: "if let Some {}",
             },
             CompletionItem {
                 label: "match",
-                source_range: 210..210,
-                delete: 206..210,
+                source_range: 97..97,
+                delete: 93..97,
                 insert: "match bar {\n    Some(${1:_}) => {$2\\},\n    None => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: 210..210,
-                delete: 206..210,
+                source_range: 97..97,
+                delete: 93..97,
                 insert: "!bar",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: 210..210,
-                delete: 206..210,
+                source_range: 97..97,
+                delete: 93..97,
                 insert: "&bar",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: 210..210,
-                delete: 206..210,
+                source_range: 97..97,
+                delete: 93..97,
                 insert: "&mut bar",
                 detail: "&mut expr",
             },
             CompletionItem {
                 label: "while",
-                source_range: 210..210,
-                delete: 206..210,
+                source_range: 97..97,
+                delete: 93..97,
                 insert: "while let Some($1) = bar {\n    $0\n}",
                 detail: "while let Some {}",
             },
@@ -432,64 +432,64 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: 211..211,
-                delete: 207..211,
+                source_range: 98..98,
+                delete: 94..98,
                 insert: "Box::new(bar)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "call",
-                source_range: 211..211,
-                delete: 207..211,
+                source_range: 98..98,
+                delete: 94..98,
                 insert: "${1}(bar)",
                 detail: "function(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: 211..211,
-                delete: 207..211,
+                source_range: 98..98,
+                delete: 94..98,
                 insert: "dbg!(bar)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "ifl",
-                source_range: 211..211,
-                delete: 207..211,
+                source_range: 98..98,
+                delete: 94..98,
                 insert: "if let Ok($1) = bar {\n    $0\n}",
                 detail: "if let Ok {}",
             },
             CompletionItem {
                 label: "match",
-                source_range: 211..211,
-                delete: 207..211,
+                source_range: 98..98,
+                delete: 94..98,
                 insert: "match bar {\n    Ok(${1:_}) => {$2\\},\n    Err(${3:_}) => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: 211..211,
-                delete: 207..211,
+                source_range: 98..98,
+                delete: 94..98,
                 insert: "!bar",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: 211..211,
-                delete: 207..211,
+                source_range: 98..98,
+                delete: 94..98,
                 insert: "&bar",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: 211..211,
-                delete: 207..211,
+                source_range: 98..98,
+                delete: 94..98,
                 insert: "&mut bar",
                 detail: "&mut expr",
             },
             CompletionItem {
                 label: "while",
-                source_range: 211..211,
-                delete: 207..211,
+                source_range: 98..98,
+                delete: 94..98,
                 insert: "while let Ok($1) = bar {\n    $0\n}",
                 detail: "while let Ok {}",
             },
@@ -513,50 +513,50 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: 91..91,
-                delete: 87..91,
+                source_range: 42..42,
+                delete: 38..42,
                 insert: "Box::new(bar)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "call",
-                source_range: 91..91,
-                delete: 87..91,
+                source_range: 42..42,
+                delete: 38..42,
                 insert: "${1}(bar)",
                 detail: "function(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: 91..91,
-                delete: 87..91,
+                source_range: 42..42,
+                delete: 38..42,
                 insert: "dbg!(bar)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "match",
-                source_range: 91..91,
-                delete: 87..91,
+                source_range: 42..42,
+                delete: 38..42,
                 insert: "match bar {\n    ${1:_} => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: 91..91,
-                delete: 87..91,
+                source_range: 42..42,
+                delete: 38..42,
                 insert: "!bar",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: 91..91,
-                delete: 87..91,
+                source_range: 42..42,
+                delete: 38..42,
                 insert: "&bar",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: 91..91,
-                delete: 87..91,
+                source_range: 42..42,
+                delete: 38..42,
                 insert: "&mut bar",
                 detail: "&mut expr",
             },
@@ -579,50 +579,50 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: 52..52,
-                delete: 49..52,
+                source_range: 19..19,
+                delete: 16..19,
                 insert: "Box::new(42)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "call",
-                source_range: 52..52,
-                delete: 49..52,
+                source_range: 19..19,
+                delete: 16..19,
                 insert: "${1}(42)",
                 detail: "function(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: 52..52,
-                delete: 49..52,
+                source_range: 19..19,
+                delete: 16..19,
                 insert: "dbg!(42)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "match",
-                source_range: 52..52,
-                delete: 49..52,
+                source_range: 19..19,
+                delete: 16..19,
                 insert: "match 42 {\n    ${1:_} => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: 52..52,
-                delete: 49..52,
+                source_range: 19..19,
+                delete: 16..19,
                 insert: "!42",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: 52..52,
-                delete: 49..52,
+                source_range: 19..19,
+                delete: 16..19,
                 insert: "&42",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: 52..52,
-                delete: 49..52,
+                source_range: 19..19,
+                delete: 16..19,
                 insert: "&mut 42",
                 detail: "&mut expr",
             },
@@ -647,50 +647,50 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: 149..150,
-                delete: 145..150,
+                source_range: 84..85,
+                delete: 80..85,
                 insert: "Box::new(bar)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "call",
-                source_range: 149..150,
-                delete: 145..150,
+                source_range: 84..85,
+                delete: 80..85,
                 insert: "${1}(bar)",
                 detail: "function(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: 149..150,
-                delete: 145..150,
+                source_range: 84..85,
+                delete: 80..85,
                 insert: "dbg!(bar)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "match",
-                source_range: 149..150,
-                delete: 145..150,
+                source_range: 84..85,
+                delete: 80..85,
                 insert: "match bar {\n    ${1:_} => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: 149..150,
-                delete: 145..150,
+                source_range: 84..85,
+                delete: 80..85,
                 insert: "!bar",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: 149..150,
-                delete: 145..150,
+                source_range: 84..85,
+                delete: 80..85,
                 insert: "&bar",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: 149..150,
-                delete: 145..150,
+                source_range: 84..85,
+                delete: 80..85,
                 insert: "&mut bar",
                 detail: "&mut expr",
             },
@@ -713,50 +713,50 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: 56..56,
-                delete: 49..56,
+                source_range: 23..23,
+                delete: 16..23,
                 insert: "Box::new(&&&&42)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "call",
-                source_range: 56..56,
-                delete: 49..56,
+                source_range: 23..23,
+                delete: 16..23,
                 insert: "${1}(&&&&42)",
                 detail: "function(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: 56..56,
-                delete: 49..56,
+                source_range: 23..23,
+                delete: 16..23,
                 insert: "dbg!(&&&&42)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "match",
-                source_range: 56..56,
-                delete: 49..56,
+                source_range: 23..23,
+                delete: 16..23,
                 insert: "match &&&&42 {\n    ${1:_} => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: 56..56,
-                delete: 53..56,
+                source_range: 23..23,
+                delete: 20..23,
                 insert: "!42",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: 56..56,
-                delete: 53..56,
+                source_range: 23..23,
+                delete: 20..23,
                 insert: "&42",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: 56..56,
-                delete: 53..56,
+                source_range: 23..23,
+                delete: 20..23,
                 insert: "&mut 42",
                 detail: "&mut expr",
             },
diff --git a/crates/ra_ide/src/completion/complete_qualified_path.rs b/crates/ra_ide/src/completion/complete_qualified_path.rs
index d3a1cbc1d..f133ce3ce 100644
--- a/crates/ra_ide/src/completion/complete_qualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_qualified_path.rs
@@ -212,8 +212,8 @@ mod tests {
         [
             CompletionItem {
                 label: "my",
-                source_range: 27..29,
-                delete: 27..29,
+                source_range: 10..12,
+                delete: 10..12,
                 insert: "my",
                 kind: Module,
                 documentation: Documentation(
@@ -243,8 +243,8 @@ mod tests {
         [
             CompletionItem {
                 label: "Bar",
-                source_range: 31..31,
-                delete: 31..31,
+                source_range: 14..14,
+                delete: 14..14,
                 insert: "Bar",
                 kind: Struct,
             },
@@ -271,15 +271,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: 31..31,
-                delete: 31..31,
+                source_range: 14..14,
+                delete: 14..14,
                 insert: "Foo",
                 kind: Struct,
             },
             CompletionItem {
                 label: "PublicBar",
-                source_range: 31..31,
-                delete: 31..31,
+                source_range: 14..14,
+                delete: 14..14,
                 insert: "PublicBar",
                 kind: Struct,
             },
@@ -304,8 +304,8 @@ mod tests {
         [
             CompletionItem {
                 label: "Bar",
-                source_range: 30..30,
-                delete: 30..30,
+                source_range: 13..13,
+                delete: 13..13,
                 insert: "Bar",
                 kind: Struct,
             },
@@ -1145,8 +1145,8 @@ mod tests {
         [
             CompletionItem {
                 label: "bar()",
-                source_range: 185..185,
-                delete: 185..185,
+                source_range: 88..88,
+                delete: 88..88,
                 insert: "bar()$0",
                 kind: Function,
                 lookup: "bar",
@@ -1154,8 +1154,8 @@ mod tests {
             },
             CompletionItem {
                 label: "foo()",
-                source_range: 185..185,
-                delete: 185..185,
+                source_range: 88..88,
+                delete: 88..88,
                 insert: "foo()$0",
                 kind: Function,
                 lookup: "foo",
@@ -1185,16 +1185,16 @@ mod tests {
         [
             CompletionItem {
                 label: "foo!(…)",
-                source_range: 179..179,
-                delete: 179..179,
+                source_range: 82..82,
+                delete: 82..82,
                 insert: "foo!($0)",
                 kind: Macro,
                 detail: "#[macro_export]\nmacro_rules! foo",
             },
             CompletionItem {
                 label: "main()",
-                source_range: 179..179,
-                delete: 179..179,
+                source_range: 82..82,
+                delete: 82..82,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -1230,22 +1230,22 @@ mod tests {
         [
             CompletionItem {
                 label: "RIGHT_CONST",
-                source_range: 57..57,
-                delete: 57..57,
+                source_range: 24..24,
+                delete: 24..24,
                 insert: "RIGHT_CONST",
                 kind: Const,
             },
             CompletionItem {
                 label: "RightType",
-                source_range: 57..57,
-                delete: 57..57,
+                source_range: 24..24,
+                delete: 24..24,
                 insert: "RightType",
                 kind: Struct,
             },
             CompletionItem {
                 label: "right_fn()",
-                source_range: 57..57,
-                delete: 57..57,
+                source_range: 24..24,
+                delete: 24..24,
                 insert: "right_fn()$0",
                 kind: Function,
                 lookup: "right_fn",
@@ -1269,8 +1269,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo()",
-                source_range: 93..94,
-                delete: 93..94,
+                source_range: 60..61,
+                delete: 60..61,
                 insert: "foo()$0",
                 kind: Function,
                 lookup: "foo",
@@ -1278,8 +1278,8 @@ mod tests {
             },
             CompletionItem {
                 label: "main()",
-                source_range: 93..94,
-                delete: 93..94,
+                source_range: 60..61,
+                delete: 60..61,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -1308,15 +1308,15 @@ mod tests {
         [
             CompletionItem {
                 label: "z",
-                source_range: 57..57,
-                delete: 57..57,
+                source_range: 24..24,
+                delete: 24..24,
                 insert: "z",
                 kind: Module,
             },
             CompletionItem {
                 label: "z()",
-                source_range: 57..57,
-                delete: 57..57,
+                source_range: 24..24,
+                delete: 24..24,
                 insert: "z()$0",
                 kind: Function,
                 lookup: "z",
@@ -1347,8 +1347,8 @@ mod tests {
         [
             CompletionItem {
                 label: "new()",
-                source_range: 292..292,
-                delete: 292..292,
+                source_range: 179..179,
+                delete: 179..179,
                 insert: "new()$0",
                 kind: Function,
                 lookup: "new",
diff --git a/crates/ra_ide/src/completion/complete_record.rs b/crates/ra_ide/src/completion/complete_record.rs
index b7ab654c5..13eb2f79f 100644
--- a/crates/ra_ide/src/completion/complete_record.rs
+++ b/crates/ra_ide/src/completion/complete_record.rs
@@ -41,17 +41,17 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "foo",
-                source_range: 117..118,
-                delete: 117..118,
-                insert: "foo",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "foo",
+                    source_range: 68..69,
+                    delete: 68..69,
+                    insert: "foo",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
 
         #[test]
@@ -70,25 +70,25 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "bar",
-                source_range: 161..161,
-                delete: 161..161,
-                insert: "bar",
-                kind: Field,
-                detail: "()",
-            },
-            CompletionItem {
-                label: "foo",
-                source_range: 161..161,
-                delete: 161..161,
-                insert: "foo",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "bar",
+                    source_range: 88..88,
+                    delete: 88..88,
+                    insert: "bar",
+                    kind: Field,
+                    detail: "()",
+                },
+                CompletionItem {
+                    label: "foo",
+                    source_range: 88..88,
+                    delete: 88..88,
+                    insert: "foo",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
 
         #[test]
@@ -106,17 +106,17 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "foo",
-                source_range: 171..172,
-                delete: 171..172,
-                insert: "foo",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "foo",
+                    source_range: 110..111,
+                    delete: 110..111,
+                    insert: "foo",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
 
         #[test]
@@ -142,25 +142,25 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "bar",
-                source_range: 372..372,
-                delete: 372..372,
-                insert: "bar",
-                kind: Field,
-                detail: "u32",
-            },
-            CompletionItem {
-                label: "baz",
-                source_range: 372..372,
-                delete: 372..372,
-                insert: "baz",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "bar",
+                    source_range: 203..203,
+                    delete: 203..203,
+                    insert: "bar",
+                    kind: Field,
+                    detail: "u32",
+                },
+                CompletionItem {
+                    label: "baz",
+                    source_range: 203..203,
+                    delete: 203..203,
+                    insert: "baz",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
     }
 
@@ -187,18 +187,18 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "the_field",
-                source_range: 142..145,
-                delete: 142..145,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-                deprecated: true,
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "the_field",
+                    source_range: 69..72,
+                    delete: 69..72,
+                    insert: "the_field",
+                    kind: Field,
+                    detail: "u32",
+                    deprecated: true,
+                },
+            ]
+            "###);
         }
 
         #[test]
@@ -212,17 +212,17 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "the_field",
-                source_range: 83..86,
-                delete: 83..86,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "the_field",
+                    source_range: 46..49,
+                    delete: 46..49,
+                    insert: "the_field",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
 
         #[test]
@@ -238,17 +238,17 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "a",
-                source_range: 119..119,
-                delete: 119..119,
-                insert: "a",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "a",
+                    source_range: 58..58,
+                    delete: 58..58,
+                    insert: "a",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
 
         #[test]
@@ -264,17 +264,17 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "b",
-                source_range: 119..119,
-                delete: 119..119,
-                insert: "b",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "b",
+                    source_range: 70..70,
+                    delete: 70..70,
+                    insert: "b",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
 
         #[test]
@@ -289,17 +289,17 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "a",
-                source_range: 93..93,
-                delete: 93..93,
-                insert: "a",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "a",
+                    source_range: 56..56,
+                    delete: 56..56,
+                    insert: "a",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
 
         #[test]
@@ -314,17 +314,17 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "the_field",
-                source_range: 137..140,
-                delete: 137..140,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "the_field",
+                    source_range: 88..91,
+                    delete: 88..91,
+                    insert: "the_field",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
 
         #[test]
@@ -349,25 +349,25 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "bar",
-                source_range: 302..302,
-                delete: 302..302,
-                insert: "bar",
-                kind: Field,
-                detail: "u32",
-            },
-            CompletionItem {
-                label: "baz",
-                source_range: 302..302,
-                delete: 302..302,
-                insert: "baz",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "bar",
+                    source_range: 157..157,
+                    delete: 157..157,
+                    insert: "bar",
+                    kind: Field,
+                    detail: "u32",
+                },
+                CompletionItem {
+                    label: "baz",
+                    source_range: 157..157,
+                    delete: 157..157,
+                    insert: "baz",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
 
         #[test]
@@ -390,17 +390,17 @@ mod tests {
             ",
             );
             assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "foo2",
-                source_range: 221..221,
-                delete: 221..221,
-                insert: "foo2",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###);
+            [
+                CompletionItem {
+                    label: "foo2",
+                    source_range: 112..112,
+                    delete: 112..112,
+                    insert: "foo2",
+                    kind: Field,
+                    detail: "u32",
+                },
+            ]
+            "###);
         }
     }
 }
diff --git a/crates/ra_ide/src/completion/complete_snippet.rs b/crates/ra_ide/src/completion/complete_snippet.rs
index 0568d9ccf..52aaa70f0 100644
--- a/crates/ra_ide/src/completion/complete_snippet.rs
+++ b/crates/ra_ide/src/completion/complete_snippet.rs
@@ -129,31 +129,31 @@ mod tests {
         [
             CompletionItem {
                 label: "Test function",
-                source_range: 78..78,
-                delete: 78..78,
+                source_range: 29..29,
+                delete: 29..29,
                 insert: "#[test]\nfn ${1:feature}() {\n    $0\n}",
                 kind: Snippet,
                 lookup: "tfn",
             },
             CompletionItem {
                 label: "Test module",
-                source_range: 78..78,
-                delete: 78..78,
+                source_range: 29..29,
+                delete: 29..29,
                 insert: "#[cfg(test)]\nmod tests {\n    use super::*;\n\n    #[test]\n    fn ${1:test_name}() {\n        $0\n    }\n}",
                 kind: Snippet,
                 lookup: "tmod",
             },
             CompletionItem {
                 label: "macro_rules",
-                source_range: 78..78,
-                delete: 78..78,
+                source_range: 29..29,
+                delete: 29..29,
                 insert: "macro_rules! $1 {\n\t($2) => {\n\t\t$0\n\t};\n}",
                 kind: Snippet,
             },
             CompletionItem {
                 label: "pub(crate)",
-                source_range: 78..78,
-                delete: 78..78,
+                source_range: 29..29,
+                delete: 29..29,
                 insert: "pub(crate) $0",
                 kind: Snippet,
             },
diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs
index 21c9316e6..23e42928d 100644
--- a/crates/ra_ide/src/completion/complete_trait_impl.rs
+++ b/crates/ra_ide/src/completion/complete_trait_impl.rs
@@ -256,24 +256,24 @@ mod tests {
         [
             CompletionItem {
                 label: "const TEST_CONST: u16 = ",
-                source_range: 209..210,
-                delete: 209..210,
+                source_range: 112..113,
+                delete: 112..113,
                 insert: "const TEST_CONST: u16 = ",
                 kind: Const,
                 lookup: "TEST_CONST",
             },
             CompletionItem {
                 label: "fn test()",
-                source_range: 209..210,
-                delete: 209..210,
+                source_range: 112..113,
+                delete: 112..113,
                 insert: "fn test() {\n    $0\n}",
                 kind: Function,
                 lookup: "test",
             },
             CompletionItem {
                 label: "type TestType = ",
-                source_range: 209..210,
-                delete: 209..210,
+                source_range: 112..113,
+                delete: 112..113,
                 insert: "type TestType = ",
                 kind: TypeAlias,
                 lookup: "TestType",
@@ -322,8 +322,8 @@ mod tests {
         [
             CompletionItem {
                 label: "fn test()",
-                source_range: 139..140,
-                delete: 139..140,
+                source_range: 66..67,
+                delete: 66..67,
                 insert: "fn test() {\n    $0\n}",
                 kind: Function,
                 lookup: "test",
@@ -351,8 +351,8 @@ mod tests {
         [
             CompletionItem {
                 label: "fn foo()",
-                source_range: 141..142,
-                delete: 138..142,
+                source_range: 68..69,
+                delete: 65..69,
                 insert: "fn foo() {\n    $0\n}",
                 kind: Function,
                 lookup: "foo",
@@ -383,8 +383,8 @@ mod tests {
         [
             CompletionItem {
                 label: "fn foo_bar()",
-                source_range: 200..201,
-                delete: 197..201,
+                source_range: 103..104,
+                delete: 100..104,
                 insert: "fn foo_bar() {\n    $0\n}",
                 kind: Function,
                 lookup: "foo_bar",
@@ -434,8 +434,8 @@ mod tests {
         [
             CompletionItem {
                 label: "fn foo()",
-                source_range: 144..145,
-                delete: 141..145,
+                source_range: 71..72,
+                delete: 68..72,
                 insert: "fn foo<T>() {\n    $0\n}",
                 kind: Function,
                 lookup: "foo",
@@ -463,8 +463,8 @@ mod tests {
         [
             CompletionItem {
                 label: "fn foo()",
-                source_range: 166..167,
-                delete: 163..167,
+                source_range: 93..94,
+                delete: 90..94,
                 insert: "fn foo<T>()\nwhere T: Into<String> {\n    $0\n}",
                 kind: Function,
                 lookup: "foo",
@@ -490,8 +490,8 @@ mod tests {
         [
             CompletionItem {
                 label: "type SomeType = ",
-                source_range: 124..125,
-                delete: 119..125,
+                source_range: 63..64,
+                delete: 58..64,
                 insert: "type SomeType = ",
                 kind: TypeAlias,
                 lookup: "SomeType",
@@ -517,8 +517,8 @@ mod tests {
         [
             CompletionItem {
                 label: "const SOME_CONST: u16 = ",
-                source_range: 133..134,
-                delete: 127..134,
+                source_range: 72..73,
+                delete: 66..73,
                 insert: "const SOME_CONST: u16 = ",
                 kind: Const,
                 lookup: "SOME_CONST",
@@ -544,8 +544,8 @@ mod tests {
         [
             CompletionItem {
                 label: "const SOME_CONST: u16 = ",
-                source_range: 138..139,
-                delete: 132..139,
+                source_range: 77..78,
+                delete: 71..78,
                 insert: "const SOME_CONST: u16 = ",
                 kind: Const,
                 lookup: "SOME_CONST",
diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index aa2b07a2f..a0a04bb58 100644
--- a/crates/ra_ide/src/completion/complete_unqualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -85,15 +85,15 @@ mod tests {
                 "#,
             ),
             @r###"
-            [
-                CompletionItem {
-                    label: "collections",
-                    source_range: 21..24,
-                    delete: 21..24,
-                    insert: "collections",
-                },
-            ]
-            "###
+        [
+            CompletionItem {
+                label: "collections",
+                source_range: 4..7,
+                delete: 4..7,
+                insert: "collections",
+            },
+        ]
+        "###
         );
     }
 
@@ -157,16 +157,16 @@ mod tests {
                 "
             ),
             @r###"
-            [
-                CompletionItem {
-                    label: "Enum",
-                    source_range: 231..233,
-                    delete: 231..233,
-                    insert: "Enum",
-                    kind: Enum,
-                },
-            ]
-            "###
+        [
+            CompletionItem {
+                label: "Enum",
+                source_range: 102..104,
+                delete: 102..104,
+                insert: "Enum",
+                kind: Enum,
+            },
+        ]
+        "###
         );
     }
 
@@ -186,8 +186,8 @@ mod tests {
         [
             CompletionItem {
                 label: "quux(…)",
-                source_range: 91..91,
-                delete: 91..91,
+                source_range: 42..42,
+                delete: 42..42,
                 insert: "quux(${1:x})$0",
                 kind: Function,
                 lookup: "quux",
@@ -196,16 +196,16 @@ mod tests {
             },
             CompletionItem {
                 label: "x",
-                source_range: 91..91,
-                delete: 91..91,
+                source_range: 42..42,
+                delete: 42..42,
                 insert: "x",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "y",
-                source_range: 91..91,
-                delete: 91..91,
+                source_range: 42..42,
+                delete: 42..42,
                 insert: "y",
                 kind: Binding,
                 detail: "i32",
@@ -235,23 +235,23 @@ mod tests {
         [
             CompletionItem {
                 label: "a",
-                source_range: 242..242,
-                delete: 242..242,
+                source_range: 129..129,
+                delete: 129..129,
                 insert: "a",
                 kind: Binding,
             },
             CompletionItem {
                 label: "b",
-                source_range: 242..242,
-                delete: 242..242,
+                source_range: 129..129,
+                delete: 129..129,
                 insert: "b",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "quux()",
-                source_range: 242..242,
-                delete: 242..242,
+                source_range: 129..129,
+                delete: 129..129,
                 insert: "quux()$0",
                 kind: Function,
                 lookup: "quux",
@@ -278,8 +278,8 @@ mod tests {
         [
             CompletionItem {
                 label: "quux()",
-                source_range: 95..95,
-                delete: 95..95,
+                source_range: 46..46,
+                delete: 46..46,
                 insert: "quux()$0",
                 kind: Function,
                 lookup: "quux",
@@ -287,8 +287,8 @@ mod tests {
             },
             CompletionItem {
                 label: "x",
-                source_range: 95..95,
-                delete: 95..95,
+                source_range: 46..46,
+                delete: 46..46,
                 insert: "x",
                 kind: Binding,
             },
@@ -314,15 +314,15 @@ mod tests {
         [
             CompletionItem {
                 label: "index",
-                source_range: 107..107,
-                delete: 107..107,
+                source_range: 58..58,
+                delete: 58..58,
                 insert: "index",
                 kind: Binding,
             },
             CompletionItem {
                 label: "test()",
-                source_range: 107..107,
-                delete: 107..107,
+                source_range: 58..58,
+                delete: 58..58,
                 insert: "test()$0",
                 kind: Function,
                 lookup: "test",
@@ -347,15 +347,15 @@ mod tests {
         [
             CompletionItem {
                 label: "T",
-                source_range: 52..52,
-                delete: 52..52,
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "T",
                 kind: TypeParam,
             },
             CompletionItem {
                 label: "quux()",
-                source_range: 52..52,
-                delete: 52..52,
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "quux()$0",
                 kind: Function,
                 lookup: "quux",
@@ -380,22 +380,22 @@ mod tests {
         [
             CompletionItem {
                 label: "Self",
-                source_range: 54..54,
-                delete: 54..54,
+                source_range: 21..21,
+                delete: 21..21,
                 insert: "Self",
                 kind: TypeParam,
             },
             CompletionItem {
                 label: "T",
-                source_range: 54..54,
-                delete: 54..54,
+                source_range: 21..21,
+                delete: 21..21,
                 insert: "T",
                 kind: TypeParam,
             },
             CompletionItem {
                 label: "X<…>",
-                source_range: 54..54,
-                delete: 54..54,
+                source_range: 21..21,
+                delete: 21..21,
                 insert: "X<$0>",
                 kind: Struct,
                 lookup: "X",
@@ -419,15 +419,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Self",
-                source_range: 48..48,
-                delete: 48..48,
+                source_range: 15..15,
+                delete: 15..15,
                 insert: "Self",
                 kind: TypeParam,
             },
             CompletionItem {
                 label: "X",
-                source_range: 48..48,
-                delete: 48..48,
+                source_range: 15..15,
+                delete: 15..15,
                 insert: "X",
                 kind: Enum,
             },
@@ -452,22 +452,22 @@ mod tests {
         [
             CompletionItem {
                 label: "Baz",
-                source_range: 105..105,
-                delete: 105..105,
+                source_range: 40..40,
+                delete: 40..40,
                 insert: "Baz",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Foo",
-                source_range: 105..105,
-                delete: 105..105,
+                source_range: 40..40,
+                delete: 40..40,
                 insert: "Foo",
                 kind: Struct,
             },
             CompletionItem {
                 label: "quux()",
-                source_range: 105..105,
-                delete: 105..105,
+                source_range: 40..40,
+                delete: 40..40,
                 insert: "quux()$0",
                 kind: Function,
                 lookup: "quux",
@@ -520,15 +520,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Bar",
-                source_range: 117..117,
-                delete: 117..117,
+                source_range: 52..52,
+                delete: 52..52,
                 insert: "Bar",
                 kind: Struct,
             },
             CompletionItem {
                 label: "quux()",
-                source_range: 117..117,
-                delete: 117..117,
+                source_range: 52..52,
+                delete: 52..52,
                 insert: "quux()$0",
                 kind: Function,
                 lookup: "quux",
@@ -552,15 +552,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: 55..55,
-                delete: 55..55,
+                source_range: 22..22,
+                delete: 22..22,
                 insert: "Foo",
                 kind: Struct,
             },
             CompletionItem {
                 label: "x()",
-                source_range: 55..55,
-                delete: 55..55,
+                source_range: 22..22,
+                delete: 22..22,
                 insert: "x()$0",
                 kind: Function,
                 lookup: "x",
@@ -589,16 +589,16 @@ mod tests {
         [
             CompletionItem {
                 label: "bar",
-                source_range: 146..146,
-                delete: 146..146,
+                source_range: 65..65,
+                delete: 65..65,
                 insert: "bar",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "foo()",
-                source_range: 146..146,
-                delete: 146..146,
+                source_range: 65..65,
+                delete: 65..65,
                 insert: "foo()$0",
                 kind: Function,
                 lookup: "foo",
@@ -1001,16 +1001,16 @@ mod tests {
         [
             CompletionItem {
                 label: "m!(…)",
-                source_range: 145..145,
-                delete: 145..145,
+                source_range: 80..80,
+                delete: 80..80,
                 insert: "m!($0)",
                 kind: Macro,
                 detail: "macro_rules! m",
             },
             CompletionItem {
                 label: "quux(…)",
-                source_range: 145..145,
-                delete: 145..145,
+                source_range: 80..80,
+                delete: 80..80,
                 insert: "quux(${1:x})$0",
                 kind: Function,
                 lookup: "quux",
@@ -1019,16 +1019,16 @@ mod tests {
             },
             CompletionItem {
                 label: "x",
-                source_range: 145..145,
-                delete: 145..145,
+                source_range: 80..80,
+                delete: 80..80,
                 insert: "x",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "y",
-                source_range: 145..145,
-                delete: 145..145,
+                source_range: 80..80,
+                delete: 80..80,
                 insert: "y",
                 kind: Binding,
                 detail: "i32",
@@ -1054,16 +1054,16 @@ mod tests {
         [
             CompletionItem {
                 label: "m!(…)",
-                source_range: 145..146,
-                delete: 145..146,
+                source_range: 80..81,
+                delete: 80..81,
                 insert: "m!($0)",
                 kind: Macro,
                 detail: "macro_rules! m",
             },
             CompletionItem {
                 label: "quux(…)",
-                source_range: 145..146,
-                delete: 145..146,
+                source_range: 80..81,
+                delete: 80..81,
                 insert: "quux(${1:x})$0",
                 kind: Function,
                 lookup: "quux",
@@ -1072,16 +1072,16 @@ mod tests {
             },
             CompletionItem {
                 label: "x",
-                source_range: 145..146,
-                delete: 145..146,
+                source_range: 80..81,
+                delete: 80..81,
                 insert: "x",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "y",
-                source_range: 145..146,
-                delete: 145..146,
+                source_range: 80..81,
+                delete: 80..81,
                 insert: "y",
                 kind: Binding,
                 detail: "i32",
@@ -1107,16 +1107,16 @@ mod tests {
         [
             CompletionItem {
                 label: "m!(…)",
-                source_range: 145..146,
-                delete: 145..146,
+                source_range: 80..81,
+                delete: 80..81,
                 insert: "m!($0)",
                 kind: Macro,
                 detail: "macro_rules! m",
             },
             CompletionItem {
                 label: "quux(…)",
-                source_range: 145..146,
-                delete: 145..146,
+                source_range: 80..81,
+                delete: 80..81,
                 insert: "quux(${1:x})$0",
                 kind: Function,
                 lookup: "quux",
@@ -1125,16 +1125,16 @@ mod tests {
             },
             CompletionItem {
                 label: "x",
-                source_range: 145..146,
-                delete: 145..146,
+                source_range: 80..81,
+                delete: 80..81,
                 insert: "x",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "y",
-                source_range: 145..146,
-                delete: 145..146,
+                source_range: 80..81,
+                delete: 80..81,
                 insert: "y",
                 kind: Binding,
                 detail: "i32",
@@ -1160,14 +1160,14 @@ mod tests {
         [
             CompletionItem {
                 label: "Quux",
-                source_range: 82..82,
-                delete: 82..82,
+                source_range: 33..33,
+                delete: 33..33,
                 insert: "Quux",
             },
             CompletionItem {
                 label: "main()",
-                source_range: 82..82,
-                delete: 82..82,
+                source_range: 33..33,
+                delete: 33..33,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -1201,15 +1201,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: 248..250,
-                delete: 248..250,
+                source_range: 103..105,
+                delete: 103..105,
                 insert: "Foo",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Foo::Bar",
-                source_range: 248..250,
-                delete: 248..250,
+                source_range: 103..105,
+                delete: 103..105,
                 insert: "Foo::Bar",
                 kind: EnumVariant,
                 lookup: "Bar",
@@ -1217,8 +1217,8 @@ mod tests {
             },
             CompletionItem {
                 label: "Foo::Baz",
-                source_range: 248..250,
-                delete: 248..250,
+                source_range: 103..105,
+                delete: 103..105,
                 insert: "Foo::Baz",
                 kind: EnumVariant,
                 lookup: "Baz",
@@ -1226,8 +1226,8 @@ mod tests {
             },
             CompletionItem {
                 label: "Foo::Quux",
-                source_range: 248..250,
-                delete: 248..250,
+                source_range: 103..105,
+                delete: 103..105,
                 insert: "Foo::Quux",
                 kind: EnumVariant,
                 lookup: "Quux",
@@ -1262,15 +1262,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: 219..221,
-                delete: 219..221,
+                source_range: 90..92,
+                delete: 90..92,
                 insert: "Foo",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Foo::Bar",
-                source_range: 219..221,
-                delete: 219..221,
+                source_range: 90..92,
+                delete: 90..92,
                 insert: "Foo::Bar",
                 kind: EnumVariant,
                 lookup: "Bar",
@@ -1278,8 +1278,8 @@ mod tests {
             },
             CompletionItem {
                 label: "Foo::Baz",
-                source_range: 219..221,
-                delete: 219..221,
+                source_range: 90..92,
+                delete: 90..92,
                 insert: "Foo::Baz",
                 kind: EnumVariant,
                 lookup: "Baz",
@@ -1287,8 +1287,8 @@ mod tests {
             },
             CompletionItem {
                 label: "Foo::Quux",
-                source_range: 219..221,
-                delete: 219..221,
+                source_range: 90..92,
+                delete: 90..92,
                 insert: "Foo::Quux",
                 kind: EnumVariant,
                 lookup: "Quux",
@@ -1319,15 +1319,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: 185..186,
-                delete: 185..186,
+                source_range: 72..73,
+                delete: 72..73,
                 insert: "Foo",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Foo::Bar",
-                source_range: 185..186,
-                delete: 185..186,
+                source_range: 72..73,
+                delete: 72..73,
                 insert: "Foo::Bar",
                 kind: EnumVariant,
                 lookup: "Bar",
@@ -1335,8 +1335,8 @@ mod tests {
             },
             CompletionItem {
                 label: "Foo::Baz",
-                source_range: 185..186,
-                delete: 185..186,
+                source_range: 72..73,
+                delete: 72..73,
                 insert: "Foo::Baz",
                 kind: EnumVariant,
                 lookup: "Baz",
@@ -1344,8 +1344,8 @@ mod tests {
             },
             CompletionItem {
                 label: "Foo::Quux",
-                source_range: 185..186,
-                delete: 185..186,
+                source_range: 72..73,
+                delete: 72..73,
                 insert: "Foo::Quux",
                 kind: EnumVariant,
                 lookup: "Quux",
@@ -1353,8 +1353,8 @@ mod tests {
             },
             CompletionItem {
                 label: "main()",
-                source_range: 185..186,
-                delete: 185..186,
+                source_range: 72..73,
+                delete: 72..73,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -1381,8 +1381,8 @@ mod tests {
         [
             CompletionItem {
                 label: "f()",
-                source_range: 98..99,
-                delete: 98..99,
+                source_range: 49..50,
+                delete: 49..50,
                 insert: "f()$0",
                 kind: Function,
                 lookup: "f",
@@ -1390,15 +1390,15 @@ mod tests {
             },
             CompletionItem {
                 label: "m",
-                source_range: 98..99,
-                delete: 98..99,
+                source_range: 49..50,
+                delete: 49..50,
                 insert: "m",
                 kind: Module,
             },
             CompletionItem {
                 label: "m::E::V",
-                source_range: 98..99,
-                delete: 98..99,
+                source_range: 49..50,
+                delete: 49..50,
                 insert: "m::E::V",
                 kind: EnumVariant,
                 lookup: "V",
diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index 61565c84f..4fdc2f0bb 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -491,13 +491,14 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: 121..123,
-                delete: 121..123,
+                source_range: 56..58,
+                delete: 56..58,
                 insert: "Foo",
                 kind: EnumVariant,
                 detail: "{ x: i32, y: i32 }",
             },
-        ]"###
+        ]
+        "###
         );
     }
 
@@ -517,15 +518,16 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo(…)",
-                source_range: 115..117,
-                delete: 115..117,
+                source_range: 50..52,
+                delete: 50..52,
                 insert: "Foo($0)",
                 kind: EnumVariant,
                 lookup: "Foo",
                 detail: "(i32, i32)",
                 trigger_call_info: true,
             },
-        ]"###
+        ]
+        "###
         );
     }
 
@@ -545,13 +547,14 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: 104..106,
-                delete: 104..106,
+                source_range: 39..41,
+                delete: 39..41,
                 insert: "Foo",
                 kind: EnumVariant,
                 detail: "()",
             },
-        ]"###
+        ]
+        "###
         );
     }
 
@@ -573,8 +576,8 @@ mod tests {
         [
             CompletionItem {
                 label: "main()",
-                source_range: 203..206,
-                delete: 203..206,
+                source_range: 122..125,
+                delete: 122..125,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -582,8 +585,8 @@ mod tests {
             },
             CompletionItem {
                 label: "something_deprecated()",
-                source_range: 203..206,
-                delete: 203..206,
+                source_range: 122..125,
+                delete: 122..125,
                 insert: "something_deprecated()$0",
                 kind: Function,
                 lookup: "something_deprecated",
@@ -592,8 +595,8 @@ mod tests {
             },
             CompletionItem {
                 label: "something_else_deprecated()",
-                source_range: 203..206,
-                delete: 203..206,
+                source_range: 122..125,
+                delete: 122..125,
                 insert: "something_else_deprecated()$0",
                 kind: Function,
                 lookup: "something_else_deprecated",
@@ -619,8 +622,8 @@ mod tests {
         [
             CompletionItem {
                 label: "main()",
-                source_range: 61..64,
-                delete: 61..64,
+                source_range: 28..31,
+                delete: 28..31,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -628,8 +631,8 @@ mod tests {
             },
             CompletionItem {
                 label: "no_args()",
-                source_range: 61..64,
-                delete: 61..64,
+                source_range: 28..31,
+                delete: 28..31,
                 insert: "no_args()$0",
                 kind: Function,
                 lookup: "no_args",
@@ -649,8 +652,8 @@ mod tests {
         [
             CompletionItem {
                 label: "main()",
-                source_range: 80..85,
-                delete: 80..85,
+                source_range: 47..52,
+                delete: 47..52,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -658,8 +661,8 @@ mod tests {
             },
             CompletionItem {
                 label: "with_args(…)",
-                source_range: 80..85,
-                delete: 80..85,
+                source_range: 47..52,
+                delete: 47..52,
                 insert: "with_args(${1:x}, ${2:y})$0",
                 kind: Function,
                 lookup: "with_args",
@@ -680,8 +683,8 @@ mod tests {
         [
             CompletionItem {
                 label: "main()",
-                source_range: 110..115,
-                delete: 110..115,
+                source_range: 77..82,
+                delete: 77..82,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -689,8 +692,8 @@ mod tests {
             },
             CompletionItem {
                 label: "with_ignored_args(…)",
-                source_range: 110..115,
-                delete: 110..115,
+                source_range: 77..82,
+                delete: 77..82,
                 insert: "with_ignored_args(${1:foo}, ${2:bar}, ${3:ho_ge_})$0",
                 kind: Function,
                 lookup: "with_ignored_args",
@@ -716,8 +719,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo()",
-                source_range: 163..164,
-                delete: 163..164,
+                source_range: 66..67,
+                delete: 66..67,
                 insert: "foo()$0",
                 kind: Method,
                 lookup: "foo",
@@ -742,8 +745,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo_ignored_args(…)",
-                source_range: 194..195,
-                delete: 194..195,
+                source_range: 97..98,
+                delete: 97..98,
                 insert: "foo_ignored_args(${1:a}, ${2:b})$0",
                 kind: Method,
                 lookup: "foo_ignored_args",
@@ -771,23 +774,23 @@ mod tests {
         [
             CompletionItem {
                 label: "None",
-                source_range: 144..147,
-                delete: 144..147,
+                source_range: 79..82,
+                delete: 79..82,
                 insert: "None",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Option",
-                source_range: 144..147,
-                delete: 144..147,
+                source_range: 79..82,
+                delete: 79..82,
                 insert: "Option",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Some(…)",
-                source_range: 144..147,
-                delete: 144..147,
+                source_range: 79..82,
+                delete: 79..82,
                 insert: "Some($0)",
                 kind: EnumVariant,
                 lookup: "Some",
@@ -796,8 +799,8 @@ mod tests {
             },
             CompletionItem {
                 label: "main()",
-                source_range: 144..147,
-                delete: 144..147,
+                source_range: 79..82,
+                delete: 79..82,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -822,23 +825,23 @@ mod tests {
         [
             CompletionItem {
                 label: "None",
-                source_range: 185..188,
-                delete: 185..188,
+                source_range: 104..107,
+                delete: 104..107,
                 insert: "None",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Option",
-                source_range: 185..188,
-                delete: 185..188,
+                source_range: 104..107,
+                delete: 104..107,
                 insert: "Option",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Some(…)",
-                source_range: 185..188,
-                delete: 185..188,
+                source_range: 104..107,
+                delete: 104..107,
                 insert: "Some($0)",
                 kind: EnumVariant,
                 lookup: "Some",
@@ -872,23 +875,23 @@ mod tests {
         [
             CompletionItem {
                 label: "ManualVtable",
-                source_range: 295..299,
-                delete: 295..299,
+                source_range: 182..186,
+                delete: 182..186,
                 insert: "ManualVtable",
                 kind: Struct,
             },
             CompletionItem {
                 label: "main",
-                source_range: 295..299,
-                delete: 295..299,
+                source_range: 182..186,
+                delete: 182..186,
                 insert: "main",
                 kind: Function,
                 detail: "fn main() -> ManualVtable",
             },
             CompletionItem {
                 label: "somefn",
-                source_range: 295..299,
-                delete: 295..299,
+                source_range: 182..186,
+                delete: 182..186,
                 insert: "somefn",
                 kind: Function,
                 detail: "fn somefn(with: u8, a: u8, lot: u8, of: u8, args: u8)",
@@ -916,8 +919,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo(…)",
-                source_range: 171..172,
-                delete: 171..172,
+                source_range: 74..75,
+                delete: 74..75,
                 insert: "foo(${1:x})$0",
                 kind: Method,
                 lookup: "foo",
@@ -951,8 +954,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo(…)",
-                source_range: 171..172,
-                delete: 171..172,
+                source_range: 74..75,
+                delete: 74..75,
                 insert: "foo($0)",
                 kind: Method,
                 lookup: "foo",
@@ -1062,16 +1065,16 @@ mod tests {
         [
             CompletionItem {
                 label: "Vec<…>",
-                source_range: 61..63,
-                delete: 61..63,
+                source_range: 28..30,
+                delete: 28..30,
                 insert: "Vec<$0>",
                 kind: Struct,
                 lookup: "Vec",
             },
             CompletionItem {
                 label: "foo(…)",
-                source_range: 61..63,
-                delete: 61..63,
+                source_range: 28..30,
+                delete: 28..30,
                 insert: "foo(${1:xs})$0",
                 kind: Function,
                 lookup: "foo",
@@ -1092,16 +1095,16 @@ mod tests {
         [
             CompletionItem {
                 label: "Vec<…>",
-                source_range: 64..66,
-                delete: 64..66,
+                source_range: 31..33,
+                delete: 31..33,
                 insert: "Vec<$0>",
                 kind: TypeAlias,
                 lookup: "Vec",
             },
             CompletionItem {
                 label: "foo(…)",
-                source_range: 64..66,
-                delete: 64..66,
+                source_range: 31..33,
+                delete: 31..33,
                 insert: "foo(${1:xs})$0",
                 kind: Function,
                 lookup: "foo",
@@ -1122,15 +1125,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Vec",
-                source_range: 68..70,
-                delete: 68..70,
+                source_range: 35..37,
+                delete: 35..37,
                 insert: "Vec",
                 kind: Struct,
             },
             CompletionItem {
                 label: "foo(…)",
-                source_range: 68..70,
-                delete: 68..70,
+                source_range: 35..37,
+                delete: 35..37,
                 insert: "foo(${1:xs})$0",
                 kind: Function,
                 lookup: "foo",
@@ -1151,15 +1154,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Vec",
-                source_range: 61..63,
-                delete: 61..63,
+                source_range: 28..30,
+                delete: 28..30,
                 insert: "Vec",
                 kind: Struct,
             },
             CompletionItem {
                 label: "foo(…)",
-                source_range: 61..63,
-                delete: 61..63,
+                source_range: 28..30,
+                delete: 28..30,
                 insert: "foo(${1:xs})$0",
                 kind: Function,
                 lookup: "foo",
@@ -1254,24 +1257,24 @@ mod tests {
         [
             CompletionItem {
                 label: "another_field",
-                source_range: 201..201,
-                delete: 201..201,
+                source_range: 136..136,
+                delete: 136..136,
                 insert: "another_field",
                 kind: Field,
                 detail: "i64",
             },
             CompletionItem {
                 label: "my_string",
-                source_range: 201..201,
-                delete: 201..201,
+                source_range: 136..136,
+                delete: 136..136,
                 insert: "my_string",
                 kind: Field,
                 detail: "{unknown}",
             },
             CompletionItem {
                 label: "the_field",
-                source_range: 201..201,
-                delete: 201..201,
+                source_range: 136..136,
+                delete: 136..136,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -1298,16 +1301,16 @@ mod tests {
         [
             CompletionItem {
                 label: "another_field",
-                source_range: 208..208,
-                delete: 208..208,
+                source_range: 143..143,
+                delete: 143..143,
                 insert: "another_field",
                 kind: Field,
                 detail: "i64",
             },
             CompletionItem {
                 label: "another_good_type",
-                source_range: 208..208,
-                delete: 208..208,
+                source_range: 143..143,
+                delete: 143..143,
                 insert: "another_good_type",
                 kind: Field,
                 detail: "u32",
@@ -1315,8 +1318,8 @@ mod tests {
             },
             CompletionItem {
                 label: "the_field",
-                source_range: 208..208,
-                delete: 208..208,
+                source_range: 143..143,
+                delete: 143..143,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -1346,16 +1349,16 @@ mod tests {
         [
             CompletionItem {
                 label: "another_field",
-                source_range: 270..270,
-                delete: 270..270,
+                source_range: 189..189,
+                delete: 189..189,
                 insert: "another_field",
                 kind: Field,
                 detail: "i64",
             },
             CompletionItem {
                 label: "another_good_type",
-                source_range: 270..270,
-                delete: 270..270,
+                source_range: 189..189,
+                delete: 189..189,
                 insert: "another_good_type",
                 kind: Field,
                 detail: "u32",
@@ -1363,8 +1366,8 @@ mod tests {
             },
             CompletionItem {
                 label: "the_field",
-                source_range: 270..270,
-                delete: 270..270,
+                source_range: 189..189,
+                delete: 189..189,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -1394,8 +1397,8 @@ mod tests {
         [
             CompletionItem {
                 label: "another_field",
-                source_range: 336..336,
-                delete: 336..336,
+                source_range: 239..239,
+                delete: 239..239,
                 insert: "another_field",
                 kind: Field,
                 detail: "i64",
@@ -1403,16 +1406,16 @@ mod tests {
             },
             CompletionItem {
                 label: "another_good_type",
-                source_range: 336..336,
-                delete: 336..336,
+                source_range: 239..239,
+                delete: 239..239,
                 insert: "another_good_type",
                 kind: Field,
                 detail: "u32",
             },
             CompletionItem {
                 label: "the_field",
-                source_range: 336..336,
-                delete: 336..336,
+                source_range: 239..239,
+                delete: 239..239,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -1441,16 +1444,16 @@ mod tests {
         [
             CompletionItem {
                 label: "another_field",
-                source_range: 328..328,
-                delete: 328..328,
+                source_range: 231..231,
+                delete: 231..231,
                 insert: "another_field",
                 kind: Field,
                 detail: "i64",
             },
             CompletionItem {
                 label: "another_good_type",
-                source_range: 328..328,
-                delete: 328..328,
+                source_range: 231..231,
+                delete: 231..231,
                 insert: "another_good_type",
                 kind: Field,
                 detail: "u32",
@@ -1458,8 +1461,8 @@ mod tests {
             },
             CompletionItem {
                 label: "the_field",
-                source_range: 328..328,
-                delete: 328..328,
+                source_range: 231..231,
+                delete: 231..231,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -1485,15 +1488,15 @@ mod tests {
         [
             CompletionItem {
                 label: "WorldSnapshot",
-                source_range: 132..133,
-                delete: 132..133,
+                source_range: 71..72,
+                delete: 71..72,
                 insert: "WorldSnapshot",
                 kind: Struct,
             },
             CompletionItem {
                 label: "go(…)",
-                source_range: 132..133,
-                delete: 132..133,
+                source_range: 71..72,
+                delete: 71..72,
                 insert: "go(${1:world})$0",
                 kind: Function,
                 lookup: "go",
@@ -1502,8 +1505,8 @@ mod tests {
             },
             CompletionItem {
                 label: "world",
-                source_range: 132..133,
-                delete: 132..133,
+                source_range: 71..72,
+                delete: 71..72,
                 insert: "world",
                 kind: Binding,
                 detail: "&WorldSnapshot",
diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs
index 1e16a43ca..a1b7c1193 100644
--- a/crates/ra_ide/src/completion/test_utils.rs
+++ b/crates/ra_ide/src/completion/test_utils.rs
@@ -2,7 +2,7 @@
 
 use crate::{
     completion::{completion_item::CompletionKind, CompletionConfig},
-    mock_analysis::{analysis_and_position, single_file_with_position},
+    mock_analysis::analysis_and_position,
     CompletionItem,
 };
 use hir::Semantics;
@@ -33,7 +33,7 @@ fn get_all_completion_items(code: &str, options: &CompletionConfig) -> Vec<Compl
     let (analysis, position) = if code.contains("//-") {
         analysis_and_position(code)
     } else {
-        single_file_with_position(code)
+        analysis_and_position(code)
     };
     analysis.completions(options, position).unwrap().unwrap().into()
 }
@@ -55,7 +55,7 @@ pub(crate) fn completion_list_with_options(
 }
 
 pub(crate) fn check_pattern_is_applicable(code: &str, check: fn(SyntaxElement) -> bool) {
-    let (analysis, pos) = single_file_with_position(code);
+    let (analysis, pos) = analysis_and_position(code);
     analysis
         .with_db(|db| {
             let sema = Semantics::new(db);
diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs
index 8cb0700b9..05fb799d6 100644
--- a/crates/ra_ide/src/diagnostics.rs
+++ b/crates/ra_ide/src/diagnostics.rs
@@ -348,8 +348,10 @@ mod tests {
         );
     }
 
-    fn check_apply_diagnostic_fix(before: &str, after: &str) {
-        let (analysis, file_id) = single_file(before);
+    fn check_apply_diagnostic_fix(ra_fixture_before: &str, ra_fixture_after: &str) {
+        let ra_fixture_after = &trim_indent(ra_fixture_after);
+        let (analysis, file_id) = single_file(ra_fixture_before);
+        let before = analysis.file_text(file_id).unwrap();
         let diagnostic = analysis.diagnostics(file_id).unwrap().pop().unwrap();
         let mut fix = diagnostic.fix.unwrap();
         let edit = fix.source_change.source_file_edits.pop().unwrap().edit;
@@ -358,7 +360,7 @@ mod tests {
             edit.apply(&mut actual);
             actual
         };
-        assert_eq_text!(after, &actual);
+        assert_eq_text!(ra_fixture_after, &actual);
     }
 
     /// Takes a multi-file input fixture with annotated cursor position and checks that no diagnostics
@@ -571,10 +573,9 @@ mod tests {
 
             impl Expr {
                 fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
-                    Expr::Bin { <|> }
+                    Expr::Bin { }
                 }
             }
-
         ";
         let after = r"
             enum Expr {
@@ -583,10 +584,9 @@ mod tests {
 
             impl Expr {
                 fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
-                    Expr::Bin { lhs: (), rhs: () <|> }
+                    Expr::Bin { lhs: (), rhs: () }
                 }
             }
-
         ";
         check_apply_diagnostic_fix(before, after);
     }
@@ -709,7 +709,7 @@ mod tests {
         [
             Diagnostic {
                 message: "Missing structure fields:\n- b\n",
-                range: 224..233,
+                range: 127..136,
                 severity: Error,
                 fix: Some(
                     Fix {
@@ -855,22 +855,22 @@ fn main() {
     fn test_add_field_from_usage() {
         check_apply_diagnostic_fix(
             r"
-            fn main() {
-                Foo { bar: 3, baz: false};
-            }
-            struct Foo {
-                bar: i32
-            }
-            ",
+fn main() {
+    Foo { bar: 3, baz: false};
+}
+struct Foo {
+    bar: i32
+}
+",
             r"
-            fn main() {
-                Foo { bar: 3, baz: false};
-            }
-            struct Foo {
-                bar: i32,
-                baz: bool
-            }
-            ",
+fn main() {
+    Foo { bar: 3, baz: false};
+}
+struct Foo {
+    bar: i32,
+    baz: bool
+}
+",
         )
     }
 }
diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs
index a4bc93cdb..8a6b3ea99 100644
--- a/crates/ra_ide/src/extend_selection.rs
+++ b/crates/ra_ide/src/extend_selection.rs
@@ -315,17 +315,15 @@ fn adj_comments(comment: &ast::Comment, dir: Direction) -> ast::Comment {
 
 #[cfg(test)]
 mod tests {
-    use test_utils::extract_offset;
-
-    use crate::mock_analysis::single_file;
+    use crate::mock_analysis::analysis_and_position;
 
     use super::*;
 
     fn do_check(before: &str, afters: &[&str]) {
-        let (cursor, before) = extract_offset(before);
-        let (analysis, file_id) = single_file(&before);
-        let range = TextRange::empty(cursor);
-        let mut frange = FileRange { file_id, range };
+        let (analysis, position) = analysis_and_position(&before);
+        let before = analysis.file_text(position.file_id).unwrap();
+        let range = TextRange::empty(position.offset);
+        let mut frange = FileRange { file_id: position.file_id, range };
 
         for &after in afters {
             frange.range = analysis.extend_selection(frange).unwrap();
diff --git a/crates/ra_ide/src/hover.rs b/crates/ra_ide/src/hover.rs
index a898f2e4a..c3e36a387 100644
--- a/crates/ra_ide/src/hover.rs
+++ b/crates/ra_ide/src/hover.rs
@@ -399,7 +399,7 @@ mod tests {
     use ra_db::FileLoader;
     use ra_syntax::TextRange;
 
-    use crate::mock_analysis::{analysis_and_position, single_file_with_position};
+    use crate::mock_analysis::analysis_and_position;
 
     fn trim_markup(s: &str) -> &str {
         s.trim_start_matches("```rust\n").trim_end_matches("\n```")
@@ -442,17 +442,17 @@ mod tests {
 
     #[test]
     fn hover_shows_type_of_an_expression() {
-        let (analysis, position) = single_file_with_position(
-            "
-            pub fn foo() -> u32 { 1 }
+        let (analysis, position) = analysis_and_position(
+            r#"
+pub fn foo() -> u32 { 1 }
 
-            fn main() {
-                let foo_test = foo()<|>;
-            }
-            ",
+fn main() {
+    let foo_test = foo()<|>;
+}
+"#,
         );
         let hover = analysis.hover(position).unwrap().unwrap();
-        assert_eq!(hover.range, TextRange::new(95.into(), 100.into()));
+        assert_eq!(hover.range, TextRange::new(58.into(), 63.into()));
         assert_eq!(trim_markup_opt(hover.info.first()), Some("u32"));
     }
 
@@ -641,7 +641,7 @@ fn main() {
 
     #[test]
     fn hover_some() {
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
             enum Option<T> { Some(T) }
             use Option::Some;
@@ -654,7 +654,7 @@ fn main() {
         let hover = analysis.hover(position).unwrap().unwrap();
         assert_eq!(trim_markup_opt(hover.info.first()), Some("Option\n```\n\n```rust\nSome"));
 
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
             enum Option<T> { Some(T) }
             use Option::Some;
@@ -720,21 +720,21 @@ The Some variant
 
     #[test]
     fn hover_for_local_variable() {
-        let (analysis, position) = single_file_with_position("fn func(foo: i32) { fo<|>o; }");
+        let (analysis, position) = analysis_and_position("fn func(foo: i32) { fo<|>o; }");
         let hover = analysis.hover(position).unwrap().unwrap();
         assert_eq!(trim_markup_opt(hover.info.first()), Some("i32"));
     }
 
     #[test]
     fn hover_for_local_variable_pat() {
-        let (analysis, position) = single_file_with_position("fn func(fo<|>o: i32) {}");
+        let (analysis, position) = analysis_and_position("fn func(fo<|>o: i32) {}");
         let hover = analysis.hover(position).unwrap().unwrap();
         assert_eq!(trim_markup_opt(hover.info.first()), Some("i32"));
     }
 
     #[test]
     fn hover_local_var_edge() {
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
 fn func(foo: i32) { if true { <|>foo; }; }
 ",
@@ -745,14 +745,14 @@ fn func(foo: i32) { if true { <|>foo; }; }
 
     #[test]
     fn hover_for_param_edge() {
-        let (analysis, position) = single_file_with_position("fn func(<|>foo: i32) {}");
+        let (analysis, position) = analysis_and_position("fn func(<|>foo: i32) {}");
         let hover = analysis.hover(position).unwrap().unwrap();
         assert_eq!(trim_markup_opt(hover.info.first()), Some("i32"));
     }
 
     #[test]
     fn test_hover_infer_associated_method_result() {
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
             struct Thing { x: u32 }
 
@@ -773,7 +773,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
 
     #[test]
     fn test_hover_infer_associated_method_exact() {
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
             mod wrapper {
                 struct Thing { x: u32 }
@@ -799,7 +799,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
 
     #[test]
     fn test_hover_infer_associated_const_in_pattern() {
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
             struct X;
             impl X {
@@ -821,7 +821,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
 
     #[test]
     fn test_hover_self() {
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
             struct Thing { x: u32 }
             impl Thing {
@@ -835,7 +835,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
         assert_eq!(trim_markup_opt(hover.info.first()), Some("Thing"));
 
         /* FIXME: revive these tests
-                let (analysis, position) = single_file_with_position(
+                let (analysis, position) = analysis_and_position(
                     "
                     struct Thing { x: u32 }
                     impl Thing {
@@ -849,7 +849,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
                 let hover = analysis.hover(position).unwrap().unwrap();
                 assert_eq!(trim_markup_opt(hover.info.first()), Some("Thing"));
 
-                let (analysis, position) = single_file_with_position(
+                let (analysis, position) = analysis_and_position(
                     "
                     enum Thing { A }
                     impl Thing {
@@ -862,7 +862,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
                 let hover = analysis.hover(position).unwrap().unwrap();
                 assert_eq!(trim_markup_opt(hover.info.first()), Some("enum Thing"));
 
-                let (analysis, position) = single_file_with_position(
+                let (analysis, position) = analysis_and_position(
                     "
                     enum Thing { A }
                     impl Thing {
@@ -878,7 +878,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
 
     #[test]
     fn test_hover_shadowing_pat() {
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
             fn x() {}
 
@@ -894,7 +894,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
 
     #[test]
     fn test_hover_macro_invocation() {
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
             macro_rules! foo {
                 () => {}
@@ -911,7 +911,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
 
     #[test]
     fn test_hover_tuple_field() {
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
             struct TS(String, i32<|>);
             ",
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 7eb2cef73..3fd08b1e8 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -363,16 +363,17 @@ mod tests {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: true, type_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
-                range: 106..107,
+                range: 69..70,
                 kind: ParameterHint,
                 label: "a",
             },
             InlayHint {
-                range: 109..110,
+                range: 72..73,
                 kind: ParameterHint,
                 label: "b",
             },
-        ]"###);
+        ]
+        "###);
     }
 
     #[test]
@@ -399,11 +400,12 @@ mod tests {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ type_hints: true, parameter_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
-                range: 97..99,
+                range: 60..62,
                 kind: TypeHint,
                 label: "i32",
             },
-        ]"###);
+        ]
+        "###);
     }
     #[test]
     fn default_generic_types_should_not_be_displayed() {
@@ -423,12 +425,12 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: 69..71,
+                range: 68..70,
                 kind: TypeHint,
                 label: "Test<i32>",
             },
             InlayHint {
-                range: 107..113,
+                range: 106..112,
                 kind: TypeHint,
                 label: "&Test<i32>",
             },
@@ -480,57 +482,57 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: 193..197,
+                range: 192..196,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 236..244,
+                range: 235..243,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 275..279,
+                range: 274..278,
                 kind: TypeHint,
                 label: "&str",
             },
             InlayHint {
-                range: 539..543,
+                range: 538..542,
                 kind: TypeHint,
                 label: "(i32, char)",
             },
             InlayHint {
-                range: 566..567,
+                range: 565..566,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 570..571,
+                range: 569..570,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 573..574,
+                range: 572..573,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 577..578,
+                range: 576..577,
                 kind: TypeHint,
                 label: "f64",
             },
             InlayHint {
-                range: 580..581,
+                range: 579..580,
                 kind: TypeHint,
                 label: "f64",
             },
             InlayHint {
-                range: 584..585,
+                range: 583..584,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 627..628,
+                range: 626..627,
                 kind: TypeHint,
                 label: "i32",
             },
@@ -560,47 +562,47 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: 21..30,
+                range: 20..29,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 57..66,
+                range: 56..65,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 115..123,
+                range: 114..122,
                 kind: TypeHint,
                 label: "|…| -> i32",
             },
             InlayHint {
-                range: 127..128,
+                range: 126..127,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 130..131,
+                range: 129..130,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 133..134,
+                range: 132..133,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 136..137,
+                range: 135..136,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 201..213,
+                range: 200..212,
                 kind: TypeHint,
                 label: "&|…| -> i32",
             },
             InlayHint {
-                range: 236..245,
+                range: 235..244,
                 kind: TypeHint,
                 label: "|| -> i32",
             },
@@ -624,12 +626,12 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: 21..30,
+                range: 20..29,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 44..53,
+                range: 43..52,
                 kind: TypeHint,
                 label: "i32",
             },
@@ -674,57 +676,57 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: 188..192,
+                range: 187..191,
                 kind: TypeHint,
                 label: "CustomOption<Test>",
             },
             InlayHint {
-                range: 267..271,
+                range: 266..270,
                 kind: TypeHint,
                 label: "&CustomOption<Test>",
             },
             InlayHint {
-                range: 300..304,
+                range: 299..303,
                 kind: TypeHint,
                 label: "&Test",
             },
             InlayHint {
-                range: 341..342,
+                range: 340..341,
                 kind: TypeHint,
                 label: "&CustomOption<u32>",
             },
             InlayHint {
-                range: 344..345,
+                range: 343..344,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: 387..388,
+                range: 386..387,
                 kind: TypeHint,
                 label: "&CustomOption<u32>",
             },
             InlayHint {
-                range: 393..394,
+                range: 392..393,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: 441..442,
+                range: 440..441,
                 kind: TypeHint,
                 label: "&u32",
             },
             InlayHint {
-                range: 448..449,
+                range: 447..448,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: 500..501,
+                range: 499..500,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: 543..544,
+                range: 542..543,
                 kind: TypeHint,
                 label: "&u8",
             },
@@ -769,57 +771,57 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: 188..192,
+                range: 187..191,
                 kind: TypeHint,
                 label: "CustomOption<Test>",
             },
             InlayHint {
-                range: 273..277,
+                range: 272..276,
                 kind: TypeHint,
                 label: "&CustomOption<Test>",
             },
             InlayHint {
-                range: 309..313,
+                range: 308..312,
                 kind: TypeHint,
                 label: "&Test",
             },
             InlayHint {
-                range: 353..354,
+                range: 352..353,
                 kind: TypeHint,
                 label: "&CustomOption<u32>",
             },
             InlayHint {
-                range: 356..357,
+                range: 355..356,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: 402..403,
+                range: 401..402,
                 kind: TypeHint,
                 label: "&CustomOption<u32>",
             },
             InlayHint {
-                range: 408..409,
+                range: 407..408,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: 459..460,
+                range: 458..459,
                 kind: TypeHint,
                 label: "&u32",
             },
             InlayHint {
-                range: 466..467,
+                range: 465..466,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: 521..522,
+                range: 520..521,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: 567..568,
+                range: 566..567,
                 kind: TypeHint,
                 label: "&u8",
             },
@@ -864,52 +866,52 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: 252..256,
+                range: 251..255,
                 kind: TypeHint,
                 label: "CustomOption<Test>",
             },
             InlayHint {
-                range: 277..281,
+                range: 276..280,
                 kind: TypeHint,
                 label: "Test",
             },
             InlayHint {
-                range: 310..311,
+                range: 309..310,
                 kind: TypeHint,
                 label: "CustomOption<u32>",
             },
             InlayHint {
-                range: 313..314,
+                range: 312..313,
                 kind: TypeHint,
                 label: "u8",
             },
             InlayHint {
-                range: 348..349,
+                range: 347..348,
                 kind: TypeHint,
                 label: "CustomOption<u32>",
             },
             InlayHint {
-                range: 354..355,
+                range: 353..354,
                 kind: TypeHint,
                 label: "u8",
             },
             InlayHint {
-                range: 394..395,
+                range: 393..394,
                 kind: TypeHint,
                 label: "u32",
             },
             InlayHint {
-                range: 401..402,
+                range: 400..401,
                 kind: TypeHint,
                 label: "u8",
             },
             InlayHint {
-                range: 445..446,
+                range: 444..445,
                 kind: TypeHint,
                 label: "u8",
             },
             InlayHint {
-                range: 480..481,
+                range: 479..480,
                 kind: TypeHint,
                 label: "u8",
             },
@@ -936,17 +938,17 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig { max_length: Some(8), ..Default::default() }).unwrap(), @r###"
         [
             InlayHint {
-                range: 74..75,
+                range: 73..74,
                 kind: TypeHint,
                 label: "Smol<u32>",
             },
             InlayHint {
-                range: 98..99,
+                range: 97..98,
                 kind: TypeHint,
                 label: "VeryLongOuterName<…>",
             },
             InlayHint {
-                range: 137..138,
+                range: 136..137,
                 kind: TypeHint,
                 label: "Smol<Smol<…>>",
             },
@@ -1024,77 +1026,77 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: 798..809,
+                range: 797..808,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: 842..843,
+                range: 841..842,
                 kind: ParameterHint,
                 label: "foo",
             },
             InlayHint {
-                range: 845..846,
+                range: 844..845,
                 kind: ParameterHint,
                 label: "bar",
             },
             InlayHint {
-                range: 848..855,
+                range: 847..854,
                 kind: ParameterHint,
                 label: "msg",
             },
             InlayHint {
-                range: 860..871,
+                range: 859..870,
                 kind: ParameterHint,
                 label: "last",
             },
             InlayHint {
-                range: 914..917,
+                range: 913..916,
                 kind: ParameterHint,
                 label: "param",
             },
             InlayHint {
-                range: 937..939,
+                range: 936..938,
                 kind: ParameterHint,
                 label: "&self",
             },
             InlayHint {
-                range: 941..945,
+                range: 940..944,
                 kind: ParameterHint,
                 label: "param",
             },
             InlayHint {
-                range: 980..989,
+                range: 979..988,
                 kind: ParameterHint,
                 label: "file_id",
             },
             InlayHint {
-                range: 999..1012,
+                range: 998..1011,
                 kind: ParameterHint,
                 label: "name",
             },
             InlayHint {
-                range: 1022..1026,
+                range: 1021..1025,
                 kind: ParameterHint,
                 label: "focus_range",
             },
             InlayHint {
-                range: 1036..1048,
+                range: 1035..1047,
                 kind: ParameterHint,
                 label: "full_range",
             },
             InlayHint {
-                range: 1058..1071,
+                range: 1057..1070,
                 kind: ParameterHint,
                 label: "kind",
             },
             InlayHint {
-                range: 1081..1085,
+                range: 1080..1084,
                 kind: ParameterHint,
                 label: "docs",
             },
             InlayHint {
-                range: 1095..1099,
+                range: 1094..1098,
                 kind: ParameterHint,
                 label: "description",
             },
@@ -1239,16 +1241,17 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
-                range: 232..269,
+                range: 147..172,
                 kind: ChainingHint,
                 label: "B",
             },
             InlayHint {
-                range: 232..239,
+                range: 147..154,
                 kind: ChainingHint,
                 label: "A",
             },
-        ]"###);
+        ]
+        "###);
     }
 
     #[test]
@@ -1293,12 +1296,12 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
-                range: 252..323,
+                range: 143..190,
                 kind: ChainingHint,
                 label: "C",
             },
             InlayHint {
-                range: 252..300,
+                range: 143..179,
                 kind: ChainingHint,
                 label: "B",
             },
@@ -1331,15 +1334,16 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
-                range: 403..452,
+                range: 246..283,
                 kind: ChainingHint,
                 label: "B<X<i32, bool>>",
             },
             InlayHint {
-                range: 403..422,
+                range: 246..265,
                 kind: ChainingHint,
                 label: "A<X<i32, bool>>",
             },
-        ]"###);
+        ]
+        "###);
     }
 }
diff --git a/crates/ra_ide/src/mock_analysis.rs b/crates/ra_ide/src/mock_analysis.rs
index 981bdf924..889b84c59 100644
--- a/crates/ra_ide/src/mock_analysis.rs
+++ b/crates/ra_ide/src/mock_analysis.rs
@@ -1,87 +1,22 @@
 //! FIXME: write short doc here
-use std::{str::FromStr, sync::Arc};
+use std::sync::Arc;
 
 use ra_cfg::CfgOptions;
 use ra_db::{CrateName, Env, FileSet, SourceRoot, VfsPath};
-use test_utils::{extract_offset, extract_range, Fixture, CURSOR_MARKER};
+use test_utils::{extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER};
 
 use crate::{
     Analysis, AnalysisChange, AnalysisHost, CrateGraph, Edition, FileId, FilePosition, FileRange,
 };
 
-#[derive(Debug)]
-enum MockFileData {
-    Plain { path: String, content: String },
-    Fixture(Fixture),
-}
-
-impl MockFileData {
-    fn new(path: String, content: String) -> Self {
-        // `Self::Plain` causes a false warning: 'variant is never constructed: `Plain` '
-        // see https://github.com/rust-lang/rust/issues/69018
-        MockFileData::Plain { path, content }
-    }
-
-    fn path(&self) -> &str {
-        match self {
-            MockFileData::Plain { path, .. } => path.as_str(),
-            MockFileData::Fixture(f) => f.path.as_str(),
-        }
-    }
-
-    fn content(&self) -> &str {
-        match self {
-            MockFileData::Plain { content, .. } => content,
-            MockFileData::Fixture(f) => f.text.as_str(),
-        }
-    }
-
-    fn cfg_options(&self) -> CfgOptions {
-        match self {
-            MockFileData::Fixture(f) => {
-                let mut cfg = CfgOptions::default();
-                f.cfg_atoms.iter().for_each(|it| cfg.insert_atom(it.into()));
-                f.cfg_key_values.iter().for_each(|(k, v)| cfg.insert_key_value(k.into(), v.into()));
-                cfg
-            }
-            _ => CfgOptions::default(),
-        }
-    }
-
-    fn edition(&self) -> Edition {
-        match self {
-            MockFileData::Fixture(f) => {
-                f.edition.as_ref().map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap())
-            }
-            _ => Edition::Edition2018,
-        }
-    }
-
-    fn env(&self) -> Env {
-        match self {
-            MockFileData::Fixture(f) => Env::from(f.env.iter()),
-            _ => Env::default(),
-        }
-    }
-}
-
-impl From<Fixture> for MockFileData {
-    fn from(fixture: Fixture) -> Self {
-        Self::Fixture(fixture)
-    }
-}
-
 /// Mock analysis is used in test to bootstrap an AnalysisHost/Analysis
 /// from a set of in-memory files.
 #[derive(Debug, Default)]
 pub struct MockAnalysis {
-    files: Vec<MockFileData>,
+    files: Vec<Fixture>,
 }
 
 impl MockAnalysis {
-    pub fn new() -> MockAnalysis {
-        MockAnalysis::default()
-    }
     /// Creates `MockAnalysis` using a fixture data in the following format:
     ///
     /// ```not_rust
@@ -92,68 +27,53 @@ impl MockAnalysis {
     /// //- /foo.rs
     /// struct Baz;
     /// ```
-    pub fn with_files(fixture: &str) -> MockAnalysis {
-        let mut res = MockAnalysis::new();
-        for entry in Fixture::parse(fixture) {
-            res.add_file_fixture(entry);
-        }
+    pub fn with_files(ra_fixture: &str) -> MockAnalysis {
+        let (res, pos) = MockAnalysis::with_fixture(ra_fixture);
+        assert!(pos.is_none());
         res
     }
 
     /// Same as `with_files`, but requires that a single file contains a `<|>` marker,
     /// whose position is also returned.
     pub fn with_files_and_position(fixture: &str) -> (MockAnalysis, FilePosition) {
+        let (res, position) = MockAnalysis::with_fixture(fixture);
+        let (file_id, range_or_offset) = position.expect("expected a marker (<|>)");
+        let offset = match range_or_offset {
+            RangeOrOffset::Range(_) => panic!(),
+            RangeOrOffset::Offset(it) => it,
+        };
+        (res, FilePosition { file_id, offset })
+    }
+
+    fn with_fixture(fixture: &str) -> (MockAnalysis, Option<(FileId, RangeOrOffset)>) {
         let mut position = None;
-        let mut res = MockAnalysis::new();
-        for entry in Fixture::parse(fixture) {
+        let mut res = MockAnalysis::default();
+        for mut entry in Fixture::parse(fixture) {
             if entry.text.contains(CURSOR_MARKER) {
                 assert!(position.is_none(), "only one marker (<|>) per fixture is allowed");
-                position = Some(res.add_file_fixture_with_position(entry));
+                let (range_or_offset, text) = extract_range_or_offset(&entry.text);
+                entry.text = text;
+                let file_id = res.add_file_fixture(entry);
+                position = Some((file_id, range_or_offset));
             } else {
                 res.add_file_fixture(entry);
             }
         }
-        let position = position.expect("expected a marker (<|>)");
         (res, position)
     }
 
-    pub fn add_file_fixture(&mut self, fixture: Fixture) -> FileId {
-        let file_id = self.next_id();
-        self.files.push(MockFileData::from(fixture));
+    fn add_file_fixture(&mut self, fixture: Fixture) -> FileId {
+        let file_id = FileId((self.files.len() + 1) as u32);
+        self.files.push(fixture);
         file_id
     }
 
-    pub fn add_file_fixture_with_position(&mut self, mut fixture: Fixture) -> FilePosition {
-        let (offset, text) = extract_offset(&fixture.text);
-        fixture.text = text;
-        let file_id = self.next_id();
-        self.files.push(MockFileData::from(fixture));
-        FilePosition { file_id, offset }
-    }
-
-    pub fn add_file(&mut self, path: &str, text: &str) -> FileId {
-        let file_id = self.next_id();
-        self.files.push(MockFileData::new(path.to_string(), text.to_string()));
-        file_id
-    }
-    pub fn add_file_with_position(&mut self, path: &str, text: &str) -> FilePosition {
-        let (offset, text) = extract_offset(text);
-        let file_id = self.next_id();
-        self.files.push(MockFileData::new(path.to_string(), text));
-        FilePosition { file_id, offset }
-    }
-    pub fn add_file_with_range(&mut self, path: &str, text: &str) -> FileRange {
-        let (range, text) = extract_range(text);
-        let file_id = self.next_id();
-        self.files.push(MockFileData::new(path.to_string(), text));
-        FileRange { file_id, range }
-    }
     pub fn id_of(&self, path: &str) -> FileId {
         let (idx, _) = self
             .files
             .iter()
             .enumerate()
-            .find(|(_, data)| path == data.path())
+            .find(|(_, data)| path == data.path)
             .expect("no file in this mock");
         FileId(idx as u32 + 1)
     }
@@ -164,18 +84,23 @@ impl MockAnalysis {
         let mut crate_graph = CrateGraph::default();
         let mut root_crate = None;
         for (i, data) in self.files.into_iter().enumerate() {
-            let path = data.path();
+            let path = data.path;
             assert!(path.starts_with('/'));
-            let cfg_options = data.cfg_options();
+
+            let mut cfg = CfgOptions::default();
+            data.cfg_atoms.iter().for_each(|it| cfg.insert_atom(it.into()));
+            data.cfg_key_values.iter().for_each(|(k, v)| cfg.insert_key_value(k.into(), v.into()));
+            let edition: Edition =
+                data.edition.and_then(|it| it.parse().ok()).unwrap_or(Edition::Edition2018);
+
             let file_id = FileId(i as u32 + 1);
-            let edition = data.edition();
-            let env = data.env();
+            let env = Env::from(data.env.iter());
             if path == "/lib.rs" || path == "/main.rs" {
                 root_crate = Some(crate_graph.add_crate_root(
                     file_id,
                     edition,
                     None,
-                    cfg_options,
+                    cfg,
                     env,
                     Default::default(),
                 ));
@@ -186,7 +111,7 @@ impl MockAnalysis {
                     file_id,
                     edition,
                     Some(CrateName::new(crate_name).unwrap()),
-                    cfg_options,
+                    cfg,
                     env,
                     Default::default(),
                 );
@@ -198,7 +123,7 @@ impl MockAnalysis {
             }
             let path = VfsPath::new_virtual_path(path.to_string());
             file_set.insert(file_id, path);
-            change.change_file(file_id, Some(Arc::new(data.content().to_owned())));
+            change.change_file(file_id, Some(Arc::new(data.text).to_owned()));
         }
         change.set_crate_graph(crate_graph);
         change.set_roots(vec![SourceRoot::new_local(file_set)]);
@@ -208,10 +133,6 @@ impl MockAnalysis {
     pub fn analysis(self) -> Analysis {
         self.analysis_host().analysis()
     }
-
-    fn next_id(&self) -> FileId {
-        FileId((self.files.len() + 1) as u32)
-    }
 }
 
 /// Creates analysis from a multi-file fixture, returns positions marked with <|>.
@@ -222,21 +143,18 @@ pub fn analysis_and_position(ra_fixture: &str) -> (Analysis, FilePosition) {
 
 /// Creates analysis for a single file.
 pub fn single_file(ra_fixture: &str) -> (Analysis, FileId) {
-    let mut mock = MockAnalysis::new();
-    let file_id = mock.add_file("/main.rs", ra_fixture);
+    let mock = MockAnalysis::with_files(ra_fixture);
+    let file_id = mock.id_of("/main.rs");
     (mock.analysis(), file_id)
 }
 
-/// Creates analysis for a single file, returns position marked with <|>.
-pub fn single_file_with_position(ra_fixture: &str) -> (Analysis, FilePosition) {
-    let mut mock = MockAnalysis::new();
-    let pos = mock.add_file_with_position("/main.rs", ra_fixture);
-    (mock.analysis(), pos)
-}
-
 /// Creates analysis for a single file, returns range marked with a pair of <|>.
-pub fn single_file_with_range(ra_fixture: &str) -> (Analysis, FileRange) {
-    let mut mock = MockAnalysis::new();
-    let pos = mock.add_file_with_range("/main.rs", ra_fixture);
-    (mock.analysis(), pos)
+pub fn analysis_and_range(ra_fixture: &str) -> (Analysis, FileRange) {
+    let (res, position) = MockAnalysis::with_fixture(ra_fixture);
+    let (file_id, range_or_offset) = position.expect("expected a marker (<|>)");
+    let range = match range_or_offset {
+        RangeOrOffset::Range(it) => it,
+        RangeOrOffset::Offset(_) => panic!(),
+    };
+    (res.analysis(), FileRange { file_id, range })
 }
diff --git a/crates/ra_ide/src/parent_module.rs b/crates/ra_ide/src/parent_module.rs
index bc7f65470..e3e0c7639 100644
--- a/crates/ra_ide/src/parent_module.rs
+++ b/crates/ra_ide/src/parent_module.rs
@@ -125,12 +125,12 @@ mod tests {
     #[test]
     fn test_resolve_crate_root() {
         let mock = MockAnalysis::with_files(
-            "
-        //- /bar.rs
-        mod foo;
-        //- /foo.rs
-        // empty <|>
-    ",
+            r#"
+//- /bar.rs
+mod foo;
+//- /foo.rs
+// empty
+"#,
         );
         let root_file = mock.id_of("/bar.rs");
         let mod_file = mock.id_of("/foo.rs");
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index 4a96d6505..3433fdae3 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -191,239 +191,244 @@ fn get_struct_def_name_for_struct_literal_search(
 #[cfg(test)]
 mod tests {
     use crate::{
-        mock_analysis::{analysis_and_position, single_file_with_position, MockAnalysis},
+        mock_analysis::{analysis_and_position, MockAnalysis},
         Declaration, Reference, ReferenceSearchResult, SearchScope,
     };
 
     #[test]
     fn test_struct_literal_after_space() {
-        let code = r#"
-    struct Foo <|>{
-        a: i32,
-    }
-    impl Foo {
-        fn f() -> i32 { 42 }
-    }
-    fn main() {
-        let f: Foo;
-        f = Foo {a: Foo::f()};
-    }"#;
-
-        let refs = get_all_refs(code);
+        let refs = get_all_refs(
+            r#"
+struct Foo <|>{
+    a: i32,
+}
+impl Foo {
+    fn f() -> i32 { 42 }
+}
+fn main() {
+    let f: Foo;
+    f = Foo {a: Foo::f()};
+}
+"#,
+        );
         check_result(
             refs,
-            "Foo STRUCT_DEF FileId(1) 5..39 12..15 Other",
-            &["FileId(1) 138..141 StructLiteral"],
+            "Foo STRUCT_DEF FileId(1) 0..26 7..10 Other",
+            &["FileId(1) 101..104 StructLiteral"],
         );
     }
 
     #[test]
-    fn test_struct_literal_befor_space() {
-        let code = r#"
-    struct Foo<|> {}
-        fn main() {
-        let f: Foo;
-        f = Foo {};
-    }"#;
-
-        let refs = get_all_refs(code);
+    fn test_struct_literal_before_space() {
+        let refs = get_all_refs(
+            r#"
+struct Foo<|> {}
+    fn main() {
+    let f: Foo;
+    f = Foo {};
+}
+"#,
+        );
         check_result(
             refs,
-            "Foo STRUCT_DEF FileId(1) 5..18 12..15 Other",
-            &["FileId(1) 54..57 Other", "FileId(1) 71..74 StructLiteral"],
+            "Foo STRUCT_DEF FileId(1) 0..13 7..10 Other",
+            &["FileId(1) 41..44 Other", "FileId(1) 54..57 StructLiteral"],
         );
     }
 
     #[test]
     fn test_struct_literal_with_generic_type() {
-        let code = r#"
-    struct Foo<T> <|>{}
-        fn main() {
-        let f: Foo::<i32>;
-        f = Foo {};
-    }"#;
-
-        let refs = get_all_refs(code);
+        let refs = get_all_refs(
+            r#"
+struct Foo<T> <|>{}
+    fn main() {
+    let f: Foo::<i32>;
+    f = Foo {};
+}
+"#,
+        );
         check_result(
             refs,
-            "Foo STRUCT_DEF FileId(1) 5..21 12..15 Other",
-            &["FileId(1) 81..84 StructLiteral"],
+            "Foo STRUCT_DEF FileId(1) 0..16 7..10 Other",
+            &["FileId(1) 64..67 StructLiteral"],
         );
     }
 
     #[test]
     fn test_struct_literal_for_tuple() {
-        let code = r#"
-    struct Foo<|>(i32);
-
-    fn main() {
-        let f: Foo;
-        f = Foo(1);
-    }"#;
+        let refs = get_all_refs(
+            r#"
+struct Foo<|>(i32);
 
-        let refs = get_all_refs(code);
+fn main() {
+    let f: Foo;
+    f = Foo(1);
+}
+"#,
+        );
         check_result(
             refs,
-            "Foo STRUCT_DEF FileId(1) 5..21 12..15 Other",
-            &["FileId(1) 71..74 StructLiteral"],
+            "Foo STRUCT_DEF FileId(1) 0..16 7..10 Other",
+            &["FileId(1) 54..57 StructLiteral"],
         );
     }
 
     #[test]
     fn test_find_all_refs_for_local() {
-        let code = r#"
-    fn main() {
-        let mut i = 1;
-        let j = 1;
-        i = i<|> + j;
+        let refs = get_all_refs(
+            r#"
+fn main() {
+    let mut i = 1;
+    let j = 1;
+    i = i<|> + j;
 
-        {
-            i = 0;
-        }
-
-        i = 5;
-    }"#;
+    {
+        i = 0;
+    }
 
-        let refs = get_all_refs(code);
+    i = 5;
+}"#,
+        );
         check_result(
             refs,
-            "i BIND_PAT FileId(1) 33..34 Other Write",
+            "i BIND_PAT FileId(1) 24..25 Other Write",
             &[
-                "FileId(1) 67..68 Other Write",
-                "FileId(1) 71..72 Other Read",
-                "FileId(1) 101..102 Other Write",
-                "FileId(1) 127..128 Other Write",
+                "FileId(1) 50..51 Other Write",
+                "FileId(1) 54..55 Other Read",
+                "FileId(1) 76..77 Other Write",
+                "FileId(1) 94..95 Other Write",
             ],
         );
     }
 
     #[test]
     fn search_filters_by_range() {
-        let code = r#"
-            fn foo() {
-                let spam<|> = 92;
-                spam + spam
-            }
-            fn bar() {
-                let spam = 92;
-                spam + spam
-            }
-        "#;
-        let refs = get_all_refs(code);
+        let refs = get_all_refs(
+            r#"
+fn foo() {
+    let spam<|> = 92;
+    spam + spam
+}
+fn bar() {
+    let spam = 92;
+    spam + spam
+}
+"#,
+        );
         check_result(
             refs,
-            "spam BIND_PAT FileId(1) 44..48 Other",
-            &["FileId(1) 71..75 Other Read", "FileId(1) 78..82 Other Read"],
+            "spam BIND_PAT FileId(1) 19..23 Other",
+            &["FileId(1) 34..38 Other Read", "FileId(1) 41..45 Other Read"],
         );
     }
 
     #[test]
     fn test_find_all_refs_for_param_inside() {
-        let code = r#"
-    fn foo(i : u32) -> u32 {
-        i<|>
-    }"#;
-
-        let refs = get_all_refs(code);
-        check_result(refs, "i BIND_PAT FileId(1) 12..13 Other", &["FileId(1) 38..39 Other Read"]);
+        let refs = get_all_refs(
+            r#"
+fn foo(i : u32) -> u32 {
+    i<|>
+}
+"#,
+        );
+        check_result(refs, "i BIND_PAT FileId(1) 7..8 Other", &["FileId(1) 29..30 Other Read"]);
     }
 
     #[test]
     fn test_find_all_refs_for_fn_param() {
-        let code = r#"
-    fn foo(i<|> : u32) -> u32 {
-        i
-    }"#;
-
-        let refs = get_all_refs(code);
-        check_result(refs, "i BIND_PAT FileId(1) 12..13 Other", &["FileId(1) 38..39 Other Read"]);
+        let refs = get_all_refs(
+            r#"
+fn foo(i<|> : u32) -> u32 {
+    i
+}
+"#,
+        );
+        check_result(refs, "i BIND_PAT FileId(1) 7..8 Other", &["FileId(1) 29..30 Other Read"]);
     }
 
     #[test]
     fn test_find_all_refs_field_name() {
-        let code = r#"
-            //- /lib.rs
-            struct Foo {
-                pub spam<|>: u32,
-            }
-
-            fn main(s: Foo) {
-                let f = s.spam;
-            }
-        "#;
+        let refs = get_all_refs(
+            r#"
+//- /lib.rs
+struct Foo {
+    pub spam<|>: u32,
+}
 
-        let refs = get_all_refs(code);
+fn main(s: Foo) {
+    let f = s.spam;
+}
+"#,
+        );
         check_result(
             refs,
-            "spam RECORD_FIELD_DEF FileId(1) 66..79 70..74 Other",
-            &["FileId(1) 152..156 Other Read"],
+            "spam RECORD_FIELD_DEF FileId(1) 17..30 21..25 Other",
+            &["FileId(1) 67..71 Other Read"],
         );
     }
 
     #[test]
     fn test_find_all_refs_impl_item_name() {
-        let code = r#"
-            //- /lib.rs
-            struct Foo;
-            impl Foo {
-                fn f<|>(&self) {  }
-            }
-        "#;
-
-        let refs = get_all_refs(code);
-        check_result(refs, "f FN_DEF FileId(1) 88..104 91..92 Other", &[]);
+        let refs = get_all_refs(
+            r#"
+struct Foo;
+impl Foo {
+    fn f<|>(&self) {  }
+}
+"#,
+        );
+        check_result(refs, "f FN_DEF FileId(1) 27..43 30..31 Other", &[]);
     }
 
     #[test]
     fn test_find_all_refs_enum_var_name() {
-        let code = r#"
-            //- /lib.rs
-            enum Foo {
-                A,
-                B<|>,
-                C,
-            }
-        "#;
-
-        let refs = get_all_refs(code);
-        check_result(refs, "B ENUM_VARIANT FileId(1) 83..84 83..84 Other", &[]);
+        let refs = get_all_refs(
+            r#"
+enum Foo {
+    A,
+    B<|>,
+    C,
+}
+"#,
+        );
+        check_result(refs, "B ENUM_VARIANT FileId(1) 22..23 22..23 Other", &[]);
     }
 
     #[test]
     fn test_find_all_refs_two_modules() {
-        let code = r#"
-            //- /lib.rs
-            pub mod foo;
-            pub mod bar;
-
-            fn f() {
-                let i = foo::Foo { n: 5 };
-            }
-
-            //- /foo.rs
-            use crate::bar;
+        let (analysis, pos) = analysis_and_position(
+            r#"
+//- /lib.rs
+pub mod foo;
+pub mod bar;
+
+fn f() {
+    let i = foo::Foo { n: 5 };
+}
 
-            pub struct Foo {
-                pub n: u32,
-            }
+//- /foo.rs
+use crate::bar;
 
-            fn f() {
-                let i = bar::Bar { n: 5 };
-            }
+pub struct Foo {
+    pub n: u32,
+}
 
-            //- /bar.rs
-            use crate::foo;
+fn f() {
+    let i = bar::Bar { n: 5 };
+}
 
-            pub struct Bar {
-                pub n: u32,
-            }
+//- /bar.rs
+use crate::foo;
 
-            fn f() {
-                let i = foo::Foo<|> { n: 5 };
-            }
-        "#;
+pub struct Bar {
+    pub n: u32,
+}
 
-        let (analysis, pos) = analysis_and_position(code);
+fn f() {
+    let i = foo::Foo<|> { n: 5 };
+}
+"#,
+        );
         let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
         check_result(
             refs,
@@ -437,48 +442,48 @@ mod tests {
     // which is the whole `foo.rs`, and the second one is in `use foo::Foo`.
     #[test]
     fn test_find_all_refs_decl_module() {
-        let code = r#"
-            //- /lib.rs
-            mod foo<|>;
+        let (analysis, pos) = analysis_and_position(
+            r#"
+//- /lib.rs
+mod foo<|>;
 
-            use foo::Foo;
+use foo::Foo;
 
-            fn f() {
-                let i = Foo { n: 5 };
-            }
-
-            //- /foo.rs
-            pub struct Foo {
-                pub n: u32,
-            }
-        "#;
+fn f() {
+    let i = Foo { n: 5 };
+}
 
-        let (analysis, pos) = analysis_and_position(code);
+//- /foo.rs
+pub struct Foo {
+    pub n: u32,
+}
+"#,
+        );
         let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
         check_result(refs, "foo SOURCE_FILE FileId(2) 0..35 Other", &["FileId(1) 14..17 Other"]);
     }
 
     #[test]
     fn test_find_all_refs_super_mod_vis() {
-        let code = r#"
-            //- /lib.rs
-            mod foo;
-
-            //- /foo.rs
-            mod some;
-            use some::Foo;
+        let (analysis, pos) = analysis_and_position(
+            r#"
+//- /lib.rs
+mod foo;
 
-            fn f() {
-                let i = Foo { n: 5 };
-            }
+//- /foo.rs
+mod some;
+use some::Foo;
 
-            //- /foo/some.rs
-            pub(super) struct Foo<|> {
-                pub n: u32,
-            }
-        "#;
+fn f() {
+    let i = Foo { n: 5 };
+}
 
-        let (analysis, pos) = analysis_and_position(code);
+//- /foo/some.rs
+pub(super) struct Foo<|> {
+    pub n: u32,
+}
+"#,
+        );
         let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
         check_result(
             refs,
@@ -525,93 +530,98 @@ mod tests {
 
     #[test]
     fn test_find_all_refs_macro_def() {
-        let code = r#"
-        #[macro_export]
-        macro_rules! m1<|> { () => (()) }
-
-        fn foo() {
-            m1();
-            m1();
-        }"#;
-
-        let refs = get_all_refs(code);
+        let refs = get_all_refs(
+            r#"
+#[macro_export]
+macro_rules! m1<|> { () => (()) }
+
+fn foo() {
+    m1();
+    m1();
+}
+"#,
+        );
         check_result(
             refs,
-            "m1 MACRO_CALL FileId(1) 9..63 46..48 Other",
-            &["FileId(1) 96..98 StructLiteral", "FileId(1) 114..116 StructLiteral"],
+            "m1 MACRO_CALL FileId(1) 0..46 29..31 Other",
+            &["FileId(1) 63..65 StructLiteral", "FileId(1) 73..75 StructLiteral"],
         );
     }
 
     #[test]
     fn test_basic_highlight_read_write() {
-        let code = r#"
-        fn foo() {
-            let mut i<|> = 0;
-            i = i + 1;
-        }"#;
-
-        let refs = get_all_refs(code);
+        let refs = get_all_refs(
+            r#"
+fn foo() {
+    let mut i<|> = 0;
+    i = i + 1;
+}
+"#,
+        );
         check_result(
             refs,
-            "i BIND_PAT FileId(1) 40..41 Other Write",
-            &["FileId(1) 59..60 Other Write", "FileId(1) 63..64 Other Read"],
+            "i BIND_PAT FileId(1) 23..24 Other Write",
+            &["FileId(1) 34..35 Other Write", "FileId(1) 38..39 Other Read"],
         );
     }
 
     #[test]
     fn test_basic_highlight_field_read_write() {
-        let code = r#"
-        struct S {
-            f: u32,
-        }
-
-        fn foo() {
-            let mut s = S{f: 0};
-            s.f<|> = 0;
-        }"#;
+        let refs = get_all_refs(
+            r#"
+struct S {
+    f: u32,
+}
 
-        let refs = get_all_refs(code);
+fn foo() {
+    let mut s = S{f: 0};
+    s.f<|> = 0;
+}
+"#,
+        );
         check_result(
             refs,
-            "f RECORD_FIELD_DEF FileId(1) 32..38 32..33 Other",
-            &["FileId(1) 96..97 Other Read", "FileId(1) 117..118 Other Write"],
+            "f RECORD_FIELD_DEF FileId(1) 15..21 15..16 Other",
+            &["FileId(1) 55..56 Other Read", "FileId(1) 68..69 Other Write"],
         );
     }
 
     #[test]
     fn test_basic_highlight_decl_no_write() {
-        let code = r#"
-        fn foo() {
-            let i<|>;
-            i = 1;
-        }"#;
-
-        let refs = get_all_refs(code);
-        check_result(refs, "i BIND_PAT FileId(1) 36..37 Other", &["FileId(1) 51..52 Other Write"]);
+        let refs = get_all_refs(
+            r#"
+fn foo() {
+    let i<|>;
+    i = 1;
+}
+"#,
+        );
+        check_result(refs, "i BIND_PAT FileId(1) 19..20 Other", &["FileId(1) 26..27 Other Write"]);
     }
 
     #[test]
     fn test_find_struct_function_refs_outside_module() {
-        let code = r#"
-        mod foo {
-            pub struct Foo;
+        let refs = get_all_refs(
+            r#"
+mod foo {
+    pub struct Foo;
 
-            impl Foo {
-                pub fn new<|>() -> Foo {
-                    Foo
-                }
-            }
+    impl Foo {
+        pub fn new<|>() -> Foo {
+            Foo
         }
+    }
+}
 
-        fn main() {
-            let _f = foo::Foo::new();
-        }"#;
-
-        let refs = get_all_refs(code);
+fn main() {
+    let _f = foo::Foo::new();
+}
+"#,
+        );
         check_result(
             refs,
-            "new FN_DEF FileId(1) 87..150 94..97 Other",
-            &["FileId(1) 227..230 StructLiteral"],
+            "new FN_DEF FileId(1) 54..101 61..64 Other",
+            &["FileId(1) 146..149 StructLiteral"],
         );
     }
 
@@ -642,8 +652,8 @@ mod tests {
         );
     }
 
-    fn get_all_refs(text: &str) -> ReferenceSearchResult {
-        let (analysis, position) = single_file_with_position(text);
+    fn get_all_refs(ra_fixture: &str) -> ReferenceSearchResult {
+        let (analysis, position) = analysis_and_position(ra_fixture);
         analysis.find_all_refs(position, None).unwrap().unwrap()
     }
 
diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index 6edf565b5..7ebc0adcf 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -271,11 +271,10 @@ fn rename_reference(
 mod tests {
     use insta::assert_debug_snapshot;
     use ra_text_edit::TextEditBuilder;
+    use stdx::trim_indent;
     use test_utils::{assert_eq_text, mark};
 
-    use crate::{
-        mock_analysis::analysis_and_position, mock_analysis::single_file_with_position, FileId,
-    };
+    use crate::{mock_analysis::analysis_and_position, FileId};
 
     #[test]
     fn test_rename_to_underscore() {
@@ -309,7 +308,7 @@ mod tests {
 
     #[test]
     fn test_rename_to_invalid_identifier() {
-        let (analysis, position) = single_file_with_position(
+        let (analysis, position) = analysis_and_position(
             "
     fn main() {
         let i<|> = 1;
@@ -1053,8 +1052,9 @@ pub mod foo<|>;
         );
     }
 
-    fn test_rename(text: &str, new_name: &str, expected: &str) {
-        let (analysis, position) = single_file_with_position(text);
+    fn test_rename(ra_fixture_before: &str, new_name: &str, ra_fixture_after: &str) {
+        let ra_fixture_after = &trim_indent(ra_fixture_after);
+        let (analysis, position) = analysis_and_position(ra_fixture_before);
         let source_change = analysis.rename(position, new_name).unwrap();
         let mut text_edit_builder = TextEditBuilder::default();
         let mut file_id: Option<FileId> = None;
@@ -1068,6 +1068,6 @@ pub mod foo<|>;
         }
         let mut result = analysis.file_text(file_id.unwrap()).unwrap().to_string();
         text_edit_builder.finish().apply(&mut result);
-        assert_eq_text!(expected, &*result);
+        assert_eq_text!(ra_fixture_after, &*result);
     }
 }
diff --git a/crates/ra_ide/src/snapshots/highlight_doctest.html b/crates/ra_ide/src/snapshots/highlight_doctest.html
index ac546806e..e8155def7 100644
--- a/crates/ra_ide/src/snapshots/highlight_doctest.html
+++ b/crates/ra_ide/src/snapshots/highlight_doctest.html
@@ -5,6 +5,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .lifetime           { color: #DFAF8F; font-style: italic; }
 .comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
 .struct, .enum      { color: #7CB8BB; }
 .enum_variant       { color: #BDE0F3; }
 .string_literal     { color: #CC9393; }
@@ -33,7 +35,7 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .control            { font-style: italic; }
 </style>
 <pre><code><span class="comment documentation">/// ```</span>
-<span class="comment documentation">/// </span><span class="keyword">let</span> _ = <span class="string_literal">"early doctests should not go boom"</span>;
+<span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> _ = </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="generic injected">;</span>
 <span class="comment documentation">/// ```</span>
 <span class="keyword">struct</span> <span class="struct declaration">Foo</span> {
     <span class="field declaration">bar</span>: <span class="builtin_type">bool</span>,
@@ -47,8 +49,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
     <span class="comment documentation">/// # Examples</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// ```</span>
-    <span class="comment documentation">/// #</span> <span class="attribute">#![</span><span class="function attribute">allow</span><span class="attribute">(unused_mut)]</span>
-    <span class="comment documentation">/// </span><span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">foo</span>: <span class="struct">Foo</span> = <span class="struct">Foo</span>::<span class="function">new</span>();
+    <span class="comment documentation">/// #</span><span class="generic injected"> </span><span class="attribute injected">#![</span><span class="function attribute injected">allow</span><span class="attribute injected">(unused_mut)]</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="keyword injected">mut</span><span class="generic injected"> </span><span class="variable declaration injected mutable">foo</span><span class="generic injected">: </span><span class="struct injected">Foo</span><span class="generic injected"> = </span><span class="struct injected">Foo</span><span class="generic injected">::</span><span class="function injected">new</span><span class="generic injected">();</span>
     <span class="comment documentation">/// ```</span>
     <span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="function declaration">new</span>() -&gt; <span class="struct">Foo</span> {
         <span class="struct">Foo</span> { <span class="field">bar</span>: <span class="bool_literal">true</span> }
@@ -59,26 +61,26 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
     <span class="comment documentation">/// # Examples</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// ```</span>
-    <span class="comment documentation">/// </span><span class="keyword">use</span> <span class="module">x</span>::<span class="module">y</span>;
+    <span class="comment documentation">/// </span><span class="keyword injected">use</span><span class="generic injected"> </span><span class="module injected">x</span><span class="generic injected">::</span><span class="module injected">y</span><span class="generic injected">;</span>
     <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="keyword">let</span> <span class="variable declaration">foo</span> = <span class="struct">Foo</span>::<span class="function">new</span>();
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foo</span><span class="generic injected"> = </span><span class="struct injected">Foo</span><span class="generic injected">::</span><span class="function injected">new</span><span class="generic injected">();</span>
     <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="comment">// calls bar on foo</span>
-    <span class="comment documentation">/// </span><span class="macro">assert!</span>(foo.bar());
+    <span class="comment documentation">/// </span><span class="comment injected">// calls bar on foo</span>
+    <span class="comment documentation">/// </span><span class="macro injected">assert!</span><span class="generic injected">(foo.bar());</span>
     <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="keyword">let</span> <span class="variable declaration">bar</span> = <span class="variable">foo</span>.<span class="field">bar</span> || <span class="struct">Foo</span>::<span class="constant">bar</span>;
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">bar</span><span class="generic injected"> = </span><span class="variable injected">foo</span><span class="generic injected">.</span><span class="field injected">bar</span><span class="generic injected"> || </span><span class="struct injected">Foo</span><span class="generic injected">::</span><span class="constant injected">bar</span><span class="generic injected">;</span>
     <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="comment">/* multi-line
-    </span><span class="comment documentation">/// </span><span class="comment">       comment */</span>
+    <span class="comment documentation">/// </span><span class="comment injected">/* multi-line
+    </span><span class="comment documentation">/// </span><span class="comment injected">       comment */</span>
     <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="keyword">let</span> <span class="variable declaration">multi_line_string</span> = <span class="string_literal">"Foo
-    </span><span class="comment documentation">/// </span><span class="string_literal">  bar
-    </span><span class="comment documentation">/// </span><span class="string_literal">         "</span>;
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">multi_line_string</span><span class="generic injected"> = </span><span class="string_literal injected">"Foo
+    </span><span class="comment documentation">/// </span><span class="string_literal injected">  bar
+    </span><span class="comment documentation">/// </span><span class="string_literal injected">         "</span><span class="generic injected">;</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// ```</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// ```rust,no_run</span>
-    <span class="comment documentation">/// </span><span class="keyword">let</span> <span class="variable declaration">foobar</span> = <span class="struct">Foo</span>::<span class="function">new</span>().<span class="function">bar</span>();
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foobar</span><span class="generic injected"> = </span><span class="struct injected">Foo</span><span class="generic injected">::</span><span class="function injected">new</span><span class="generic injected">().</span><span class="function injected">bar</span><span class="generic injected">();</span>
     <span class="comment documentation">/// ```</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// ```sh</span>
@@ -90,7 +92,7 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 }
 
 <span class="comment documentation">/// ```</span>
-<span class="comment documentation">/// </span><span class="macro">noop!</span>(<span class="numeric_literal">1</span>);
+<span class="comment documentation">/// </span><span class="macro injected">noop!</span><span class="generic injected">(</span><span class="numeric_literal injected">1</span><span class="generic injected">);</span>
 <span class="comment documentation">/// ```</span>
 <span class="macro">macro_rules!</span> <span class="macro declaration">noop</span> {
     ($expr:expr) =&gt; {
diff --git a/crates/ra_ide/src/snapshots/highlight_injection.html b/crates/ra_ide/src/snapshots/highlight_injection.html
index 47dbd7bc8..1b0349bae 100644
--- a/crates/ra_ide/src/snapshots/highlight_injection.html
+++ b/crates/ra_ide/src/snapshots/highlight_injection.html
@@ -5,6 +5,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .lifetime           { color: #DFAF8F; font-style: italic; }
 .comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
 .struct, .enum      { color: #7CB8BB; }
 .enum_variant       { color: #BDE0F3; }
 .string_literal     { color: #CC9393; }
diff --git a/crates/ra_ide/src/snapshots/highlight_strings.html b/crates/ra_ide/src/snapshots/highlight_strings.html
index b46fa44c6..d184b5691 100644
--- a/crates/ra_ide/src/snapshots/highlight_strings.html
+++ b/crates/ra_ide/src/snapshots/highlight_strings.html
@@ -5,6 +5,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .lifetime           { color: #DFAF8F; font-style: italic; }
 .comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
 .struct, .enum      { color: #7CB8BB; }
 .enum_variant       { color: #BDE0F3; }
 .string_literal     { color: #CC9393; }
diff --git a/crates/ra_ide/src/snapshots/highlight_unsafe.html b/crates/ra_ide/src/snapshots/highlight_unsafe.html
index 73438fbb4..6936e949f 100644
--- a/crates/ra_ide/src/snapshots/highlight_unsafe.html
+++ b/crates/ra_ide/src/snapshots/highlight_unsafe.html
@@ -5,6 +5,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .lifetime           { color: #DFAF8F; font-style: italic; }
 .comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
 .struct, .enum      { color: #7CB8BB; }
 .enum_variant       { color: #BDE0F3; }
 .string_literal     { color: #CC9393; }
diff --git a/crates/ra_ide/src/snapshots/highlighting.html b/crates/ra_ide/src/snapshots/highlighting.html
index 0c4f0a018..8d0b38f95 100644
--- a/crates/ra_ide/src/snapshots/highlighting.html
+++ b/crates/ra_ide/src/snapshots/highlighting.html
@@ -5,6 +5,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .lifetime           { color: #DFAF8F; font-style: italic; }
 .comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
 .struct, .enum      { color: #7CB8BB; }
 .enum_variant       { color: #BDE0F3; }
 .string_literal     { color: #CC9393; }
diff --git a/crates/ra_ide/src/snapshots/rainbow_highlighting.html b/crates/ra_ide/src/snapshots/rainbow_highlighting.html
index a74a70069..9516c7441 100644
--- a/crates/ra_ide/src/snapshots/rainbow_highlighting.html
+++ b/crates/ra_ide/src/snapshots/rainbow_highlighting.html
@@ -5,6 +5,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .lifetime           { color: #DFAF8F; font-style: italic; }
 .comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
 .struct, .enum      { color: #7CB8BB; }
 .enum_variant       { color: #BDE0F3; }
 .string_literal     { color: #CC9393; }
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index 448645bdc..028b55902 100644
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -236,7 +236,7 @@ pub(crate) fn highlight(
                             });
                         }
                     }
-                    stack.pop_and_inject(false);
+                    stack.pop_and_inject(None);
                 }
             } else if let Some(string) =
                 element_to_highlight.as_token().cloned().and_then(ast::RawString::cast)
@@ -324,16 +324,27 @@ impl HighlightedRangeStack {
         cloned
     }
 
+    /// Remove the `HighlightRange` of `parent` that's currently covered by `child`.
+    fn intersect_partial(parent: &mut HighlightedRange, child: &HighlightedRange) {
+        assert!(
+            parent.range.start() <= child.range.start()
+                && parent.range.end() >= child.range.start()
+                && child.range.end() > parent.range.end()
+        );
+
+        parent.range = TextRange::new(parent.range.start(), child.range.start());
+    }
+
     /// Similar to `pop`, but can modify arbitrary prior ranges (where `pop`)
     /// can only modify the last range currently on the stack.
     /// Can be used to do injections that span multiple ranges, like the
     /// doctest injection below.
-    /// If `delete` is set to true, the parent range is deleted instead of
-    /// intersected.
+    /// If `overwrite_parent` is non-optional, the highlighting of the parent range
+    /// is overwritten with the argument.
     ///
     /// Note that `pop` can be simulated by `pop_and_inject(false)` but the
     /// latter is computationally more expensive.
-    fn pop_and_inject(&mut self, delete: bool) {
+    fn pop_and_inject(&mut self, overwrite_parent: Option<Highlight>) {
         let mut children = self.stack.pop().unwrap();
         let prev = self.stack.last_mut().unwrap();
         children.sort_by_key(|range| range.range.start());
@@ -343,26 +354,45 @@ impl HighlightedRangeStack {
             if let Some(idx) =
                 prev.iter().position(|parent| parent.range.contains_range(child.range))
             {
+                if let Some(tag) = overwrite_parent {
+                    prev[idx].highlight = tag;
+                }
+
                 let cloned = Self::intersect(&mut prev[idx], &child);
-                let insert_idx = if delete || prev[idx].range.is_empty() {
+                let insert_idx = if prev[idx].range.is_empty() {
                     prev.remove(idx);
                     idx
                 } else {
                     idx + 1
                 };
                 prev.insert(insert_idx, child);
-                if !delete && !cloned.range.is_empty() {
+                if !cloned.range.is_empty() {
                     prev.insert(insert_idx + 1, cloned);
                 }
-            } else if let Some(_idx) =
-                prev.iter().position(|parent| parent.range.contains(child.range.start()))
-            {
-                unreachable!("child range should be completely contained in parent range");
             } else {
-                let idx = prev
-                    .binary_search_by_key(&child.range.start(), |range| range.range.start())
-                    .unwrap_or_else(|x| x);
-                prev.insert(idx, child);
+                let maybe_idx =
+                    prev.iter().position(|parent| parent.range.contains(child.range.start()));
+                match (overwrite_parent, maybe_idx) {
+                    (Some(_), Some(idx)) => {
+                        Self::intersect_partial(&mut prev[idx], &child);
+                        let insert_idx = if prev[idx].range.is_empty() {
+                            prev.remove(idx);
+                            idx
+                        } else {
+                            idx + 1
+                        };
+                        prev.insert(insert_idx, child);
+                    }
+                    (_, None) => {
+                        let idx = prev
+                            .binary_search_by_key(&child.range.start(), |range| range.range.start())
+                            .unwrap_or_else(|x| x);
+                        prev.insert(idx, child);
+                    }
+                    _ => {
+                        unreachable!("child range should be completely contained in parent range");
+                    }
+                }
             }
         }
     }
@@ -516,11 +546,9 @@ fn highlight_element(
             let ty = sema.type_of_expr(&expr)?;
             if !ty.is_raw_ptr() {
                 return None;
+            } else {
+                HighlightTag::Operator | HighlightModifier::Unsafe
             }
-
-            let mut h = Highlight::new(HighlightTag::Operator);
-            h |= HighlightModifier::Unsafe;
-            h
         }
         T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
             Highlight::new(HighlightTag::Macro)
diff --git a/crates/ra_ide/src/syntax_highlighting/html.rs b/crates/ra_ide/src/syntax_highlighting/html.rs
index 99b6b25ab..0c74f7370 100644
--- a/crates/ra_ide/src/syntax_highlighting/html.rs
+++ b/crates/ra_ide/src/syntax_highlighting/html.rs
@@ -64,6 +64,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .lifetime           { color: #DFAF8F; font-style: italic; }
 .comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
 .struct, .enum      { color: #7CB8BB; }
 .enum_variant       { color: #BDE0F3; }
 .string_literal     { color: #CC9393; }
diff --git a/crates/ra_ide/src/syntax_highlighting/injection.rs b/crates/ra_ide/src/syntax_highlighting/injection.rs
index 9d82b4009..181c21256 100644
--- a/crates/ra_ide/src/syntax_highlighting/injection.rs
+++ b/crates/ra_ide/src/syntax_highlighting/injection.rs
@@ -8,8 +8,8 @@ use ra_syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize};
 use stdx::SepBy;
 
 use crate::{
-    call_info::ActiveParameter, Analysis, HighlightModifier, HighlightTag, HighlightedRange,
-    RootDatabase,
+    call_info::ActiveParameter, Analysis, Highlight, HighlightModifier, HighlightTag,
+    HighlightedRange, RootDatabase,
 };
 
 use super::HighlightedRangeStack;
@@ -172,6 +172,7 @@ pub(super) fn highlight_doc_comment(
                 h.range.end() + end_offset.unwrap_or(start_offset) - h.range.start(),
             );
 
+            h.highlight |= HighlightModifier::Injected;
             stack.add(h);
         }
     }
@@ -181,6 +182,7 @@ pub(super) fn highlight_doc_comment(
     for comment in new_comments {
         stack.add(comment);
     }
-    stack.pop_and_inject(false);
-    stack.pop_and_inject(true);
+    stack.pop_and_inject(None);
+    stack
+        .pop_and_inject(Some(Highlight::from(HighlightTag::Generic) | HighlightModifier::Injected));
 }
diff --git a/crates/ra_ide/src/syntax_highlighting/tags.rs b/crates/ra_ide/src/syntax_highlighting/tags.rs
index 93bbb4b4d..e8e251cfc 100644
--- a/crates/ra_ide/src/syntax_highlighting/tags.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tags.rs
@@ -27,6 +27,7 @@ pub enum HighlightTag {
     Field,
     FormatSpecifier,
     Function,
+    Generic,
     Keyword,
     Lifetime,
     Macro,
@@ -57,6 +58,7 @@ pub enum HighlightModifier {
     /// not.
     Definition,
     Documentation,
+    Injected,
     Mutable,
     Unsafe,
 }
@@ -77,6 +79,7 @@ impl HighlightTag {
             HighlightTag::Field => "field",
             HighlightTag::FormatSpecifier => "format_specifier",
             HighlightTag::Function => "function",
+            HighlightTag::Generic => "generic",
             HighlightTag::Keyword => "keyword",
             HighlightTag::Lifetime => "lifetime",
             HighlightTag::Macro => "macro",
@@ -110,6 +113,7 @@ impl HighlightModifier {
         HighlightModifier::ControlFlow,
         HighlightModifier::Definition,
         HighlightModifier::Documentation,
+        HighlightModifier::Injected,
         HighlightModifier::Mutable,
         HighlightModifier::Unsafe,
     ];
@@ -120,6 +124,7 @@ impl HighlightModifier {
             HighlightModifier::ControlFlow => "control",
             HighlightModifier::Definition => "declaration",
             HighlightModifier::Documentation => "documentation",
+            HighlightModifier::Injected => "injected",
             HighlightModifier::Mutable => "mutable",
             HighlightModifier::Unsafe => "unsafe",
         }
diff --git a/crates/ra_ide/src/syntax_highlighting/tests.rs b/crates/ra_ide/src/syntax_highlighting/tests.rs
index b1f48f03b..b7fad9719 100644
--- a/crates/ra_ide/src/syntax_highlighting/tests.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tests.rs
@@ -2,10 +2,7 @@ use std::fs;
 
 use test_utils::{assert_eq_text, project_dir, read_text};
 
-use crate::{
-    mock_analysis::{single_file, MockAnalysis},
-    FileRange, TextRange,
-};
+use crate::{mock_analysis::single_file, FileRange, TextRange};
 
 #[test]
 fn test_highlighting() {
@@ -127,12 +124,10 @@ fn accidentally_quadratic() {
     let file = project_dir().join("crates/ra_syntax/test_data/accidentally_quadratic");
     let src = fs::read_to_string(file).unwrap();
 
-    let mut mock = MockAnalysis::new();
-    let file_id = mock.add_file("/main.rs", &src);
-    let host = mock.analysis_host();
+    let (analysis, file_id) = single_file(&src);
 
     // let t = std::time::Instant::now();
-    let _ = host.analysis().highlight(file_id).unwrap();
+    let _ = analysis.highlight(file_id).unwrap();
     // eprintln!("elapsed: {:?}", t.elapsed());
 }
 
@@ -140,16 +135,17 @@ fn accidentally_quadratic() {
 fn test_ranges() {
     let (analysis, file_id) = single_file(
         r#"
-            #[derive(Clone, Debug)]
-            struct Foo {
-                pub x: i32,
-                pub y: i32,
-            }"#,
+#[derive(Clone, Debug)]
+struct Foo {
+    pub x: i32,
+    pub y: i32,
+}
+"#,
     );
 
     // The "x"
     let highlights = &analysis
-        .highlight_range(FileRange { file_id, range: TextRange::at(82.into(), 1.into()) })
+        .highlight_range(FileRange { file_id, range: TextRange::at(45.into(), 1.into()) })
         .unwrap();
 
     assert_eq!(&highlights[0].highlight.to_string(), "field.declaration");
diff --git a/crates/ra_ide/src/syntax_tree.rs b/crates/ra_ide/src/syntax_tree.rs
index a341684fd..f716a3861 100644
--- a/crates/ra_ide/src/syntax_tree.rs
+++ b/crates/ra_ide/src/syntax_tree.rs
@@ -104,7 +104,7 @@ fn syntax_tree_for_token(node: &SyntaxToken, text_range: TextRange) -> Option<St
 mod tests {
     use test_utils::assert_eq_text;
 
-    use crate::mock_analysis::{single_file, single_file_with_range};
+    use crate::mock_analysis::{analysis_and_range, single_file};
 
     #[test]
     fn test_syntax_tree_without_range() {
@@ -184,7 +184,7 @@ [email protected]
 
     #[test]
     fn test_syntax_tree_with_range() {
-        let (analysis, range) = single_file_with_range(r#"<|>fn foo() {}<|>"#.trim());
+        let (analysis, range) = analysis_and_range(r#"<|>fn foo() {}<|>"#.trim());
         let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
 
         assert_eq_text!(
@@ -206,7 +206,7 @@ [email protected]
             .trim()
         );
 
-        let (analysis, range) = single_file_with_range(
+        let (analysis, range) = analysis_and_range(
             r#"fn test() {
     <|>assert!("
     fn foo() {
@@ -242,7 +242,7 @@ [email protected]
 
     #[test]
     fn test_syntax_tree_inside_string() {
-        let (analysis, range) = single_file_with_range(
+        let (analysis, range) = analysis_and_range(
             r#"fn test() {
     assert!("
 <|>fn foo() {
@@ -276,7 +276,7 @@ [email protected]
         );
 
         // With a raw string
-        let (analysis, range) = single_file_with_range(
+        let (analysis, range) = analysis_and_range(
             r###"fn test() {
     assert!(r#"
 <|>fn foo() {
@@ -310,7 +310,7 @@ [email protected]
         );
 
         // With a raw string
-        let (analysis, range) = single_file_with_range(
+        let (analysis, range) = analysis_and_range(
             r###"fn test() {
     assert!(r<|>#"
 fn foo() {
diff --git a/crates/ra_ide/src/typing/on_enter.rs b/crates/ra_ide/src/typing/on_enter.rs
index a40d8af9c..2faaa8ff0 100644
--- a/crates/ra_ide/src/typing/on_enter.rs
+++ b/crates/ra_ide/src/typing/on_enter.rs
@@ -75,23 +75,22 @@ fn node_indent(file: &SourceFile, token: &SyntaxToken) -> Option<SmolStr> {
 
 #[cfg(test)]
 mod tests {
-    use test_utils::{assert_eq_text, extract_offset};
+    use test_utils::assert_eq_text;
 
-    use crate::mock_analysis::single_file;
-
-    use super::*;
+    use crate::mock_analysis::analysis_and_position;
+    use stdx::trim_indent;
 
     fn apply_on_enter(before: &str) -> Option<String> {
-        let (offset, before) = extract_offset(before);
-        let (analysis, file_id) = single_file(&before);
-        let result = analysis.on_enter(FilePosition { offset, file_id }).unwrap()?;
+        let (analysis, position) = analysis_and_position(&before);
+        let result = analysis.on_enter(position).unwrap()?;
 
-        let mut actual = before.to_string();
+        let mut actual = analysis.file_text(position.file_id).unwrap().to_string();
         result.apply(&mut actual);
         Some(actual)
     }
 
     fn do_check(ra_fixture_before: &str, ra_fixture_after: &str) {
+        let ra_fixture_after = &trim_indent(ra_fixture_after);
         let actual = apply_on_enter(ra_fixture_before).unwrap();
         assert_eq_text!(ra_fixture_after, &actual);
     }
diff --git a/crates/ra_project_model/Cargo.toml b/crates/ra_project_model/Cargo.toml
index e4a60f4c0..818947014 100644
--- a/crates/ra_project_model/Cargo.toml
+++ b/crates/ra_project_model/Cargo.toml
@@ -18,6 +18,7 @@ ra_cfg = { path = "../ra_cfg" }
 ra_db = { path = "../ra_db" }
 ra_toolchain = { path = "../ra_toolchain" }
 ra_proc_macro =  { path = "../ra_proc_macro" }
+paths =  { path = "../paths" }
 
 serde = { version = "1.0.106", features = ["derive"] }
 serde_json = "1.0.48"
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index 4b7444039..8ce63ab3c 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -1,14 +1,10 @@
 //! FIXME: write short doc here
 
-use std::{
-    ffi::OsStr,
-    ops,
-    path::{Path, PathBuf},
-    process::Command,
-};
+use std::{ffi::OsStr, ops, path::Path, process::Command};
 
 use anyhow::{Context, Result};
 use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId};
+use paths::{AbsPath, AbsPathBuf};
 use ra_arena::{Arena, Idx};
 use ra_db::Edition;
 use rustc_hash::FxHashMap;
@@ -20,11 +16,14 @@ use rustc_hash::FxHashMap;
 /// `CrateGraph`. `CrateGraph` is lower-level: it knows only about the crates,
 /// while this knows about `Packages` & `Targets`: purely cargo-related
 /// concepts.
+///
+/// We use absolute paths here, `cargo metadata` guarantees to always produce
+/// abs paths.
 #[derive(Debug, Clone)]
 pub struct CargoWorkspace {
     packages: Arena<PackageData>,
     targets: Arena<TargetData>,
-    workspace_root: PathBuf,
+    workspace_root: AbsPathBuf,
 }
 
 impl ops::Index<Package> for CargoWorkspace {
@@ -80,15 +79,15 @@ pub type Target = Idx<TargetData>;
 pub struct PackageData {
     pub version: String,
     pub name: String,
-    pub manifest: PathBuf,
+    pub manifest: AbsPathBuf,
     pub targets: Vec<Target>,
     pub is_member: bool,
     pub dependencies: Vec<PackageDependency>,
     pub edition: Edition,
     pub features: Vec<String>,
     pub cfgs: Vec<String>,
-    pub out_dir: Option<PathBuf>,
-    pub proc_macro_dylib_path: Option<PathBuf>,
+    pub out_dir: Option<AbsPathBuf>,
+    pub proc_macro_dylib_path: Option<AbsPathBuf>,
 }
 
 #[derive(Debug, Clone)]
@@ -101,7 +100,7 @@ pub struct PackageDependency {
 pub struct TargetData {
     pub package: Package,
     pub name: String,
-    pub root: PathBuf,
+    pub root: AbsPathBuf,
     pub kind: TargetKind,
     pub is_proc_macro: bool,
 }
@@ -135,7 +134,7 @@ impl TargetKind {
 }
 
 impl PackageData {
-    pub fn root(&self) -> &Path {
+    pub fn root(&self) -> &AbsPath {
         self.manifest.parent().unwrap()
     }
 }
@@ -193,7 +192,7 @@ impl CargoWorkspace {
             let pkg = packages.alloc(PackageData {
                 name,
                 version: version.to_string(),
-                manifest: manifest_path,
+                manifest: AbsPathBuf::assert(manifest_path),
                 targets: Vec::new(),
                 is_member,
                 edition,
@@ -210,7 +209,7 @@ impl CargoWorkspace {
                 let tgt = targets.alloc(TargetData {
                     package: pkg,
                     name: meta_tgt.name,
-                    root: meta_tgt.src_path.clone(),
+                    root: AbsPathBuf::assert(meta_tgt.src_path.clone()),
                     kind: TargetKind::new(meta_tgt.kind.as_slice()),
                     is_proc_macro,
                 });
@@ -246,16 +245,17 @@ impl CargoWorkspace {
             packages[source].features.extend(node.features);
         }
 
-        Ok(CargoWorkspace { packages, targets, workspace_root: meta.workspace_root })
+        let workspace_root = AbsPathBuf::assert(meta.workspace_root);
+        Ok(CargoWorkspace { packages, targets, workspace_root: workspace_root })
     }
 
     pub fn packages<'a>(&'a self) -> impl Iterator<Item = Package> + ExactSizeIterator + 'a {
         self.packages.iter().map(|(id, _pkg)| id)
     }
 
-    pub fn target_by_root(&self, root: &Path) -> Option<Target> {
+    pub fn target_by_root(&self, root: &AbsPath) -> Option<Target> {
         self.packages()
-            .filter_map(|pkg| self[pkg].targets.iter().find(|&&it| self[it].root == root))
+            .filter_map(|pkg| self[pkg].targets.iter().find(|&&it| &self[it].root == root))
             .next()
             .copied()
     }
@@ -279,8 +279,8 @@ impl CargoWorkspace {
 
 #[derive(Debug, Clone, Default)]
 pub struct ExternResources {
-    out_dirs: FxHashMap<PackageId, PathBuf>,
-    proc_dylib_paths: FxHashMap<PackageId, PathBuf>,
+    out_dirs: FxHashMap<PackageId, AbsPathBuf>,
+    proc_dylib_paths: FxHashMap<PackageId, AbsPathBuf>,
     cfgs: FxHashMap<PackageId, Vec<String>>,
 }
 
@@ -308,6 +308,7 @@ pub fn load_extern_resources(
         if let Ok(message) = message {
             match message {
                 Message::BuildScriptExecuted(BuildScript { package_id, out_dir, cfgs, .. }) => {
+                    let out_dir = AbsPathBuf::assert(out_dir);
                     res.out_dirs.insert(package_id.clone(), out_dir);
                     res.cfgs.insert(package_id, cfgs);
                 }
@@ -317,7 +318,8 @@ pub fn load_extern_resources(
                         // Skip rmeta file
                         if let Some(filename) = message.filenames.iter().find(|name| is_dylib(name))
                         {
-                            res.proc_dylib_paths.insert(package_id, filename.clone());
+                            let filename = AbsPathBuf::assert(filename.clone());
+                            res.proc_dylib_paths.insert(package_id, filename);
                         }
                     }
                 }
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index fe3e81689..ac88532f0 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -7,11 +7,12 @@ mod sysroot;
 use std::{
     fs::{read_dir, File, ReadDir},
     io::{self, BufReader},
-    path::{Path, PathBuf},
+    path::Path,
     process::{Command, Output},
 };
 
 use anyhow::{bail, Context, Result};
+use paths::{AbsPath, AbsPathBuf};
 use ra_cfg::CfgOptions;
 use ra_db::{CrateGraph, CrateName, Edition, Env, FileId};
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -29,7 +30,7 @@ pub enum ProjectWorkspace {
     /// Project workspace was discovered by running `cargo metadata` and `rustc --print sysroot`.
     Cargo { cargo: CargoWorkspace, sysroot: Sysroot },
     /// Project workspace was manually specified using a `rust-project.json` file.
-    Json { project: JsonProject, project_location: PathBuf },
+    Json { project: JsonProject, project_location: AbsPathBuf },
 }
 
 /// `PackageRoot` describes a package root folder.
@@ -38,22 +39,22 @@ pub enum ProjectWorkspace {
 #[derive(Debug, Clone)]
 pub struct PackageRoot {
     /// Path to the root folder
-    path: PathBuf,
+    path: AbsPathBuf,
     /// Is a member of the current workspace
     is_member: bool,
-    out_dir: Option<PathBuf>,
+    out_dir: Option<AbsPathBuf>,
 }
 impl PackageRoot {
-    pub fn new_member(path: PathBuf) -> PackageRoot {
+    pub fn new_member(path: AbsPathBuf) -> PackageRoot {
         Self { path, is_member: true, out_dir: None }
     }
-    pub fn new_non_member(path: PathBuf) -> PackageRoot {
+    pub fn new_non_member(path: AbsPathBuf) -> PackageRoot {
         Self { path, is_member: false, out_dir: None }
     }
-    pub fn path(&self) -> &Path {
+    pub fn path(&self) -> &AbsPath {
         &self.path
     }
-    pub fn out_dir(&self) -> Option<&Path> {
+    pub fn out_dir(&self) -> Option<&AbsPath> {
         self.out_dir.as_deref()
     }
     pub fn is_member(&self) -> bool {
@@ -63,12 +64,12 @@ impl PackageRoot {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Ord, PartialOrd)]
 pub enum ProjectManifest {
-    ProjectJson(PathBuf),
-    CargoToml(PathBuf),
+    ProjectJson(AbsPathBuf),
+    CargoToml(AbsPathBuf),
 }
 
 impl ProjectManifest {
-    pub fn from_manifest_file(path: PathBuf) -> Result<ProjectManifest> {
+    pub fn from_manifest_file(path: AbsPathBuf) -> Result<ProjectManifest> {
         if path.ends_with("rust-project.json") {
             return Ok(ProjectManifest::ProjectJson(path));
         }
@@ -78,7 +79,7 @@ impl ProjectManifest {
         bail!("project root must point to Cargo.toml or rust-project.json: {}", path.display())
     }
 
-    pub fn discover_single(path: &Path) -> Result<ProjectManifest> {
+    pub fn discover_single(path: &AbsPath) -> Result<ProjectManifest> {
         let mut candidates = ProjectManifest::discover(path)?;
         let res = match candidates.pop() {
             None => bail!("no projects"),
@@ -91,23 +92,23 @@ impl ProjectManifest {
         Ok(res)
     }
 
-    pub fn discover(path: &Path) -> io::Result<Vec<ProjectManifest>> {
+    pub fn discover(path: &AbsPath) -> io::Result<Vec<ProjectManifest>> {
         if let Some(project_json) = find_in_parent_dirs(path, "rust-project.json") {
             return Ok(vec![ProjectManifest::ProjectJson(project_json)]);
         }
         return find_cargo_toml(path)
             .map(|paths| paths.into_iter().map(ProjectManifest::CargoToml).collect());
 
-        fn find_cargo_toml(path: &Path) -> io::Result<Vec<PathBuf>> {
+        fn find_cargo_toml(path: &AbsPath) -> io::Result<Vec<AbsPathBuf>> {
             match find_in_parent_dirs(path, "Cargo.toml") {
                 Some(it) => Ok(vec![it]),
                 None => Ok(find_cargo_toml_in_child_dir(read_dir(path)?)),
             }
         }
 
-        fn find_in_parent_dirs(path: &Path, target_file_name: &str) -> Option<PathBuf> {
+        fn find_in_parent_dirs(path: &AbsPath, target_file_name: &str) -> Option<AbsPathBuf> {
             if path.ends_with(target_file_name) {
-                return Some(path.to_owned());
+                return Some(path.to_path_buf());
             }
 
             let mut curr = Some(path);
@@ -123,17 +124,18 @@ impl ProjectManifest {
             None
         }
 
-        fn find_cargo_toml_in_child_dir(entities: ReadDir) -> Vec<PathBuf> {
+        fn find_cargo_toml_in_child_dir(entities: ReadDir) -> Vec<AbsPathBuf> {
             // Only one level down to avoid cycles the easy way and stop a runaway scan with large projects
             entities
                 .filter_map(Result::ok)
                 .map(|it| it.path().join("Cargo.toml"))
                 .filter(|it| it.exists())
+                .map(AbsPathBuf::assert)
                 .collect()
         }
     }
 
-    pub fn discover_all(paths: &[impl AsRef<Path>]) -> Vec<ProjectManifest> {
+    pub fn discover_all(paths: &[impl AsRef<AbsPath>]) -> Vec<ProjectManifest> {
         let mut res = paths
             .iter()
             .filter_map(|it| ProjectManifest::discover(it.as_ref()).ok())
@@ -158,15 +160,12 @@ impl ProjectWorkspace {
                     format!("Failed to open json file {}", project_json.display())
                 })?;
                 let reader = BufReader::new(file);
-                let project_location = match project_json.parent() {
-                    Some(parent) => PathBuf::from(parent),
-                    None => PathBuf::new(),
-                };
+                let project_location = project_json.parent().unwrap().to_path_buf();
                 ProjectWorkspace::Json {
                     project: from_reader(reader).with_context(|| {
                         format!("Failed to deserialize json file {}", project_json.display())
                     })?,
-                    project_location: project_location,
+                    project_location,
                 }
             }
             ProjectManifest::CargoToml(cargo_toml) => {
@@ -218,13 +217,13 @@ impl ProjectWorkspace {
         }
     }
 
-    pub fn proc_macro_dylib_paths(&self) -> Vec<PathBuf> {
+    pub fn proc_macro_dylib_paths(&self) -> Vec<AbsPathBuf> {
         match self {
-            ProjectWorkspace::Json { project, .. } => project
+            ProjectWorkspace::Json { project, project_location } => project
                 .crates
                 .iter()
                 .filter_map(|krate| krate.proc_macro_dylib_path.as_ref())
-                .cloned()
+                .map(|it| project_location.join(it))
                 .collect(),
             ProjectWorkspace::Cargo { cargo, sysroot: _sysroot } => cargo
                 .packages()
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
index a8a196e64..943ff92df 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/ra_project_model/src/sysroot.rs
@@ -1,15 +1,12 @@
 //! FIXME: write short doc here
 
-use std::{
-    env, ops,
-    path::{Path, PathBuf},
-    process::Command,
-};
+use std::{convert::TryFrom, env, ops, path::Path, process::Command};
 
-use anyhow::{bail, Result};
+use anyhow::{bail, format_err, Result};
 use ra_arena::{Arena, Idx};
 
 use crate::output;
+use paths::{AbsPath, AbsPathBuf};
 
 #[derive(Default, Debug, Clone)]
 pub struct Sysroot {
@@ -21,7 +18,7 @@ pub type SysrootCrate = Idx<SysrootCrateData>;
 #[derive(Debug, Clone)]
 pub struct SysrootCrateData {
     pub name: String,
-    pub root: PathBuf,
+    pub root: AbsPathBuf,
     pub deps: Vec<SysrootCrate>,
 }
 
@@ -53,7 +50,7 @@ impl Sysroot {
         self.crates.iter().map(|(id, _data)| id)
     }
 
-    pub fn discover(cargo_toml: &Path) -> Result<Sysroot> {
+    pub fn discover(cargo_toml: &AbsPath) -> Result<Sysroot> {
         let src = get_or_install_rust_src(cargo_toml)?;
         let mut sysroot = Sysroot { crates: Arena::default() };
         for name in SYSROOT_CRATES.trim().lines() {
@@ -86,16 +83,18 @@ impl Sysroot {
     }
 }
 
-fn get_or_install_rust_src(cargo_toml: &Path) -> Result<PathBuf> {
+fn get_or_install_rust_src(cargo_toml: &AbsPath) -> Result<AbsPathBuf> {
     if let Ok(path) = env::var("RUST_SRC_PATH") {
-        return Ok(path.into());
+        let path = AbsPathBuf::try_from(path.as_str())
+            .map_err(|path| format_err!("RUST_SRC_PATH must be absolute: {}", path.display()))?;
+        return Ok(path);
     }
     let current_dir = cargo_toml.parent().unwrap();
     let mut rustc = Command::new(ra_toolchain::rustc());
     rustc.current_dir(current_dir).args(&["--print", "sysroot"]);
     let rustc_output = output(rustc)?;
     let stdout = String::from_utf8(rustc_output.stdout)?;
-    let sysroot_path = Path::new(stdout.trim());
+    let sysroot_path = AbsPath::assert(Path::new(stdout.trim()));
     let src_path = sysroot_path.join("lib/rustlib/src/rust/src");
 
     if !src_path.exists() {
@@ -116,7 +115,7 @@ fn get_or_install_rust_src(cargo_toml: &Path) -> Result<PathBuf> {
 }
 
 impl SysrootCrateData {
-    pub fn root_dir(&self) -> &Path {
+    pub fn root_dir(&self) -> &AbsPath {
         self.root.parent().unwrap()
     }
 }
diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
index 99e3f7173..45204d1a3 100644
--- a/crates/rust-analyzer/src/bin/main.rs
+++ b/crates/rust-analyzer/src/bin/main.rs
@@ -3,6 +3,8 @@
 //! Based on cli flags, either spawns an LSP server, or runs a batch analysis
 mod args;
 
+use std::convert::TryFrom;
+
 use lsp_server::Connection;
 use rust_analyzer::{
     cli,
@@ -10,9 +12,11 @@ use rust_analyzer::{
     from_json, Result,
 };
 
-use crate::args::HelpPrinted;
+use ra_db::AbsPathBuf;
 use ra_project_model::ProjectManifest;
 
+use crate::args::HelpPrinted;
+
 fn main() -> Result<()> {
     setup_logging()?;
     let args = match args::Args::parse()? {
@@ -20,6 +24,9 @@ fn main() -> Result<()> {
         Err(HelpPrinted) => return Ok(()),
     };
     match args.command {
+        args::Command::RunServer => run_server()?,
+        args::Command::ProcMacro => ra_proc_macro_srv::cli::run()?,
+
         args::Command::Parse { no_dump } => cli::parse(no_dump)?,
         args::Command::Symbols => cli::symbols()?,
         args::Command::Highlight { rainbow } => cli::highlight(rainbow)?,
@@ -41,7 +48,6 @@ fn main() -> Result<()> {
             load_output_dirs,
             with_proc_macro,
         )?,
-
         args::Command::Bench { path, what, load_output_dirs, with_proc_macro } => {
             cli::analysis_bench(
                 args.verbosity,
@@ -51,13 +57,9 @@ fn main() -> Result<()> {
                 with_proc_macro,
             )?
         }
-
         args::Command::Diagnostics { path, load_output_dirs, with_proc_macro, all } => {
             cli::diagnostics(path.as_ref(), load_output_dirs, with_proc_macro, all)?
         }
-
-        args::Command::ProcMacro => run_proc_macro_srv()?,
-        args::Command::RunServer => run_server()?,
         args::Command::Version => println!("rust-analyzer {}", env!("REV")),
     }
     Ok(())
@@ -70,11 +72,6 @@ fn setup_logging() -> Result<()> {
     Ok(())
 }
 
-fn run_proc_macro_srv() -> Result<()> {
-    ra_proc_macro_srv::cli::run()?;
-    Ok(())
-}
-
 fn run_server() -> Result<()> {
     log::info!("lifecycle: server started");
 
@@ -103,14 +100,23 @@ fn run_server() -> Result<()> {
     }
 
     let config = {
-        let mut config = Config::default();
+        let root_path = match initialize_params
+            .root_uri
+            .and_then(|it| it.to_file_path().ok())
+            .and_then(|it| AbsPathBuf::try_from(it).ok())
+        {
+            Some(it) => it,
+            None => {
+                let cwd = std::env::current_dir()?;
+                AbsPathBuf::assert(cwd)
+            }
+        };
+
+        let mut config = Config::new(root_path);
         if let Some(value) = &initialize_params.initialization_options {
             config.update(value);
         }
         config.update_caps(&initialize_params.capabilities);
-        let cwd = std::env::current_dir()?;
-        config.root_path =
-            initialize_params.root_uri.and_then(|it| it.to_file_path().ok()).unwrap_or(cwd);
 
         if config.linked_projects.is_empty() {
             let workspace_roots = initialize_params
@@ -119,6 +125,7 @@ fn run_server() -> Result<()> {
                     workspaces
                         .into_iter()
                         .filter_map(|it| it.uri.to_file_path().ok())
+                        .filter_map(|it| AbsPathBuf::try_from(it).ok())
                         .collect::<Vec<_>>()
                 })
                 .filter(|workspaces| !workspaces.is_empty())
diff --git a/crates/rust-analyzer/src/cli/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs
index 90868760b..2f4c29e06 100644
--- a/crates/rust-analyzer/src/cli/analysis_stats.rs
+++ b/crates/rust-analyzer/src/cli/analysis_stats.rs
@@ -121,7 +121,7 @@ pub fn analysis_stats(
             let original_file = src.file_id.original_file(db);
             let path = vfs.file_path(original_file);
             let syntax_range = src.value.syntax().text_range();
-            format_to!(msg, " ({:?} {:?})", path, syntax_range);
+            format_to!(msg, " ({} {:?})", path, syntax_range);
         }
         if verbosity.is_spammy() {
             bar.println(msg.to_string());
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs
index 00bbbaf40..e910db6eb 100644
--- a/crates/rust-analyzer/src/cli/load_cargo.rs
+++ b/crates/rust-analyzer/src/cli/load_cargo.rs
@@ -16,7 +16,7 @@ pub fn load_cargo(
     load_out_dirs_from_check: bool,
     with_proc_macro: bool,
 ) -> Result<(AnalysisHost, vfs::Vfs)> {
-    let root = std::env::current_dir()?.join(root);
+    let root = AbsPathBuf::assert(std::env::current_dir()?.join(root));
     let root = ProjectManifest::discover_single(&root)?;
     let ws = ProjectWorkspace::load(
         root,
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index aa2c4ae15..0be34c43f 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -11,6 +11,7 @@ use std::{ffi::OsString, path::PathBuf};
 
 use crate::diagnostics::DiagnosticsConfig;
 use lsp_types::ClientCapabilities;
+use ra_db::AbsPathBuf;
 use ra_flycheck::FlycheckConfig;
 use ra_ide::{AssistConfig, CompletionConfig, HoverConfig, InlayHintsConfig};
 use ra_project_model::{CargoConfig, JsonProject, ProjectManifest};
@@ -40,7 +41,7 @@ pub struct Config {
 
     pub with_sysroot: bool,
     pub linked_projects: Vec<LinkedProject>,
-    pub root_path: PathBuf,
+    pub root_path: AbsPathBuf,
 }
 
 #[derive(Debug, Clone)]
@@ -131,8 +132,8 @@ pub struct ClientCapsConfig {
     pub hover_actions: bool,
 }
 
-impl Default for Config {
-    fn default() -> Self {
+impl Config {
+    pub fn new(root_path: AbsPathBuf) -> Self {
         Config {
             client_caps: ClientCapsConfig::default(),
 
@@ -171,18 +172,16 @@ impl Default for Config {
             lens: LensConfig::default(),
             hover: HoverConfig::default(),
             linked_projects: Vec::new(),
-            root_path: PathBuf::new(),
+            root_path,
         }
     }
-}
 
-impl Config {
     #[rustfmt::skip]
     pub fn update(&mut self, value: &serde_json::Value) {
         log::info!("Config::update({:#})", value);
 
         let client_caps = self.client_caps.clone();
-        *self = Default::default();
+        *self = Config::new(self.root_path.clone());
         self.client_caps = client_caps;
 
         set(value, "/withSysroot", &mut self.with_sysroot);
@@ -279,9 +278,12 @@ impl Config {
                 self.linked_projects.clear();
                 for linked_project in linked_projects {
                     let linked_project = match linked_project {
-                        ManifestOrJsonProject::Manifest(it) => match ProjectManifest::from_manifest_file(it) {
-                            Ok(it) => it.into(),
-                            Err(_) => continue,
+                        ManifestOrJsonProject::Manifest(it) => {
+                            let path = self.root_path.join(it);
+                            match ProjectManifest::from_manifest_file(path) {
+                                Ok(it) => it.into(),
+                                Err(_) => continue,
+                            }
                         }
                         ManifestOrJsonProject::JsonProject(it) => it.into(),
                     };
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs
index e2ddb7933..f18694feb 100644
--- a/crates/rust-analyzer/src/global_state.rs
+++ b/crates/rust-analyzer/src/global_state.rs
@@ -310,11 +310,10 @@ impl ProjectFolders {
 
             let mut file_set_roots: Vec<VfsPath> = vec![];
 
-            let path = AbsPathBuf::try_from(path).unwrap();
             let entry = if root.is_member() {
-                vfs::loader::Entry::local_cargo_package(path.clone())
+                vfs::loader::Entry::local_cargo_package(path.to_path_buf())
             } else {
-                vfs::loader::Entry::cargo_package_dependency(path.clone())
+                vfs::loader::Entry::cargo_package_dependency(path.to_path_buf())
             };
             res.load.push(entry);
             if root.is_member() {
@@ -329,7 +328,7 @@ impl ProjectFolders {
                 }
                 file_set_roots.push(out_dir.into());
             }
-            file_set_roots.push(path.into());
+            file_set_roots.push(path.to_path_buf().into());
 
             if root.is_member() {
                 local_filesets.push(fsc.len());
diff --git a/crates/rust-analyzer/src/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs
index 2ea63d33b..10fe40cb5 100644
--- a/crates/rust-analyzer/src/semantic_tokens.rs
+++ b/crates/rust-analyzer/src/semantic_tokens.rs
@@ -39,13 +39,14 @@ define_semantic_token_types![
     (BOOLEAN, "boolean"),
     (BUILTIN_TYPE, "builtinType"),
     (ENUM_MEMBER, "enumMember"),
+    (ESCAPE_SEQUENCE, "escapeSequence"),
+    (FORMAT_SPECIFIER, "formatSpecifier"),
+    (GENERIC, "generic"),
     (LIFETIME, "lifetime"),
     (SELF_KEYWORD, "selfKeyword"),
     (TYPE_ALIAS, "typeAlias"),
     (UNION, "union"),
     (UNRESOLVED_REFERENCE, "unresolvedReference"),
-    (FORMAT_SPECIFIER, "formatSpecifier"),
-    (ESCAPE_SEQUENCE, "escapeSequence"),
 ];
 
 macro_rules! define_semantic_token_modifiers {
@@ -68,6 +69,7 @@ macro_rules! define_semantic_token_modifiers {
 define_semantic_token_modifiers![
     (CONSTANT, "constant"),
     (CONTROL_FLOW, "controlFlow"),
+    (INJECTED, "injected"),
     (MUTABLE, "mutable"),
     (UNSAFE, "unsafe"),
     (ATTRIBUTE_MODIFIER, "attribute"),
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 7b45b169d..da9887a9a 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -295,6 +295,7 @@ fn semantic_token_type_and_modifiers(
         HighlightTag::SelfType => lsp_types::SemanticTokenType::TYPE,
         HighlightTag::Field => lsp_types::SemanticTokenType::PROPERTY,
         HighlightTag::Function => lsp_types::SemanticTokenType::FUNCTION,
+        HighlightTag::Generic => semantic_tokens::GENERIC,
         HighlightTag::Module => lsp_types::SemanticTokenType::NAMESPACE,
         HighlightTag::Constant => {
             mods |= semantic_tokens::CONSTANT;
@@ -331,6 +332,7 @@ fn semantic_token_type_and_modifiers(
             HighlightModifier::Attribute => semantic_tokens::ATTRIBUTE_MODIFIER,
             HighlightModifier::Definition => lsp_types::SemanticTokenModifier::DECLARATION,
             HighlightModifier::Documentation => lsp_types::SemanticTokenModifier::DOCUMENTATION,
+            HighlightModifier::Injected => semantic_tokens::INJECTED,
             HighlightModifier::ControlFlow => semantic_tokens::CONTROL_FLOW,
             HighlightModifier::Mutable => semantic_tokens::MUTABLE,
             HighlightModifier::Unsafe => semantic_tokens::UNSAFE,
diff --git a/crates/rust-analyzer/tests/heavy_tests/support.rs b/crates/rust-analyzer/tests/heavy_tests/support.rs
index 001a2a104..49f194f7e 100644
--- a/crates/rust-analyzer/tests/heavy_tests/support.rs
+++ b/crates/rust-analyzer/tests/heavy_tests/support.rs
@@ -17,9 +17,10 @@ use serde_json::{to_string_pretty, Value};
 use tempfile::TempDir;
 use test_utils::{find_mismatch, Fixture};
 
+use ra_db::AbsPathBuf;
 use ra_project_model::ProjectManifest;
 use rust_analyzer::{
-    config::{ClientCapsConfig, Config, LinkedProject},
+    config::{ClientCapsConfig, Config, FilesConfig, FilesWatcher, LinkedProject},
     main_loop,
 };
 
@@ -70,10 +71,11 @@ impl<'a> Project<'a> {
             fs::write(path.as_path(), entry.text.as_bytes()).unwrap();
         }
 
+        let tmp_dir_path = AbsPathBuf::assert(tmp_dir.path().to_path_buf());
         let mut roots =
-            self.roots.into_iter().map(|root| tmp_dir.path().join(root)).collect::<Vec<_>>();
+            self.roots.into_iter().map(|root| tmp_dir_path.join(root)).collect::<Vec<_>>();
         if roots.is_empty() {
-            roots.push(tmp_dir.path().to_path_buf());
+            roots.push(tmp_dir_path.clone());
         }
         let linked_projects = roots
             .into_iter()
@@ -90,9 +92,9 @@ impl<'a> Project<'a> {
             },
             with_sysroot: self.with_sysroot,
             linked_projects,
-            ..Config::default()
+            files: FilesConfig { watcher: FilesWatcher::Client, exclude: Vec::new() },
+            ..Config::new(tmp_dir_path)
         };
-
         if let Some(f) = &self.config {
             f(&mut config)
         }
@@ -173,8 +175,14 @@ impl Server {
         self.client.sender.send(r.into()).unwrap();
         while let Some(msg) = self.recv() {
             match msg {
-                Message::Request(req) if req.method == "window/workDoneProgress/create" => (),
-                Message::Request(req) => panic!("unexpected request: {:?}", req),
+                Message::Request(req) => {
+                    if req.method != "window/workDoneProgress/create"
+                        && !(req.method == "client/registerCapability"
+                            && req.params.to_string().contains("workspace/didChangeWatchedFiles"))
+                    {
+                        panic!("unexpected request: {:?}", req)
+                    }
+                }
                 Message::Notification(_) => (),
                 Message::Response(res) => {
                     assert_eq!(res.id, id);
diff --git a/crates/test_utils/src/fixture.rs b/crates/test_utils/src/fixture.rs
index 7e93fbcd6..fad8f7e2c 100644
--- a/crates/test_utils/src/fixture.rs
+++ b/crates/test_utils/src/fixture.rs
@@ -8,7 +8,7 @@ use stdx::{lines_with_ends, split_delim, trim_indent};
 pub struct Fixture {
     pub path: String,
     pub text: String,
-    pub crate_name: Option<String>,
+    pub krate: Option<String>,
     pub deps: Vec<String>,
     pub cfg_atoms: Vec<String>,
     pub cfg_key_values: Vec<(String, String)>,
@@ -56,7 +56,7 @@ impl Fixture {
     }
 
     //- /lib.rs crate:foo deps:bar,baz cfg:foo=a,bar=b env:OUTDIR=path/to,OTHER=foo
-    pub fn parse_meta_line(meta: &str) -> Fixture {
+    fn parse_meta_line(meta: &str) -> Fixture {
         assert!(meta.starts_with("//-"));
         let meta = meta["//-".len()..].trim();
         let components = meta.split_ascii_whitespace().collect::<Vec<_>>();
@@ -98,7 +98,7 @@ impl Fixture {
         Fixture {
             path,
             text: String::new(),
-            crate_name: krate,
+            krate: krate,
             deps,
             cfg_atoms,
             cfg_key_values,
@@ -136,7 +136,7 @@ fn parse_fixture_gets_full_meta() {
     let meta = &parsed[0];
     assert_eq!("mod m;\n", meta.text);
 
-    assert_eq!("foo", meta.crate_name.as_ref().unwrap());
+    assert_eq!("foo", meta.krate.as_ref().unwrap());
     assert_eq!("/lib.rs", meta.path);
     assert_eq!(2, meta.env.len());
 }
diff --git a/crates/vfs/src/vfs_path.rs b/crates/vfs/src/vfs_path.rs
index 0a8a86c62..940f91d0e 100644
--- a/crates/vfs/src/vfs_path.rs
+++ b/crates/vfs/src/vfs_path.rs
@@ -5,7 +5,7 @@ use paths::{AbsPath, AbsPathBuf};
 
 /// Long-term, we want to support files which do not reside in the file-system,
 /// so we treat VfsPaths as opaque identifiers.
-#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
+#[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
 pub struct VfsPath(VfsPathRepr);
 
 impl VfsPath {
@@ -50,7 +50,7 @@ impl VfsPath {
     }
 }
 
-#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
+#[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
 enum VfsPathRepr {
     PathBuf(AbsPathBuf),
     VirtualPath(VirtualPath),
@@ -71,6 +71,21 @@ impl fmt::Display for VfsPath {
     }
 }
 
+impl fmt::Debug for VfsPath {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&self.0, f)
+    }
+}
+
+impl fmt::Debug for VfsPathRepr {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match &self {
+            VfsPathRepr::PathBuf(it) => fmt::Debug::fmt(&it.display(), f),
+            VfsPathRepr::VirtualPath(VirtualPath(it)) => fmt::Debug::fmt(&it, f),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
 struct VirtualPath(String);
 
diff --git a/editors/code/rollup.config.js b/editors/code/rollup.config.js
index 58360eabb..4b4c47f4a 100644
--- a/editors/code/rollup.config.js
+++ b/editors/code/rollup.config.js
@@ -11,12 +11,7 @@ export default {
         resolve({
             preferBuiltins: true
         }),
-        commonjs({
-            namedExports: {
-                // squelch missing import warnings
-                'vscode-languageclient': ['CreateFile', 'RenameFile', 'ErrorCodes', 'WorkDoneProgress', 'WorkDoneProgressBegin', 'WorkDoneProgressReport', 'WorkDoneProgressEnd']
-            }
-        })
+        commonjs()
     ],
     external: [...nodeBuiltins, 'vscode'],
     output: {