61 files changed, 623 insertions, 529 deletions

diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs
index deb9f95d7..3bbcdb0b8 100644
--- a/crates/ra_batch/src/lib.rs
+++ b/crates/ra_batch/src/lib.rs
@@ -16,11 +16,7 @@ use vfs_filter::IncludeRustFiles;
 
 type Result<T> = std::result::Result<T, failure::Error>;
 
-#[salsa::database(
-    ra_db::SourceDatabaseStorage,
-    db::HirDatabaseStorage,
-    db::PersistentHirDatabaseStorage
-)]
+#[salsa::database(ra_db::SourceDatabaseStorage, db::HirDatabaseStorage, db::DefDatabaseStorage)]
 #[derive(Debug)]
 pub struct BatchDatabase {
     runtime: salsa::Runtime<BatchDatabase>,
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 2b1001d48..a5f4e489f 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -136,7 +136,7 @@ impl CrateGraph {
         self.arena[&crate_id].edition
     }
 
-    // TODO: this only finds one crate with the given root; we could have multiple
+    // FIXME: this only finds one crate with the given root; we could have multiple
     pub fn crate_id_for_crate_root(&self, file_id: FileId) -> Option<CrateId> {
         let (&crate_id, _) = self.arena.iter().find(|(_crate_id, data)| data.file_id == file_id)?;
         Some(crate_id)
diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs
index 325f1d7b6..78ea8976b 100644
--- a/crates/ra_hir/src/adt.rs
+++ b/crates/ra_hir/src/adt.rs
@@ -12,7 +12,7 @@ use ra_syntax::{
 use crate::{
     Name, AsName, Struct, Enum, EnumVariant, Crate,
     HirDatabase, HirFileId, StructField, FieldSource,
-    type_ref::TypeRef, PersistentHirDatabase,
+    type_ref::TypeRef, DefDatabase,
 };
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
@@ -33,7 +33,7 @@ impl AdtDef {
 }
 
 impl Struct {
-    pub(crate) fn variant_data(&self, db: &impl PersistentHirDatabase) -> Arc<VariantData> {
+    pub(crate) fn variant_data(&self, db: &impl DefDatabase) -> Arc<VariantData> {
         db.struct_data((*self).into()).variant_data.clone()
     }
 }
@@ -52,10 +52,7 @@ impl StructData {
         StructData { name, variant_data }
     }
 
-    pub(crate) fn struct_data_query(
-        db: &impl PersistentHirDatabase,
-        struct_: Struct,
-    ) -> Arc<StructData> {
+    pub(crate) fn struct_data_query(db: &impl DefDatabase, struct_: Struct) -> Arc<StructData> {
         let (_, struct_def) = struct_.source(db);
         Arc::new(StructData::new(&*struct_def))
     }
@@ -68,7 +65,7 @@ fn variants(enum_def: &ast::EnumDef) -> impl Iterator<Item = &ast::EnumVariant>
 impl EnumVariant {
     pub(crate) fn source_impl(
         &self,
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
     ) -> (HirFileId, TreeArc<ast::EnumVariant>) {
         let (file_id, enum_def) = self.parent.source(db);
         let var = variants(&*enum_def)
@@ -79,7 +76,7 @@ impl EnumVariant {
             .to_owned();
         (file_id, var)
     }
-    pub(crate) fn variant_data(&self, db: &impl PersistentHirDatabase) -> Arc<VariantData> {
+    pub(crate) fn variant_data(&self, db: &impl DefDatabase) -> Arc<VariantData> {
         db.enum_data(self.parent).variants[self.id].variant_data.clone()
     }
 }
@@ -91,7 +88,7 @@ pub struct EnumData {
 }
 
 impl EnumData {
-    pub(crate) fn enum_data_query(db: &impl PersistentHirDatabase, e: Enum) -> Arc<EnumData> {
+    pub(crate) fn enum_data_query(db: &impl DefDatabase, e: Enum) -> Arc<EnumData> {
         let (_file_id, enum_def) = e.source(db);
         let name = enum_def.name().map(|n| n.as_name());
         let variants = variants(&*enum_def)
@@ -189,7 +186,7 @@ impl VariantDef {
             VariantDef::EnumVariant(it) => it.field(db, name),
         }
     }
-    pub(crate) fn variant_data(self, db: &impl PersistentHirDatabase) -> Arc<VariantData> {
+    pub(crate) fn variant_data(self, db: &impl DefDatabase) -> Arc<VariantData> {
         match self {
             VariantDef::Struct(it) => it.variant_data(db),
             VariantDef::EnumVariant(it) => it.variant_data(db),
@@ -198,7 +195,7 @@ impl VariantDef {
 }
 
 impl StructField {
-    pub(crate) fn source_impl(&self, db: &impl PersistentHirDatabase) -> (HirFileId, FieldSource) {
+    pub(crate) fn source_impl(&self, db: &impl DefDatabase) -> (HirFileId, FieldSource) {
         let var_data = self.parent.variant_data(db);
         let fields = var_data.fields().unwrap();
         let ss;
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs
index b00481cd5..45fa4cd11 100644
--- a/crates/ra_hir/src/code_model_api.rs
+++ b/crates/ra_hir/src/code_model_api.rs
@@ -6,7 +6,7 @@ use ra_syntax::{ast::self, TreeArc, SyntaxNode};
 
 use crate::{
     Name, ScopesWithSourceMap, Ty, HirFileId,
-    HirDatabase, PersistentHirDatabase,
+    HirDatabase, DefDatabase,
     type_ref::TypeRef,
     nameres::{ModuleScope, Namespace, ImportId, CrateModuleId},
     expr::{Body, BodySourceMap},
@@ -38,24 +38,21 @@ impl Crate {
         self.crate_id
     }
 
-    pub fn dependencies(&self, db: &impl PersistentHirDatabase) -> Vec<CrateDependency> {
+    pub fn dependencies(&self, db: &impl DefDatabase) -> Vec<CrateDependency> {
         self.dependencies_impl(db)
     }
 
-    pub fn root_module(&self, db: &impl PersistentHirDatabase) -> Option<Module> {
+    pub fn root_module(&self, db: &impl DefDatabase) -> Option<Module> {
         self.root_module_impl(db)
     }
 
-    pub fn edition(&self, db: &impl PersistentHirDatabase) -> Edition {
+    pub fn edition(&self, db: &impl DefDatabase) -> Edition {
         let crate_graph = db.crate_graph();
         crate_graph.edition(self.crate_id)
     }
 
-    // TODO: should this be in source_binder?
-    pub fn source_root_crates(
-        db: &impl PersistentHirDatabase,
-        source_root: SourceRootId,
-    ) -> Vec<Crate> {
+    // FIXME: should this be in source_binder?
+    pub fn source_root_crates(db: &impl DefDatabase, source_root: SourceRootId) -> Vec<Crate> {
         let crate_ids = db.source_root_crates(source_root);
         crate_ids.iter().map(|&crate_id| Crate { crate_id }).collect()
     }
@@ -101,7 +98,6 @@ pub enum ModuleSource {
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub enum Problem {
     UnresolvedModule { candidate: RelativePathBuf },
-    NotDirOwner { move_to: RelativePathBuf, candidate: RelativePathBuf },
 }
 
 impl Module {
@@ -111,7 +107,7 @@ impl Module {
     }
 
     /// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.
-    pub fn definition_source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, ModuleSource) {
+    pub fn definition_source(&self, db: &impl DefDatabase) -> (HirFileId, ModuleSource) {
         self.definition_source_impl(db)
     }
 
@@ -134,14 +130,14 @@ impl Module {
     }
 
     /// Returns the crate this module is part of.
-    pub fn krate(&self, _db: &impl PersistentHirDatabase) -> Option<Crate> {
+    pub fn krate(&self, _db: &impl DefDatabase) -> Option<Crate> {
         Some(self.krate)
     }
 
     /// Topmost parent of this module. Every module has a `crate_root`, but some
     /// might be missing `krate`. This can happen if a module's file is not included
     /// in the module tree of any target in `Cargo.toml`.
-    pub fn crate_root(&self, db: &impl PersistentHirDatabase) -> Module {
+    pub fn crate_root(&self, db: &impl DefDatabase) -> Module {
         self.crate_root_impl(db)
     }
 
@@ -151,12 +147,12 @@ impl Module {
     }
 
     /// Iterates over all child modules.
-    pub fn children(&self, db: &impl PersistentHirDatabase) -> impl Iterator<Item = Module> {
+    pub fn children(&self, db: &impl DefDatabase) -> impl Iterator<Item = Module> {
         self.children_impl(db)
     }
 
     /// Finds a parent module.
-    pub fn parent(&self, db: &impl PersistentHirDatabase) -> Option<Module> {
+    pub fn parent(&self, db: &impl DefDatabase) -> Option<Module> {
         self.parent_impl(db)
     }
 
@@ -229,7 +225,7 @@ impl StructField {
         self.parent.variant_data(db).fields().unwrap()[self.id].name.clone()
     }
 
-    pub fn source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, FieldSource) {
+    pub fn source(&self, db: &impl DefDatabase) -> (HirFileId, FieldSource) {
         self.source_impl(db)
     }
 
@@ -257,7 +253,7 @@ pub struct Struct {
 }
 
 impl Struct {
-    pub fn source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, TreeArc<ast::StructDef>) {
+    pub fn source(&self, db: &impl DefDatabase) -> (HirFileId, TreeArc<ast::StructDef>) {
         self.id.source(db)
     }
 
@@ -289,7 +285,7 @@ impl Struct {
             .map(|(id, _)| StructField { parent: (*self).into(), id })
     }
 
-    pub fn generic_params(&self, db: &impl PersistentHirDatabase) -> Arc<GenericParams> {
+    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
         db.generic_params((*self).into())
     }
 
@@ -301,7 +297,7 @@ impl Struct {
         db.type_for_def((*self).into(), Namespace::Values)
     }
 
-    // TODO move to a more general type
+    // FIXME move to a more general type
     /// Builds a resolver for type references inside this struct.
     pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
         // take the outer scope...
@@ -325,7 +321,7 @@ pub struct Enum {
 }
 
 impl Enum {
-    pub fn source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, TreeArc<ast::EnumDef>) {
+    pub fn source(&self, db: &impl DefDatabase) -> (HirFileId, TreeArc<ast::EnumDef>) {
         self.id.source(db)
     }
 
@@ -337,7 +333,7 @@ impl Enum {
         db.enum_data(*self).name.clone()
     }
 
-    pub fn variants(&self, db: &impl PersistentHirDatabase) -> Vec<EnumVariant> {
+    pub fn variants(&self, db: &impl DefDatabase) -> Vec<EnumVariant> {
         db.enum_data(*self)
             .variants
             .iter()
@@ -345,7 +341,7 @@ impl Enum {
             .collect()
     }
 
-    pub fn variant(&self, db: &impl PersistentHirDatabase, name: &Name) -> Option<EnumVariant> {
+    pub fn variant(&self, db: &impl DefDatabase, name: &Name) -> Option<EnumVariant> {
         db.enum_data(*self)
             .variants
             .iter()
@@ -353,7 +349,7 @@ impl Enum {
             .map(|(id, _)| EnumVariant { parent: *self, id })
     }
 
-    pub fn generic_params(&self, db: &impl PersistentHirDatabase) -> Arc<GenericParams> {
+    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
         db.generic_params((*self).into())
     }
 
@@ -361,7 +357,7 @@ impl Enum {
         db.type_for_def((*self).into(), Namespace::Types)
     }
 
-    // TODO: move to a more general type
+    // FIXME: move to a more general type
     /// Builds a resolver for type references inside this struct.
     pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
         // take the outer scope...
@@ -386,20 +382,17 @@ pub struct EnumVariant {
 }
 
 impl EnumVariant {
-    pub fn source(
-        &self,
-        db: &impl PersistentHirDatabase,
-    ) -> (HirFileId, TreeArc<ast::EnumVariant>) {
+    pub fn source(&self, db: &impl DefDatabase) -> (HirFileId, TreeArc<ast::EnumVariant>) {
         self.source_impl(db)
     }
     pub fn module(&self, db: &impl HirDatabase) -> Module {
         self.parent.module(db)
     }
-    pub fn parent_enum(&self, _db: &impl PersistentHirDatabase) -> Enum {
+    pub fn parent_enum(&self, _db: &impl DefDatabase) -> Enum {
         self.parent
     }
 
-    pub fn name(&self, db: &impl PersistentHirDatabase) -> Option<Name> {
+    pub fn name(&self, db: &impl DefDatabase) -> Option<Name> {
         db.enum_data(self.parent).variants[self.id].name.clone()
     }
 
@@ -465,11 +458,11 @@ impl FnSignature {
 }
 
 impl Function {
-    pub fn source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, TreeArc<ast::FnDef>) {
+    pub fn source(&self, db: &impl DefDatabase) -> (HirFileId, TreeArc<ast::FnDef>) {
         self.id.source(db)
     }
 
-    pub fn module(&self, db: &impl PersistentHirDatabase) -> Module {
+    pub fn module(&self, db: &impl DefDatabase) -> Module {
         self.id.module(db)
     }
 
@@ -503,17 +496,17 @@ impl Function {
         db.infer(*self)
     }
 
-    pub fn generic_params(&self, db: &impl PersistentHirDatabase) -> Arc<GenericParams> {
+    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
         db.generic_params((*self).into())
     }
 
     /// The containing impl block, if this is a method.
-    pub fn impl_block(&self, db: &impl PersistentHirDatabase) -> Option<ImplBlock> {
+    pub fn impl_block(&self, db: &impl DefDatabase) -> Option<ImplBlock> {
         let module_impls = db.impls_in_module(self.module(db));
         ImplBlock::containing(module_impls, (*self).into())
     }
 
-    // TODO: move to a more general type for 'body-having' items
+    // FIXME: move to a more general type for 'body-having' items
     /// Builds a resolver for code inside this item.
     pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
         // take the outer scope...
@@ -540,11 +533,11 @@ pub struct Const {
 }
 
 impl Const {
-    pub fn source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, TreeArc<ast::ConstDef>) {
+    pub fn source(&self, db: &impl DefDatabase) -> (HirFileId, TreeArc<ast::ConstDef>) {
         self.id.source(db)
     }
 
-    pub fn module(&self, db: &impl PersistentHirDatabase) -> Module {
+    pub fn module(&self, db: &impl DefDatabase) -> Module {
         self.id.module(db)
     }
 
@@ -553,12 +546,12 @@ impl Const {
     }
 
     /// The containing impl block, if this is a method.
-    pub fn impl_block(&self, db: &impl PersistentHirDatabase) -> Option<ImplBlock> {
+    pub fn impl_block(&self, db: &impl DefDatabase) -> Option<ImplBlock> {
         let module_impls = db.impls_in_module(self.module(db));
         ImplBlock::containing(module_impls, (*self).into())
     }
 
-    // TODO: move to a more general type for 'body-having' items
+    // FIXME: move to a more general type for 'body-having' items
     /// Builds a resolver for code inside this item.
     pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
         // take the outer scope...
@@ -599,11 +592,11 @@ pub struct Static {
 }
 
 impl Static {
-    pub fn source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, TreeArc<ast::StaticDef>) {
+    pub fn source(&self, db: &impl DefDatabase) -> (HirFileId, TreeArc<ast::StaticDef>) {
         self.id.source(db)
     }
 
-    pub fn module(&self, db: &impl PersistentHirDatabase) -> Module {
+    pub fn module(&self, db: &impl DefDatabase) -> Module {
         self.id.module(db)
     }
 
@@ -630,15 +623,15 @@ pub struct Trait {
 }
 
 impl Trait {
-    pub fn source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, TreeArc<ast::TraitDef>) {
+    pub fn source(&self, db: &impl DefDatabase) -> (HirFileId, TreeArc<ast::TraitDef>) {
         self.id.source(db)
     }
 
-    pub fn module(&self, db: &impl PersistentHirDatabase) -> Module {
+    pub fn module(&self, db: &impl DefDatabase) -> Module {
         self.id.module(db)
     }
 
-    pub fn generic_params(&self, db: &impl PersistentHirDatabase) -> Arc<GenericParams> {
+    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
         db.generic_params((*self).into())
     }
 }
@@ -655,28 +648,25 @@ pub struct TypeAlias {
 }
 
 impl TypeAlias {
-    pub fn source(
-        &self,
-        db: &impl PersistentHirDatabase,
-    ) -> (HirFileId, TreeArc<ast::TypeAliasDef>) {
+    pub fn source(&self, db: &impl DefDatabase) -> (HirFileId, TreeArc<ast::TypeAliasDef>) {
         self.id.source(db)
     }
 
-    pub fn generic_params(&self, db: &impl PersistentHirDatabase) -> Arc<GenericParams> {
+    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
         db.generic_params((*self).into())
     }
 
-    pub fn module(&self, db: &impl PersistentHirDatabase) -> Module {
+    pub fn module(&self, db: &impl DefDatabase) -> Module {
         self.id.module(db)
     }
 
     /// The containing impl block, if this is a method.
-    pub fn impl_block(&self, db: &impl PersistentHirDatabase) -> Option<ImplBlock> {
+    pub fn impl_block(&self, db: &impl DefDatabase) -> Option<ImplBlock> {
         let module_impls = db.impls_in_module(self.module(db));
         ImplBlock::containing(module_impls, (*self).into())
     }
 
-    pub fn type_ref(self, db: &impl PersistentHirDatabase) -> Arc<TypeRef> {
+    pub fn type_ref(self, db: &impl DefDatabase) -> Arc<TypeRef> {
         db.type_alias_ref(self)
     }
 
diff --git a/crates/ra_hir/src/code_model_impl/function.rs b/crates/ra_hir/src/code_model_impl/function.rs
index c1654b069..334cb302b 100644
--- a/crates/ra_hir/src/code_model_impl/function.rs
+++ b/crates/ra_hir/src/code_model_impl/function.rs
@@ -5,14 +5,11 @@ use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner};
 use crate::{
     Name, AsName, Function, FnSignature,
     type_ref::{TypeRef, Mutability},
-    PersistentHirDatabase,
+    DefDatabase,
 };
 
 impl FnSignature {
-    pub(crate) fn fn_signature_query(
-        db: &impl PersistentHirDatabase,
-        func: Function,
-    ) -> Arc<FnSignature> {
+    pub(crate) fn fn_signature_query(db: &impl DefDatabase, func: Function) -> Arc<FnSignature> {
         let (_, node) = func.source(db);
         let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
         let mut params = Vec::new();
diff --git a/crates/ra_hir/src/code_model_impl/konst.rs b/crates/ra_hir/src/code_model_impl/konst.rs
index 8b861a81f..db4e5ce5c 100644
--- a/crates/ra_hir/src/code_model_impl/konst.rs
+++ b/crates/ra_hir/src/code_model_impl/konst.rs
@@ -5,7 +5,7 @@ use ra_syntax::ast::{NameOwner, TypeAscriptionOwner};
 use crate::{

     Name, AsName, Const, ConstSignature, Static,

     type_ref::{TypeRef},

-    PersistentHirDatabase,

+    DefDatabase,

 };

 

 fn const_signature_for<N: NameOwner + TypeAscriptionOwner>(node: &N) -> Arc<ConstSignature> {

@@ -17,7 +17,7 @@ fn const_signature_for<N: NameOwner + TypeAscriptionOwner>(node: &N) -> Arc<Cons
 

 impl ConstSignature {

     pub(crate) fn const_signature_query(

-        db: &impl PersistentHirDatabase,

+        db: &impl DefDatabase,

         konst: Const,

     ) -> Arc<ConstSignature> {

         let (_, node) = konst.source(db);

@@ -25,7 +25,7 @@ impl ConstSignature {
     }

 

     pub(crate) fn static_signature_query(

-        db: &impl PersistentHirDatabase,

+        db: &impl DefDatabase,

         konst: Static,

     ) -> Arc<ConstSignature> {

         let (_, node) = konst.source(db);

diff --git a/crates/ra_hir/src/code_model_impl/krate.rs b/crates/ra_hir/src/code_model_impl/krate.rs
index cc87c6f14..914414fc3 100644
--- a/crates/ra_hir/src/code_model_impl/krate.rs
+++ b/crates/ra_hir/src/code_model_impl/krate.rs
@@ -1,12 +1,9 @@
 use crate::{
-    Crate, CrateDependency, AsName, Module, PersistentHirDatabase,
+    Crate, CrateDependency, AsName, Module, DefDatabase,
 };
 
 impl Crate {
-    pub(crate) fn dependencies_impl(
-        &self,
-        db: &impl PersistentHirDatabase,
-    ) -> Vec<CrateDependency> {
+    pub(crate) fn dependencies_impl(&self, db: &impl DefDatabase) -> Vec<CrateDependency> {
         let crate_graph = db.crate_graph();
         crate_graph
             .dependencies(self.crate_id)
@@ -17,7 +14,7 @@ impl Crate {
             })
             .collect()
     }
-    pub(crate) fn root_module_impl(&self, db: &impl PersistentHirDatabase) -> Option<Module> {
+    pub(crate) fn root_module_impl(&self, db: &impl DefDatabase) -> Option<Module> {
         let module_id = db.crate_def_map(*self).root();
         let module = Module { krate: *self, module_id };
         Some(module)
diff --git a/crates/ra_hir/src/code_model_impl/module.rs b/crates/ra_hir/src/code_model_impl/module.rs
index f7d15c55e..52a33e981 100644
--- a/crates/ra_hir/src/code_model_impl/module.rs
+++ b/crates/ra_hir/src/code_model_impl/module.rs
@@ -4,13 +4,13 @@ use ra_syntax::{ast, SyntaxNode, TreeArc, AstNode};
 use crate::{
     Module, ModuleSource, Problem, Name,
     nameres::{CrateModuleId, ImportId},
-    HirDatabase, PersistentHirDatabase,
+    HirDatabase, DefDatabase,
     HirFileId, SourceItemId,
 };
 
 impl ModuleSource {
     pub(crate) fn new(
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
         file_id: Option<FileId>,
         decl_id: Option<SourceItemId>,
     ) -> ModuleSource {
@@ -49,7 +49,7 @@ impl Module {
 
     pub(crate) fn definition_source_impl(
         &self,
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
     ) -> (HirFileId, ModuleSource) {
         let def_map = db.crate_def_map(self.krate);
         let decl_id = def_map[self.module_id].declaration;
@@ -80,7 +80,7 @@ impl Module {
         source_map.get(&source, import)
     }
 
-    pub(crate) fn crate_root_impl(&self, db: &impl PersistentHirDatabase) -> Module {
+    pub(crate) fn crate_root_impl(&self, db: &impl DefDatabase) -> Module {
         let def_map = db.crate_def_map(self.krate);
         self.with_module_id(def_map.root())
     }
@@ -93,10 +93,7 @@ impl Module {
     }
 
     /// Iterates over all child modules.
-    pub(crate) fn children_impl(
-        &self,
-        db: &impl PersistentHirDatabase,
-    ) -> impl Iterator<Item = Module> {
+    pub(crate) fn children_impl(&self, db: &impl DefDatabase) -> impl Iterator<Item = Module> {
         let def_map = db.crate_def_map(self.krate);
         let children = def_map[self.module_id]
             .children
@@ -106,7 +103,7 @@ impl Module {
         children.into_iter()
     }
 
-    pub(crate) fn parent_impl(&self, db: &impl PersistentHirDatabase) -> Option<Module> {
+    pub(crate) fn parent_impl(&self, db: &impl DefDatabase) -> Option<Module> {
         let def_map = db.crate_def_map(self.krate);
         let parent_id = def_map[self.module_id].parent?;
         Some(self.with_module_id(parent_id))
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index c7bad7e2b..d3908f8ac 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -16,8 +16,8 @@ use crate::{
     type_ref::TypeRef,
 };
 
-#[salsa::query_group(PersistentHirDatabaseStorage)]
-pub trait PersistentHirDatabase: SourceDatabase + AsRef<HirInterner> {
+#[salsa::query_group(DefDatabaseStorage)]
+pub trait DefDatabase: SourceDatabase + AsRef<HirInterner> {
     #[salsa::invoke(HirFileId::hir_parse)]
     fn hir_parse(&self, file_id: HirFileId) -> TreeArc<SourceFile>;
 
@@ -71,7 +71,7 @@ pub trait PersistentHirDatabase: SourceDatabase + AsRef<HirInterner> {
 }
 
 #[salsa::query_group(HirDatabaseStorage)]
-pub trait HirDatabase: PersistentHirDatabase {
+pub trait HirDatabase: DefDatabase {
     #[salsa::invoke(ExprScopes::expr_scopes_query)]
     fn expr_scopes(&self, func: Function) -> Arc<ExprScopes>;
 
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
index 0fadab560..703d99d9b 100644
--- a/crates/ra_hir/src/expr.rs
+++ b/crates/ra_hir/src/expr.rs
@@ -27,7 +27,7 @@ impl_arena_id!(ExprId);
 /// The body of an item (function, const etc.).
 #[derive(Debug, Eq, PartialEq)]
 pub struct Body {
-    // TODO: this should be more general, consts & statics also have bodies
+    // FIXME: this should be more general, consts & statics also have bodies
     /// The Function of the item this body belongs to
     owner: Function,
     exprs: Arena<ExprId, Expr>,
@@ -406,7 +406,7 @@ pub enum Pat {
     Struct {
         path: Option<Path>,
         args: Vec<FieldPat>,
-        // TODO: 'ellipsis' option
+        // FIXME: 'ellipsis' option
     },
     Range {
         start: ExprId,
@@ -547,7 +547,7 @@ impl ExprCollector {
                     if condition.pat().is_none() {
                         self.collect_expr_opt(condition.expr())
                     } else {
-                        // TODO handle while let
+                        // FIXME handle while let
                         return self.alloc_expr(Expr::Missing, syntax_ptr);
                     }
                 } else {
@@ -610,7 +610,7 @@ impl ExprCollector {
                 self.alloc_expr(path, syntax_ptr)
             }
             ast::ExprKind::ContinueExpr(_e) => {
-                // TODO: labels
+                // FIXME: labels
                 self.alloc_expr(Expr::Continue, syntax_ptr)
             }
             ast::ExprKind::BreakExpr(e) => {
@@ -751,7 +751,7 @@ impl ExprCollector {
                 self.alloc_expr(Expr::Literal(lit), syntax_ptr)
             }
 
-            // TODO implement HIR for these:
+            // FIXME implement HIR for these:
             ast::ExprKind::Label(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
             ast::ExprKind::IndexExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
             ast::ExprKind::RangeExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
@@ -844,7 +844,7 @@ impl ExprCollector {
                 Pat::Struct { path, args: fields }
             }
 
-            // TODO: implement
+            // FIXME: implement
             ast::PatKind::LiteralPat(_) => Pat::Missing,
             ast::PatKind::SlicePat(_) | ast::PatKind::RangePat(_) => Pat::Missing,
         };
@@ -910,7 +910,7 @@ pub(crate) fn body_with_source_map_query(
 ) -> (Arc<Body>, Arc<BodySourceMap>) {
     let mut collector = ExprCollector::new(func);
 
-    // TODO: consts, etc.
+    // FIXME: consts, etc.
     collector.collect_fn_body(&func.source(db).1);
 
     let (body, source_map) = collector.finish();
diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs
index 81fbc509e..ed005c9f7 100644
--- a/crates/ra_hir/src/expr/scope.rs
+++ b/crates/ra_hir/src/expr/scope.rs
@@ -39,7 +39,7 @@ pub struct ScopeData {
 }
 
 impl ExprScopes {
-    // TODO: This should take something more general than Function
+    // FIXME: This should take something more general than Function
     pub(crate) fn expr_scopes_query(db: &impl HirDatabase, function: Function) -> Arc<ExprScopes> {
         let body = db.body_hir(function);
         let res = ExprScopes::new(body);
@@ -148,7 +148,7 @@ impl ScopesWithSourceMap {
 
     // XXX: during completion, cursor might be outside of any particular
     // expression. Try to figure out the correct scope...
-    // TODO: move this to source binder?
+    // FIXME: move this to source binder?
     fn adjust(&self, ptr: SyntaxNodePtr, original_scope: ScopeId, offset: TextUnit) -> ScopeId {
         let r = ptr.range();
         let child_scopes = self
diff --git a/crates/ra_hir/src/generics.rs b/crates/ra_hir/src/generics.rs
index 0f759a235..84fe94289 100644
--- a/crates/ra_hir/src/generics.rs
+++ b/crates/ra_hir/src/generics.rs
@@ -8,14 +8,14 @@ use std::sync::Arc;
 use ra_syntax::ast::{self, NameOwner, TypeParamsOwner};
 
 use crate::{
-    db::PersistentHirDatabase,
+    db::DefDatabase,
     Name, AsName, Function, Struct, Enum, Trait, TypeAlias, ImplBlock
 };
 
 /// Data about a generic parameter (to a function, struct, impl, ...).
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct GenericParam {
-    // TODO: give generic params proper IDs
+    // FIXME: give generic params proper IDs
     pub(crate) idx: u32,
     pub(crate) name: Name,
 }
@@ -40,7 +40,7 @@ impl_froms!(GenericDef: Function, Struct, Enum, Trait, TypeAlias, ImplBlock);
 
 impl GenericParams {
     pub(crate) fn generic_params_query(
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
         def: GenericDef,
     ) -> Arc<GenericParams> {
         let mut generics = GenericParams::default();
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index 3d0a881c2..18401f865 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -10,7 +10,7 @@ use ra_arena::{Arena, RawId, ArenaId, impl_arena_id};
 
 use crate::{
     Module,
-    PersistentHirDatabase,
+    DefDatabase,
 };
 
 #[derive(Debug, Default)]
@@ -63,7 +63,7 @@ pub struct HirFileId(HirFileIdRepr);
 impl HirFileId {
     /// For macro-expansion files, returns the file original source file the
     /// expansion originated from.
-    pub fn original_file(self, db: &impl PersistentHirDatabase) -> FileId {
+    pub fn original_file(self, db: &impl DefDatabase) -> FileId {
         match self.0 {
             HirFileIdRepr::File(file_id) => file_id,
             HirFileIdRepr::Macro(macro_call_id) => {
@@ -83,10 +83,7 @@ impl HirFileId {
         }
     }
 
-    pub(crate) fn hir_parse(
-        db: &impl PersistentHirDatabase,
-        file_id: HirFileId,
-    ) -> TreeArc<SourceFile> {
+    pub(crate) fn hir_parse(db: &impl DefDatabase, file_id: HirFileId) -> TreeArc<SourceFile> {
         match file_id.0 {
             HirFileIdRepr::File(file_id) => db.parse(file_id),
             HirFileIdRepr::Macro(macro_call_id) => {
@@ -97,10 +94,7 @@ impl HirFileId {
     }
 }
 
-fn parse_macro(
-    db: &impl PersistentHirDatabase,
-    macro_call_id: MacroCallId,
-) -> Option<TreeArc<SourceFile>> {
+fn parse_macro(db: &impl DefDatabase, macro_call_id: MacroCallId) -> Option<TreeArc<SourceFile>> {
     let loc = macro_call_id.loc(db);
     let syntax = db.file_item(loc.source_item_id);
     let macro_call = ast::MacroCall::cast(&syntax).unwrap();
@@ -190,7 +184,7 @@ pub(crate) struct LocationCtx<DB> {
     file_id: HirFileId,
 }
 
-impl<'a, DB: PersistentHirDatabase> LocationCtx<&'a DB> {
+impl<'a, DB: DefDatabase> LocationCtx<&'a DB> {
     pub(crate) fn new(db: &'a DB, module: Module, file_id: HirFileId) -> LocationCtx<&'a DB> {
         LocationCtx { db, module, file_id }
     }
@@ -205,13 +199,13 @@ impl<'a, DB: PersistentHirDatabase> LocationCtx<&'a DB> {
 
 pub(crate) trait AstItemDef<N: AstNode>: ArenaId + Clone {
     fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<N>, Self>;
-    fn from_ast(ctx: LocationCtx<&impl PersistentHirDatabase>, ast: &N) -> Self {
+    fn from_ast(ctx: LocationCtx<&impl DefDatabase>, ast: &N) -> Self {
         let items = ctx.db.file_items(ctx.file_id);
         let item_id = items.id_of(ctx.file_id, ast.syntax());
         Self::from_source_item_id_unchecked(ctx, item_id)
     }
     fn from_source_item_id_unchecked(
-        ctx: LocationCtx<&impl PersistentHirDatabase>,
+        ctx: LocationCtx<&impl DefDatabase>,
         item_id: SourceFileItemId,
     ) -> Self {
         let raw = SourceItemId { file_id: ctx.file_id, item_id };
@@ -219,7 +213,7 @@ pub(crate) trait AstItemDef<N: AstNode>: ArenaId + Clone {
 
         Self::interner(ctx.db.as_ref()).loc2id(&loc)
     }
-    fn source(self, db: &impl PersistentHirDatabase) -> (HirFileId, TreeArc<N>) {
+    fn source(self, db: &impl DefDatabase) -> (HirFileId, TreeArc<N>) {
         let int = Self::interner(db.as_ref());
         let loc = int.id2loc(self);
         let syntax = db.file_item(loc.raw);
@@ -227,7 +221,7 @@ pub(crate) trait AstItemDef<N: AstNode>: ArenaId + Clone {
             N::cast(&syntax).unwrap_or_else(|| panic!("invalid ItemLoc: {:?}", loc.raw)).to_owned();
         (loc.raw.file_id, ast)
     }
-    fn module(self, db: &impl PersistentHirDatabase) -> Module {
+    fn module(self, db: &impl DefDatabase) -> Module {
         let int = Self::interner(db.as_ref());
         let loc = int.id2loc(self);
         loc.module
@@ -324,7 +318,7 @@ pub struct SourceFileItems {
 
 impl SourceFileItems {
     pub(crate) fn file_items_query(
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
         file_id: HirFileId,
     ) -> Arc<SourceFileItems> {
         let source_file = db.hir_parse(file_id);
@@ -332,7 +326,7 @@ impl SourceFileItems {
     }
 
     pub(crate) fn file_item_query(
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
         source_item_id: SourceItemId,
     ) -> TreeArc<SyntaxNode> {
         let source_file = db.hir_parse(source_item_id.file_id);
diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs
index 8807a4b56..40d368cd9 100644
--- a/crates/ra_hir/src/impl_block.rs
+++ b/crates/ra_hir/src/impl_block.rs
@@ -9,7 +9,7 @@ use ra_syntax::{
 
 use crate::{
     Const, TypeAlias, Function, HirFileId,
-    HirDatabase, PersistentHirDatabase,
+    HirDatabase, DefDatabase,
     ModuleDef, Trait, Resolution,
     type_ref::TypeRef,
     ids::LocationCtx,
@@ -59,7 +59,7 @@ impl ImplBlock {
     }
 
     /// Returns the syntax of the impl block
-    pub fn source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, TreeArc<ast::ImplBlock>) {
+    pub fn source(&self, db: &impl DefDatabase) -> (HirFileId, TreeArc<ast::ImplBlock>) {
         let source_map = db.impls_in_module_source_map(self.module);
         let (file_id, source) = self.module.definition_source(db);
         (file_id, source_map.get(&source, self.impl_id))
@@ -73,11 +73,11 @@ impl ImplBlock {
         self.module
     }
 
-    pub fn target_trait_ref(&self, db: &impl PersistentHirDatabase) -> Option<TypeRef> {
+    pub fn target_trait_ref(&self, db: &impl DefDatabase) -> Option<TypeRef> {
         db.impls_in_module(self.module).impls[self.impl_id].target_trait().cloned()
     }
 
-    pub fn target_type(&self, db: &impl PersistentHirDatabase) -> TypeRef {
+    pub fn target_type(&self, db: &impl DefDatabase) -> TypeRef {
         db.impls_in_module(self.module).impls[self.impl_id].target_type().clone()
     }
 
@@ -97,11 +97,11 @@ impl ImplBlock {
         None
     }
 
-    pub fn items(&self, db: &impl PersistentHirDatabase) -> Vec<ImplItem> {
+    pub fn items(&self, db: &impl DefDatabase) -> Vec<ImplItem> {
         db.impls_in_module(self.module).impls[self.impl_id].items().to_vec()
     }
 
-    pub fn generic_params(&self, db: &impl PersistentHirDatabase) -> Arc<GenericParams> {
+    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
         db.generic_params((*self).into())
     }
 
@@ -124,7 +124,7 @@ pub struct ImplData {
 
 impl ImplData {
     pub(crate) fn from_ast(
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
         file_id: HirFileId,
         module: Module,
         node: &ast::ImplBlock,
@@ -161,7 +161,7 @@ impl ImplData {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-//TODO: rename to ImplDef?
+//FIXME: rename to ImplDef?
 pub enum ImplItem {
     Method(Function),
     Const(Const),
@@ -193,11 +193,7 @@ pub struct ModuleImplBlocks {
 }
 
 impl ModuleImplBlocks {
-    fn collect(
-        db: &impl PersistentHirDatabase,
-        module: Module,
-        source_map: &mut ImplSourceMap,
-    ) -> Self {
+    fn collect(db: &impl DefDatabase, module: Module, source_map: &mut ImplSourceMap) -> Self {
         let mut m = ModuleImplBlocks {
             module,
             impls: Arena::default(),
@@ -228,7 +224,7 @@ impl ModuleImplBlocks {
 }
 
 pub(crate) fn impls_in_module_with_source_map_query(
-    db: &impl PersistentHirDatabase,
+    db: &impl DefDatabase,
     module: Module,
 ) -> (Arc<ModuleImplBlocks>, Arc<ImplSourceMap>) {
     let mut source_map = ImplSourceMap::default();
@@ -238,15 +234,12 @@ pub(crate) fn impls_in_module_with_source_map_query(
     (Arc::new(result), Arc::new(source_map))
 }
 
-pub(crate) fn impls_in_module(
-    db: &impl PersistentHirDatabase,
-    module: Module,
-) -> Arc<ModuleImplBlocks> {
+pub(crate) fn impls_in_module(db: &impl DefDatabase, module: Module) -> Arc<ModuleImplBlocks> {
     db.impls_in_module_with_source_map(module).0
 }
 
 pub(crate) fn impls_in_module_source_map_query(
-    db: &impl PersistentHirDatabase,
+    db: &impl DefDatabase,
     module: Module,
 ) -> Arc<ImplSourceMap> {
     db.impls_in_module_with_source_map(module).1
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 5926b5758..a89c916f8 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -43,7 +43,7 @@ mod code_model_impl;
 mod marks;
 
 use crate::{
-    db::{HirDatabase, PersistentHirDatabase},
+    db::{HirDatabase, DefDatabase},
     name::{AsName, KnownName},
     ids::{SourceItemId, SourceFileItems},
 };
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index f1cad77c5..10d4c1b8c 100644
--- a/crates/ra_hir/src/mock.rs
+++ b/crates/ra_hir/src/mock.rs
@@ -13,11 +13,7 @@ use crate::{db, HirInterner};
 
 pub const WORKSPACE: SourceRootId = SourceRootId(0);
 
-#[salsa::database(
-    ra_db::SourceDatabaseStorage,
-    db::HirDatabaseStorage,
-    db::PersistentHirDatabaseStorage
-)]
+#[salsa::database(ra_db::SourceDatabaseStorage, db::HirDatabaseStorage, db::DefDatabaseStorage)]
 #[derive(Debug)]
 pub struct MockDatabase {
     events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>,
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index edd2f25f7..d361cf9e6 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -62,7 +62,7 @@ use test_utils::tested_by;
 
 use crate::{
     ModuleDef, Name, Crate, Module, Problem,
-    PersistentHirDatabase, Path, PathKind, HirFileId,
+    DefDatabase, Path, PathKind, HirFileId,
     ids::{SourceItemId, SourceFileItemId, MacroCallId},
 };
 
@@ -196,10 +196,7 @@ enum ReachedFixedPoint {
 }
 
 impl CrateDefMap {
-    pub(crate) fn crate_def_map_query(
-        db: &impl PersistentHirDatabase,
-        krate: Crate,
-    ) -> Arc<CrateDefMap> {
+    pub(crate) fn crate_def_map_query(db: &impl DefDatabase, krate: Crate) -> Arc<CrateDefMap> {
         let start = std::time::Instant::now();
         let def_map = {
             let edition = krate.edition(db);
@@ -268,7 +265,7 @@ impl CrateDefMap {
 
     pub(crate) fn resolve_path(
         &self,
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
         original_module: CrateModuleId,
         path: &Path,
     ) -> (PerNs<ModuleDef>, Option<usize>) {
@@ -280,7 +277,7 @@ impl CrateDefMap {
     // the result.
     fn resolve_path_fp(
         &self,
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
         mode: ResolveMode,
         original_module: CrateModuleId,
         path: &Path,
@@ -296,7 +293,7 @@ impl CrateDefMap {
             // plain import or absolute path in 2015: crate-relative with
             // fallback to extern prelude (with the simplification in
             // rust-lang/rust#57745)
-            // TODO there must be a nicer way to write this condition
+            // FIXME there must be a nicer way to write this condition
             PathKind::Plain | PathKind::Abs
                 if self.edition == Edition::Edition2015
                     && (path.kind == PathKind::Abs || mode == ResolveMode::Import) =>
@@ -422,7 +419,7 @@ impl CrateDefMap {
 
     pub(crate) fn resolve_name_in_module(
         &self,
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
         module: CrateModuleId,
         name: &Name,
     ) -> PerNs<ModuleDef> {
@@ -442,7 +439,7 @@ impl CrateDefMap {
         self.extern_prelude.get(name).map_or(PerNs::none(), |&it| PerNs::types(it))
     }
 
-    fn resolve_in_prelude(&self, db: &impl PersistentHirDatabase, name: &Name) -> PerNs<ModuleDef> {
+    fn resolve_in_prelude(&self, db: &impl DefDatabase, name: &Name) -> PerNs<ModuleDef> {
         if let Some(prelude) = self.prelude {
             let resolution = if prelude.krate == self.krate {
                 self[prelude.module_id].scope.items.get(name).cloned()
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs
index 3ea8d592c..c5b73cfbe 100644
--- a/crates/ra_hir/src/nameres/collector.rs
+++ b/crates/ra_hir/src/nameres/collector.rs
@@ -6,7 +6,7 @@ use ra_db::FileId;
 
 use crate::{
     Function, Module, Struct, Enum, Const, Static, Trait, TypeAlias,
-    PersistentHirDatabase, HirFileId, Name, Path, Problem, Crate,
+    DefDatabase, HirFileId, Name, Path, Problem, Crate,
     KnownName,
     nameres::{Resolution, PerNs, ModuleDef, ReachedFixedPoint, ResolveMode, raw},
     ids::{AstItemDef, LocationCtx, MacroCallLoc, SourceItemId, MacroCallId},
@@ -14,10 +14,7 @@ use crate::{
 
 use super::{CrateDefMap, CrateModuleId, ModuleData, CrateMacroId};
 
-pub(super) fn collect_defs(
-    db: &impl PersistentHirDatabase,
-    mut def_map: CrateDefMap,
-) -> CrateDefMap {
+pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> CrateDefMap {
     // populate external prelude
     for dep in def_map.krate.dependencies(db) {
         log::debug!("crate dep {:?} -> {:?}", dep.name, dep.krate);
@@ -57,7 +54,7 @@ struct DefCollector<DB> {
 
 impl<'a, DB> DefCollector<&'a DB>
 where
-    DB: PersistentHirDatabase,
+    DB: DefDatabase,
 {
     fn collect(&mut self) {
         let crate_graph = self.db.crate_graph();
@@ -370,7 +367,7 @@ struct ModCollector<'a, D> {
 
 impl<DB> ModCollector<'_, &'_ mut DefCollector<&'_ DB>>
 where
-    DB: PersistentHirDatabase,
+    DB: DefDatabase,
 {
     fn collect(&mut self, items: &[raw::RawItem]) {
         for item in items {
@@ -523,7 +520,7 @@ fn is_macro_rules(path: &Path) -> bool {
 }
 
 fn resolve_submodule(
-    db: &impl PersistentHirDatabase,
+    db: &impl DefDatabase,
     file_id: HirFileId,
     name: &Name,
     is_root: bool,
diff --git a/crates/ra_hir/src/nameres/raw.rs b/crates/ra_hir/src/nameres/raw.rs
index 3226bbf0d..f8ba398ec 100644
--- a/crates/ra_hir/src/nameres/raw.rs
+++ b/crates/ra_hir/src/nameres/raw.rs
@@ -12,7 +12,7 @@ use ra_syntax::{
 };
 
 use crate::{
-    PersistentHirDatabase, Name, AsName, Path, HirFileId, ModuleSource,
+    DefDatabase, Name, AsName, Path, HirFileId, ModuleSource,
     ids::{SourceFileItemId, SourceFileItems},
 };
 
@@ -47,15 +47,12 @@ impl ImportSourceMap {
 }
 
 impl RawItems {
-    pub(crate) fn raw_items_query(
-        db: &impl PersistentHirDatabase,
-        file_id: FileId,
-    ) -> Arc<RawItems> {
+    pub(crate) fn raw_items_query(db: &impl DefDatabase, file_id: FileId) -> Arc<RawItems> {
         db.raw_items_with_source_map(file_id).0
     }
 
     pub(crate) fn raw_items_with_source_map_query(
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
         file_id: FileId,
     ) -> (Arc<RawItems>, Arc<ImportSourceMap>) {
         let mut collector = RawItemsCollector {
diff --git a/crates/ra_hir/src/path.rs b/crates/ra_hir/src/path.rs
index 6ca373e34..6cc8104f4 100644
--- a/crates/ra_hir/src/path.rs
+++ b/crates/ra_hir/src/path.rs
@@ -96,7 +96,7 @@ impl Path {
             if let Some(q) = path.qualifier() {
                 return Some(q);
             }
-            // TODO: this bottom up traversal is not too precise.
+            // FIXME: this bottom up traversal is not too precise.
             // Should we handle do a top-down analysis, recording results?
             let use_tree_list = path.syntax().ancestors().find_map(ast::UseTreeList::cast)?;
             let use_tree = use_tree_list.parent_use_tree();
@@ -166,7 +166,7 @@ fn expand_use_tree<'a>(
             // or `use something::{path::{inner::{innerer}}}` (prefix is `something::path`, path is `inner`)
             Some(path) => match convert_path(prefix, path) {
                 Some(it) => Some(it),
-                None => return, // TODO: report errors somewhere
+                None => return, // FIXME: report errors somewhere
             },
         };
         for child_tree in use_tree_list.use_trees() {
@@ -194,7 +194,7 @@ fn expand_use_tree<'a>(
                     cb(path, Some(segment), alias)
                 };
             }
-            // TODO: report errors somewhere
+            // FIXME: report errors somewhere
             // We get here if we do
         }
     }
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 59af4ec60..f28154517 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -19,7 +19,7 @@ pub struct Resolver {
     scopes: Vec<Scope>,
 }
 
-// TODO how to store these best
+// FIXME how to store these best
 #[derive(Debug, Clone)]
 pub(crate) struct ModuleItemMap {
     crate_def_map: Arc<CrateDefMap>,
@@ -260,7 +260,7 @@ impl Scope {
     fn collect_names(&self, db: &impl HirDatabase, f: &mut dyn FnMut(Name, PerNs<Resolution>)) {
         match self {
             Scope::ModuleScope(m) => {
-                // TODO: should we provide `self` here?
+                // FIXME: should we provide `self` here?
                 // f(
                 //     Name::self_param(),
                 //     PerNs::types(Resolution::Def {
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 902110913..3645b73b4 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -164,7 +164,7 @@ pub fn resolver_for_position(db: &impl HirDatabase, position: FilePosition) -> R
                         let scope = scopes.scope_for_offset(position.offset);
                         Some(expr::resolver_for_scope(func.body(db), db, scope))
                     } else {
-                        // TODO const/static/array length
+                        // FIXME const/static/array length
                         None
                     }
                 } else {
@@ -184,7 +184,7 @@ pub fn resolver_for_node(db: &impl HirDatabase, file_id: FileId, node: &SyntaxNo
                     let scope = scopes.scope_for(&node);
                     Some(expr::resolver_for_scope(func.body(db), db, scope))
                 } else {
-                    // TODO const/static/array length
+                    // FIXME const/static/array length
                     None
                 }
             } else {
@@ -212,7 +212,7 @@ fn try_get_resolver_for_node(
     } else if let Some(f) = ast::FnDef::cast(node) {
         function_from_source(db, file_id, f).map(|f| f.resolver(db))
     } else {
-        // TODO add missing cases
+        // FIXME add missing cases
         None
     }
 }
diff --git a/crates/ra_hir/src/ty/autoderef.rs b/crates/ra_hir/src/ty/autoderef.rs
index d95879e46..ab5f008ef 100644
--- a/crates/ra_hir/src/ty/autoderef.rs
+++ b/crates/ra_hir/src/ty/autoderef.rs
@@ -15,7 +15,7 @@ impl Ty {
     }
 
     fn autoderef_step(&self, _db: &impl HirDatabase) -> Option<Ty> {
-        // TODO Deref::deref
+        // FIXME Deref::deref
         self.builtin_deref()
     }
 }
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index 7cf465266..cff7e7481 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -207,7 +207,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
     fn make_ty(&mut self, type_ref: &TypeRef) -> Ty {
         let ty = Ty::from_hir(
             self.db,
-            // TODO use right resolver for block
+            // FIXME use right resolver for block
             &self.resolver,
             type_ref,
         );
@@ -407,18 +407,18 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
 
                     let substs =
                         Ty::substs_from_path_segment(self.db, &self.resolver, segment, typable);
-                    self.db.type_for_def(typable, Namespace::Types).apply_substs(substs)
+                    self.db.type_for_def(typable, Namespace::Types).subst(&substs)
                 }
                 Resolution::LocalBinding(_) => {
                     // can't have a local binding in an associated item path
                     return None;
                 }
                 Resolution::GenericParam(..) => {
-                    // TODO associated item of generic param
+                    // FIXME associated item of generic param
                     return None;
                 }
                 Resolution::SelfType(_) => {
-                    // TODO associated item of self type
+                    // FIXME associated item of self type
                     return None;
                 }
             };
@@ -446,7 +446,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                         }
                     }
 
-                    // TODO: Resolve associated types
+                    // FIXME: Resolve associated types
                     crate::ImplItem::TypeAlias(_) => None,
                 };
                 match matching_def {
@@ -466,7 +466,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                 let typable: Option<TypableDef> = def.into();
                 let typable = typable?;
                 let substs = Ty::substs_from_path(self.db, &self.resolver, path, typable);
-                let ty = self.db.type_for_def(typable, Namespace::Values).apply_substs(substs);
+                let ty = self.db.type_for_def(typable, Namespace::Values).subst(&substs);
                 let ty = self.insert_type_vars(ty);
                 Some(ty)
             }
@@ -504,7 +504,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                 return (Ty::Unknown, None);
             }
             Some(Resolution::SelfType(..)) => {
-                // TODO this is allowed in an impl for a struct, handle this
+                // FIXME this is allowed in an impl for a struct, handle this
                 return (Ty::Unknown, None);
             }
             None => return (Ty::Unknown, None),
@@ -513,7 +513,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             None => return (Ty::Unknown, None),
             Some(it) => it,
         };
-        // TODO remove the duplication between here and `Ty::from_path`?
+        // FIXME remove the duplication between here and `Ty::from_path`?
         let substs = Ty::substs_from_path(self.db, resolver, path, def);
         match def {
             TypableDef::Struct(s) => {
@@ -590,7 +590,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             | Pat::Struct { .. }
             | Pat::Range { .. }
             | Pat::Slice { .. } => true,
-            // TODO: Path/Lit might actually evaluate to ref, but inference is unimplemented.
+            // 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,
         };
@@ -635,7 +635,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                 let expectation = match expected.as_reference() {
                     Some((inner_ty, exp_mut)) => {
                         if *mutability != exp_mut {
-                            // TODO: emit type error?
+                            // FIXME: emit type error?
                         }
                         inner_ty
                     }
@@ -651,7 +651,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                 self.infer_struct_pat(p.as_ref(), fields, expected, default_bm)
             }
             Pat::Path(path) => {
-                // TODO use correct resolver for the surrounding expression
+                // FIXME use correct resolver for the surrounding expression
                 let resolver = self.resolver.clone();
                 self.infer_path_expr(&resolver, &path, pat.into()).unwrap_or(Ty::Unknown)
             }
@@ -741,7 +741,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             Expr::Block { statements, tail } => self.infer_block(statements, *tail, expected),
             Expr::Loop { body } => {
                 self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
-                // TODO handle break with value
+                // FIXME handle break with value
                 Ty::simple(TypeCtor::Never)
             }
             Expr::While { condition, body } => {
@@ -769,7 +769,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                     self.infer_pat(*arg_pat, &expected, BindingMode::default());
                 }
 
-                // TODO: infer lambda type etc.
+                // FIXME: infer lambda type etc.
                 let _body_ty = self.infer_expr(*body, &Expectation::none());
                 Ty::Unknown
             }
@@ -795,7 +795,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                     },
                     _ => {
                         // not callable
-                        // TODO report an error?
+                        // FIXME report an error?
                         (Vec::new(), Ty::Unknown)
                     }
                 };
@@ -894,14 +894,14 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                 expected.ty
             }
             Expr::Path(p) => {
-                // TODO this could be more efficient...
+                // FIXME this could be more efficient...
                 let resolver = expr::resolver_for_expr(self.body.clone(), self.db, tgt_expr);
                 self.infer_path_expr(&resolver, p, tgt_expr.into()).unwrap_or(Ty::Unknown)
             }
             Expr::Continue => Ty::simple(TypeCtor::Never),
             Expr::Break { expr } => {
                 if let Some(expr) = expr {
-                    // TODO handle break with value
+                    // FIXME handle break with value
                     self.infer_expr(*expr, &Expectation::none());
                 }
                 Ty::simple(TypeCtor::Never)
@@ -957,21 +957,21 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             Expr::Cast { expr, type_ref } => {
                 let _inner_ty = self.infer_expr(*expr, &Expectation::none());
                 let cast_ty = self.make_ty(type_ref);
-                // TODO check the cast...
+                // FIXME check the cast...
                 cast_ty
             }
             Expr::Ref { expr, mutability } => {
                 let expectation =
                     if let Some((exp_inner, exp_mutability)) = &expected.ty.as_reference() {
                         if *exp_mutability == Mutability::Mut && *mutability == Mutability::Shared {
-                            // TODO: throw type error - expected mut reference but found shared ref,
+                            // FIXME: throw type error - expected mut reference but found shared ref,
                             // which cannot be coerced
                         }
                         Expectation::has_type(Ty::clone(exp_inner))
                     } else {
                         Expectation::none()
                     };
-                // TODO reference coercions etc.
+                // FIXME reference coercions etc.
                 let inner_ty = self.infer_expr(*expr, &expectation);
                 Ty::apply_one(TypeCtor::Ref(*mutability), inner_ty)
             }
@@ -982,7 +982,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                         if let Some(derefed_ty) = inner_ty.builtin_deref() {
                             derefed_ty
                         } else {
-                            // TODO Deref::deref
+                            // FIXME Deref::deref
                             Ty::Unknown
                         }
                     }
@@ -1002,7 +1002,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                             Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => {
                                 inner_ty
                             }
-                            // TODO: resolve ops::Neg trait
+                            // FIXME: resolve ops::Neg trait
                             _ => Ty::Unknown,
                         }
                     }
@@ -1013,7 +1013,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                                 _ => Ty::Unknown,
                             },
                             Ty::Infer(InferTy::IntVar(..)) => inner_ty,
-                            // TODO: resolve ops::Not trait for inner_ty
+                            // FIXME: resolve ops::Not trait for inner_ty
                             _ => Ty::Unknown,
                         }
                     }
@@ -1028,12 +1028,12 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                         _ => Expectation::none(),
                     };
                     let lhs_ty = self.infer_expr(*lhs, &lhs_expectation);
-                    // TODO: find implementation of trait corresponding to operation
+                    // FIXME: find implementation of trait corresponding to operation
                     // symbol and resolve associated `Output` type
                     let rhs_expectation = op::binary_op_rhs_expectation(*op, lhs_ty);
                     let rhs_ty = self.infer_expr(*rhs, &Expectation::has_type(rhs_expectation));
 
-                    // TODO: similar as above, return ty is often associated trait type
+                    // FIXME: similar as above, return ty is often associated trait type
                     op::binary_op_return_ty(*op, rhs_ty)
                 }
                 _ => Ty::Unknown,
@@ -1227,7 +1227,7 @@ impl InferTy {
 #[derive(Clone, PartialEq, Eq, Debug)]
 struct Expectation {
     ty: Ty,
-    // TODO: In some cases, we need to be aware whether the expectation is that
+    // FIXME: In some cases, we need to be aware whether the expectation is that
     // the type match exactly what we passed, or whether it just needs to be
     // coercible to the expected type. See Expectation::rvalue_hint in rustc.
 }
diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs
index 7f9af307b..003a89f0d 100644
--- a/crates/ra_hir/src/ty/lower.rs
+++ b/crates/ra_hir/src/ty/lower.rs
@@ -60,7 +60,7 @@ impl Ty {
 
     pub(crate) fn from_hir_path(db: &impl HirDatabase, resolver: &Resolver, path: &Path) -> Self {
         if let Some(name) = path.as_ident() {
-            // TODO handle primitive type names in resolver as well?
+            // FIXME handle primitive type names in resolver as well?
             if let Some(int_ty) = primitive::IntTy::from_type_name(name) {
                 return Ty::simple(TypeCtor::Int(primitive::UncertainIntTy::Known(int_ty)));
             } else if let Some(float_ty) = primitive::FloatTy::from_type_name(name) {
@@ -87,7 +87,7 @@ impl Ty {
             Some(Resolution::GenericParam(idx)) => {
                 return Ty::Param {
                     idx,
-                    // TODO: maybe return name in resolution?
+                    // FIXME: maybe return name in resolution?
                     name: path
                         .as_ident()
                         .expect("generic param should be single-segment path")
@@ -139,7 +139,7 @@ impl Ty {
             }
         }
         // add placeholders for args that were not provided
-        // TODO: handle defaults
+        // FIXME: handle defaults
         let supplied_params = substs.len();
         for _ in supplied_params..def_generics.count_params_including_parent() {
             substs.push(Ty::Unknown);
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index ed75bfaee..b1684acf9 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -120,7 +120,7 @@ fn def_crate(db: &impl HirDatabase, ty: &Ty) -> Option<Crate> {
 }
 
 impl Ty {
-    // TODO: cache this as a query?
+    // FIXME: cache this as a query?
     // - if so, what signature? (TyFingerprint, Name)?
     // - or maybe cache all names and def_ids of methods per fingerprint?
     /// Look up the method with the given name, returning the actual autoderefed
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index 0f2172ddf..5d8ad4aa7 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -1792,6 +1792,29 @@ fn test<R>(query_response: Canonical<QueryResponse<R>>) {
 }
 
 #[test]
+fn bug_1030() {
+    assert_snapshot_matches!(infer(r#"
+struct HashSet<T, H>;
+struct FxHasher;
+type FxHashSet<T> = HashSet<T, FxHasher>;
+
+impl<T, H> HashSet<T, H> {
+    fn default() -> HashSet<T, H> {}
+}
+
+pub fn main_loop() {
+    FxHashSet::default();
+}
+"#),
+    @r###"
+[144; 146) '{}': ()
+[169; 198) '{     ...t(); }': ()
+[175; 193) 'FxHash...efault': fn default<{unknown}, {unknown}>() -> HashSet<T, H>
+[175; 195) 'FxHash...ault()': HashSet<{unknown}, {unknown}>"###
+    );
+}
+
+#[test]
 fn cross_crate_associated_method_call() {
     let (mut db, pos) = MockDatabase::with_position(
         r#"
diff --git a/crates/ra_hir/src/type_alias.rs b/crates/ra_hir/src/type_alias.rs
index d02762d20..e35adcb2f 100644
--- a/crates/ra_hir/src/type_alias.rs
+++ b/crates/ra_hir/src/type_alias.rs
@@ -2,12 +2,9 @@
 
 use std::sync::Arc;
 
-use crate::{TypeAlias, db::PersistentHirDatabase, type_ref::TypeRef};
+use crate::{TypeAlias, db::DefDatabase, type_ref::TypeRef};
 
-pub(crate) fn type_alias_ref_query(
-    db: &impl PersistentHirDatabase,
-    typ: TypeAlias,
-) -> Arc<TypeRef> {
+pub(crate) fn type_alias_ref_query(db: &impl DefDatabase, typ: TypeAlias) -> Arc<TypeRef> {
     let (_, node) = typ.source(db);
     Arc::new(TypeRef::from_ast_opt(node.type_ref()))
 }
diff --git a/crates/ra_ide_api/Cargo.toml b/crates/ra_ide_api/Cargo.toml
index ac8c8057b..c64226801 100644
--- a/crates/ra_ide_api/Cargo.toml
+++ b/crates/ra_ide_api/Cargo.toml
@@ -10,7 +10,7 @@ join_to_string = "0.1.3"
 log = "0.4.5"
 relative-path = "0.4.0"
 rayon = "1.0.2"
-fst = "0.3.1"
+fst = { version = "0.3.1", default-features = false }
 rustc-hash = "1.0"
 parking_lot = "0.7.0"
 unicase = "2.2.0"
@@ -23,13 +23,19 @@ ra_syntax = { path = "../ra_syntax" }
 ra_ide_api_light = { path = "../ra_ide_api_light" }
 ra_text_edit = { path = "../ra_text_edit" }
 ra_db = { path = "../ra_db" }
+ra_fmt = { path = "../ra_fmt" }
 hir = { path = "../ra_hir", package = "ra_hir" }
 test_utils = { path = "../test_utils" }
 ra_assists = { path = "../ra_assists" }
 
 [dev-dependencies]
 insta = "0.7.0"
-proptest = "0.9.0"
+
+[dev-dependencies.proptest]
+version = "0.9.0"
+# Disable `fork` feature to allow compiling on webassembly
+default-features = false
+features = ["std", "bit-set", "break-dead-code"]
 
 [features]
 jemalloc = [ "jemallocator", "jemalloc-ctl" ]
diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index 31d5374ba..f54a02d1d 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -30,7 +30,7 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty)
                         acc.add_field(ctx, field, &a_ty.parameters);
                     }
                 }
-                // TODO unions
+                // FIXME unions
                 TypeCtor::Tuple => {
                     for (i, ty) in a_ty.parameters.iter().enumerate() {
                         acc.add_pos_field(ctx, i, ty);
diff --git a/crates/ra_ide_api/src/completion/complete_pattern.rs b/crates/ra_ide_api/src/completion/complete_pattern.rs
index 3cf79c080..7abcd019b 100644
--- a/crates/ra_ide_api/src/completion/complete_pattern.rs
+++ b/crates/ra_ide_api/src/completion/complete_pattern.rs
@@ -5,7 +5,7 @@ pub(super) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) {
     if !ctx.is_pat_binding {
         return;
     }
-    // TODO: ideally, we should look at the type we are matching against and
+    // FIXME: ideally, we should look at the type we are matching against and
     // suggest variants + auto-imports
     let names = ctx.resolver.all_names(ctx.db);
     for (name, res) in names.into_iter() {
diff --git a/crates/ra_ide_api/src/completion/complete_struct_literal.rs b/crates/ra_ide_api/src/completion/complete_struct_literal.rs
index b75526282..f58bcd03e 100644
--- a/crates/ra_ide_api/src/completion/complete_struct_literal.rs
+++ b/crates/ra_ide_api/src/completion/complete_struct_literal.rs
@@ -26,7 +26,7 @@ pub(super) fn complete_struct_literal(acc: &mut Completions, ctx: &CompletionCon
             }
         }
 
-        // TODO unions
+        // FIXME unions
         AdtDef::Enum(_) => (),
     };
 }
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
index 00f4bdfd2..ea4255d35 100644
--- a/crates/ra_ide_api/src/db.rs
+++ b/crates/ra_ide_api/src/db.rs
@@ -15,7 +15,7 @@ use crate::{LineIndex, symbol_index::{self, SymbolsDatabase}};
     LineIndexDatabaseStorage,
     symbol_index::SymbolsDatabaseStorage,
     hir::db::HirDatabaseStorage,
-    hir::db::PersistentHirDatabaseStorage
+    hir::db::DefDatabaseStorage
 )]
 #[derive(Debug)]
 pub(crate) struct RootDatabase {
diff --git a/crates/ra_ide_api/src/diagnostics.rs b/crates/ra_ide_api/src/diagnostics.rs
index 069092528..b9dc424c6 100644
--- a/crates/ra_ide_api/src/diagnostics.rs
+++ b/crates/ra_ide_api/src/diagnostics.rs
@@ -1,6 +1,5 @@
 use itertools::Itertools;
 use hir::{Problem, source_binder};
-use ra_ide_api_light::Severity;
 use ra_db::SourceDatabase;
 use ra_syntax::{
     Location, SourceFile, SyntaxKind, TextRange, SyntaxNode,
@@ -11,6 +10,12 @@ use ra_text_edit::{TextEdit, TextEditBuilder};
 
 use crate::{Diagnostic, FileId, FileSystemEdit, SourceChange, SourceFileEdit, db::RootDatabase};
 
+#[derive(Debug, Copy, Clone)]
+pub enum Severity {
+    Error,
+    WeakWarning,
+}
+
 pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic> {
     let source_file = db.parse(file_id);
     let mut res = Vec::new();
@@ -152,27 +157,6 @@ fn check_module(
                     fix: Some(fix),
                 }
             }
-            Problem::NotDirOwner { move_to, candidate } => {
-                let move_file = FileSystemEdit::MoveFile {
-                    src: file_id,
-                    dst_source_root: source_root,
-                    dst_path: move_to.clone(),
-                };
-                let create_file =
-                    FileSystemEdit::CreateFile { source_root, path: move_to.join(candidate) };
-                let fix = SourceChange {
-                    label: "move file and create module".to_string(),
-                    source_file_edits: Vec::new(),
-                    file_system_edits: vec![move_file, create_file],
-                    cursor_position: None,
-                };
-                Diagnostic {
-                    range: name_node.range(),
-                    message: "can't declare module at this location".to_string(),
-                    severity: Severity::Error,
-                    fix: Some(fix),
-                }
-            }
         };
         acc.push(diag)
     }
diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs
index f94487d94..660b43cfa 100644
--- a/crates/ra_ide_api/src/goto_definition.rs
+++ b/crates/ra_ide_api/src/goto_definition.rs
@@ -117,7 +117,7 @@ pub(crate) fn reference_definition(
                 return Exact(nav);
             }
             Some(Resolution::GenericParam(..)) => {
-                // TODO: go to the generic param def
+                // FIXME: go to the generic param def
             }
             Some(Resolution::SelfType(impl_block)) => {
                 let ty = impl_block.target_ty(db);
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index f6443580d..3206e68b9 100644
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -204,7 +204,7 @@ impl NavigationTarget {
     ///
     /// e.g. `struct Name`, `enum Name`, `fn Name`
     fn description(&self, db: &RootDatabase) -> Option<String> {
-        // TODO: After type inference is done, add type information to improve the output
+        // FIXME: After type inference is done, add type information to improve the output
         let node = self.node(db)?;
 
         fn visit_ascribed_node<T>(node: &T, prefix: &str) -> Option<String>
diff --git a/crates/ra_ide_api_light/src/join_lines.rs b/crates/ra_ide_api/src/join_lines.rs
index b5bcd62fb..8fb3eaa06 100644
--- a/crates/ra_ide_api_light/src/join_lines.rs
+++ b/crates/ra_ide_api/src/join_lines.rs
@@ -9,22 +9,14 @@ use ra_syntax::{
 use ra_fmt::{
     compute_ws, extract_trivial_expression
 };
-use crate::{
-    LocalEdit, TextEditBuilder,
-};
+use ra_text_edit::{TextEdit, TextEditBuilder};
 
-pub fn join_lines(file: &SourceFile, range: TextRange) -> LocalEdit {
+pub fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit {
     let range = if range.is_empty() {
         let syntax = file.syntax();
         let text = syntax.text().slice(range.start()..);
         let pos = match text.find('\n') {
-            None => {
-                return LocalEdit {
-                    label: "join lines".to_string(),
-                    edit: TextEditBuilder::default().finish(),
-                    cursor_position: None,
-                };
-            }
+            None => return TextEditBuilder::default().finish(),
             Some(pos) => pos,
         };
         TextRange::offset_len(range.start() + pos, TextUnit::of_char('\n'))
@@ -52,7 +44,7 @@ pub fn join_lines(file: &SourceFile, range: TextRange) -> LocalEdit {
         }
     }
 
-    LocalEdit { label: "join lines".to_string(), edit: edit.finish(), cursor_position: None }
+    edit.finish()
 }
 
 fn remove_newline(
@@ -514,7 +506,7 @@ fn foo() {
         let (sel, before) = extract_range(before);
         let file = SourceFile::parse(&before);
         let result = join_lines(&file, sel);
-        let actual = result.edit.apply(&before);
+        let actual = result.apply(&before);
         assert_eq_text!(after, &actual);
     }
 
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index d6f63490d..99f18b6b8 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -36,9 +36,14 @@ mod syntax_tree;
 mod line_index;
 mod folding_ranges;
 mod line_index_utils;
+mod join_lines;
+mod typing;
+mod matching_brace;
 
 #[cfg(test)]
 mod marks;
+#[cfg(test)]
+mod test_utils;
 
 use std::sync::Arc;
 
@@ -66,10 +71,10 @@ pub use crate::{
     line_index::{LineIndex, LineCol},
     line_index_utils::translate_offset_with_edit,
     folding_ranges::{Fold, FoldKind},
+    syntax_highlighting::HighlightedRange,
+    diagnostics::Severity,
 };
-pub use ra_ide_api_light::{
-    HighlightedRange, Severity, StructureNode, LocalEdit,
-};
+pub use ra_ide_api_light::StructureNode;
 pub use ra_db::{
     Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, SourceRootId,
     Edition
@@ -263,7 +268,7 @@ impl Analysis {
     /// supported).
     pub fn matching_brace(&self, position: FilePosition) -> Option<TextUnit> {
         let file = self.db.parse(position.file_id);
-        ra_ide_api_light::matching_brace(&file, position.offset)
+        matching_brace::matching_brace(&file, position.offset)
     }
 
     /// Returns a syntax tree represented as `String`, for debug purposes.
@@ -276,18 +281,22 @@ impl Analysis {
     /// stuff like trailing commas.
     pub fn join_lines(&self, frange: FileRange) -> SourceChange {
         let file = self.db.parse(frange.file_id);
-        SourceChange::from_local_edit(
-            frange.file_id,
-            ra_ide_api_light::join_lines(&file, frange.range),
-        )
+        let file_edit = SourceFileEdit {
+            file_id: frange.file_id,
+            edit: join_lines::join_lines(&file, frange.range),
+        };
+        SourceChange {
+            label: "join lines".to_string(),
+            source_file_edits: vec![file_edit],
+            file_system_edits: vec![],
+            cursor_position: None,
+        }
     }
 
     /// Returns an edit which should be applied when opening a new line, fixing
     /// up minor stuff like continuing the comment.
     pub fn on_enter(&self, position: FilePosition) -> Option<SourceChange> {
-        let file = self.db.parse(position.file_id);
-        let edit = ra_ide_api_light::on_enter(&file, position.offset)?;
-        Some(SourceChange::from_local_edit(position.file_id, edit))
+        typing::on_enter(&self.db, position)
     }
 
     /// Returns an edit which should be applied after `=` was typed. Primarily,
@@ -295,15 +304,18 @@ impl Analysis {
     // FIXME: use a snippet completion instead of this hack here.
     pub fn on_eq_typed(&self, position: FilePosition) -> Option<SourceChange> {
         let file = self.db.parse(position.file_id);
-        let edit = ra_ide_api_light::on_eq_typed(&file, position.offset)?;
-        Some(SourceChange::from_local_edit(position.file_id, edit))
+        let edit = typing::on_eq_typed(&file, position.offset)?;
+        Some(SourceChange {
+            label: "add semicolon".to_string(),
+            source_file_edits: vec![SourceFileEdit { edit, file_id: position.file_id }],
+            file_system_edits: vec![],
+            cursor_position: None,
+        })
     }
 
     /// Returns an edit which should be applied when a dot ('.') is typed on a blank line, indenting the line appropriately.
     pub fn on_dot_typed(&self, position: FilePosition) -> Option<SourceChange> {
-        let file = self.db.parse(position.file_id);
-        let edit = ra_ide_api_light::on_dot_typed(&file, position.offset)?;
-        Some(SourceChange::from_local_edit(position.file_id, edit))
+        typing::on_dot_typed(&self.db, position)
     }
 
     /// Returns a tree representation of symbols in the file. Useful to draw a
@@ -425,18 +437,6 @@ impl Analysis {
     }
 }
 
-impl SourceChange {
-    pub(crate) fn from_local_edit(file_id: FileId, edit: LocalEdit) -> SourceChange {
-        let file_edit = SourceFileEdit { file_id, edit: edit.edit };
-        SourceChange {
-            label: edit.label,
-            source_file_edits: vec![file_edit],
-            file_system_edits: vec![],
-            cursor_position: edit.cursor_position.map(|offset| FilePosition { offset, file_id }),
-        }
-    }
-}
-
 #[test]
 fn analysis_is_send() {
     fn is_send<T: Send>() {}
diff --git a/crates/ra_ide_api/src/line_index.rs b/crates/ra_ide_api/src/line_index.rs
index bf004c33a..fd33d6767 100644
--- a/crates/ra_ide_api/src/line_index.rs
+++ b/crates/ra_ide_api/src/line_index.rs
@@ -77,7 +77,7 @@ impl LineIndex {
     }
 
     pub fn offset(&self, line_col: LineCol) -> TextUnit {
-        //TODO: return Result
+        //FIXME: return Result
         let col = self.utf16_to_utf8_col(line_col.line, line_col.col_utf16);
         self.newlines[line_col.line as usize] + col
     }
diff --git a/crates/ra_ide_api/src/matching_brace.rs b/crates/ra_ide_api/src/matching_brace.rs
new file mode 100644
index 000000000..d1405f14f
--- /dev/null
+++ b/crates/ra_ide_api/src/matching_brace.rs
@@ -0,0 +1,45 @@
+use ra_syntax::{
+    SourceFile, TextUnit,
+    algo::find_leaf_at_offset,
+    SyntaxKind::{self, *},
+    ast::AstNode,
+};
+
+pub fn matching_brace(file: &SourceFile, offset: TextUnit) -> Option<TextUnit> {
+    const BRACES: &[SyntaxKind] =
+        &[L_CURLY, R_CURLY, L_BRACK, R_BRACK, L_PAREN, R_PAREN, L_ANGLE, R_ANGLE];
+    let (brace_node, brace_idx) = find_leaf_at_offset(file.syntax(), offset)
+        .filter_map(|node| {
+            let idx = BRACES.iter().position(|&brace| brace == node.kind())?;
+            Some((node, idx))
+        })
+        .next()?;
+    let parent = brace_node.parent()?;
+    let matching_kind = BRACES[brace_idx ^ 1];
+    let matching_node = parent.children().find(|node| node.kind() == matching_kind)?;
+    Some(matching_node.range().start())
+}
+
+#[cfg(test)]
+mod tests {
+    use test_utils::{add_cursor, assert_eq_text, extract_offset};
+
+    use super::*;
+
+    #[test]
+    fn test_matching_brace() {
+        fn do_check(before: &str, after: &str) {
+            let (pos, before) = extract_offset(before);
+            let file = SourceFile::parse(&before);
+            let new_pos = match matching_brace(&file, pos) {
+                None => pos,
+                Some(pos) => pos,
+            };
+            let actual = add_cursor(&before, new_pos);
+            assert_eq_text!(after, &actual);
+        }
+
+        do_check("struct Foo { a: i32, }<|>", "struct Foo <|>{ a: i32, }");
+    }
+
+}
diff --git a/crates/ra_ide_api/src/snapshots/tests__highlighting.snap b/crates/ra_ide_api/src/snapshots/tests__highlighting.snap
new file mode 100644
index 000000000..72029e0ed
--- /dev/null
+++ b/crates/ra_ide_api/src/snapshots/tests__highlighting.snap
@@ -0,0 +1,34 @@
+---
+created: "2019-03-23T16:20:31.394314144Z"
+creator: [email protected]
+source: crates/ra_ide_api/src/syntax_highlighting.rs
+expression: result
+---
+Ok(
+    [
+        HighlightedRange {
+            range: [1; 11),
+            tag: "comment"
+        },
+        HighlightedRange {
+            range: [12; 14),
+            tag: "keyword"
+        },
+        HighlightedRange {
+            range: [15; 19),
+            tag: "function"
+        },
+        HighlightedRange {
+            range: [29; 37),
+            tag: "macro"
+        },
+        HighlightedRange {
+            range: [38; 50),
+            tag: "string"
+        },
+        HighlightedRange {
+            range: [52; 54),
+            tag: "literal"
+        }
+    ]
+)
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs
index 23c743bef..0978d164a 100644
--- a/crates/ra_ide_api/src/symbol_index.rs
+++ b/crates/ra_ide_api/src/symbol_index.rs
@@ -68,7 +68,7 @@ fn file_symbols(db: &impl SymbolsDatabase, file_id: FileId) -> Arc<SymbolIndex>
 
     let symbols = source_file_to_file_symbols(&source_file, file_id);
 
-    // TODO: add macros here
+    // FIXME: add macros here
 
     Arc::new(SymbolIndex::new(symbols))
 }
diff --git a/crates/ra_ide_api/src/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs
index fdd87bcff..a0c5e78ad 100644
--- a/crates/ra_ide_api/src/syntax_highlighting.rs
+++ b/crates/ra_ide_api/src/syntax_highlighting.rs
@@ -1,12 +1,81 @@
-use ra_syntax::AstNode;
+use rustc_hash::FxHashSet;
+
+use ra_syntax::{ast, AstNode, TextRange, Direction, SyntaxKind::*};
 use ra_db::SourceDatabase;
 
-use crate::{
-    FileId, HighlightedRange,
-    db::RootDatabase,
-};
+use crate::{FileId, db::RootDatabase};
+
+#[derive(Debug)]
+pub struct HighlightedRange {
+    pub range: TextRange,
+    pub tag: &'static str,
+}
 
 pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRange> {
     let source_file = db.parse(file_id);
-    ra_ide_api_light::highlight(source_file.syntax())
+
+    // Visited nodes to handle highlighting priorities
+    let mut highlighted = FxHashSet::default();
+    let mut res = Vec::new();
+    for node in source_file.syntax().descendants() {
+        if highlighted.contains(&node) {
+            continue;
+        }
+        let tag = match node.kind() {
+            COMMENT => "comment",
+            STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string",
+            ATTR => "attribute",
+            NAME_REF => "text",
+            NAME => "function",
+            INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE => "literal",
+            LIFETIME => "parameter",
+            k if k.is_keyword() => "keyword",
+            _ => {
+                if let Some(macro_call) = ast::MacroCall::cast(node) {
+                    if let Some(path) = macro_call.path() {
+                        if let Some(segment) = path.segment() {
+                            if let Some(name_ref) = segment.name_ref() {
+                                highlighted.insert(name_ref.syntax());
+                                let range_start = name_ref.syntax().range().start();
+                                let mut range_end = name_ref.syntax().range().end();
+                                for sibling in path.syntax().siblings(Direction::Next) {
+                                    match sibling.kind() {
+                                        EXCL | IDENT => range_end = sibling.range().end(),
+                                        _ => (),
+                                    }
+                                }
+                                res.push(HighlightedRange {
+                                    range: TextRange::from_to(range_start, range_end),
+                                    tag: "macro",
+                                })
+                            }
+                        }
+                    }
+                }
+                continue;
+            }
+        };
+        res.push(HighlightedRange { range: node.range(), tag })
+    }
+    res
+}
+
+#[cfg(test)]
+mod tests {
+    use insta::assert_debug_snapshot_matches;
+
+    use crate::mock_analysis::single_file;
+
+    #[test]
+    fn test_highlighting() {
+        let (analysis, file_id) = single_file(
+            r#"
+// comment
+fn main() {}
+    println!("Hello, {}!", 92);
+"#,
+        );
+        let result = analysis.highlight(file_id);
+        assert_debug_snapshot_matches!("highlighting", result);
+    }
 }
diff --git a/crates/ra_ide_api_light/src/test_utils.rs b/crates/ra_ide_api/src/test_utils.rs
index bfac0fce3..d0bd3a1e4 100644
--- a/crates/ra_ide_api_light/src/test_utils.rs
+++ b/crates/ra_ide_api/src/test_utils.rs
@@ -1,9 +1,9 @@
 use ra_syntax::{SourceFile, TextUnit};
+use ra_text_edit::TextEdit;
 
-use crate::LocalEdit;
 pub use test_utils::*;
 
-pub fn check_action<F: Fn(&SourceFile, TextUnit) -> Option<LocalEdit>>(
+pub fn check_action<F: Fn(&SourceFile, TextUnit) -> Option<TextEdit>>(
     before: &str,
     after: &str,
     f: F,
@@ -11,14 +11,9 @@ pub fn check_action<F: Fn(&SourceFile, TextUnit) -> Option<LocalEdit>>(
     let (before_cursor_pos, before) = extract_offset(before);
     let file = SourceFile::parse(&before);
     let result = f(&file, before_cursor_pos).expect("code action is not applicable");
-    let actual = result.edit.apply(&before);
-    let actual_cursor_pos = match result.cursor_position {
-        None => result
-            .edit
-            .apply_to_offset(before_cursor_pos)
-            .expect("cursor position is affected by the edit"),
-        Some(off) => off,
-    };
+    let actual = result.apply(&before);
+    let actual_cursor_pos =
+        result.apply_to_offset(before_cursor_pos).expect("cursor position is affected by the edit");
     let actual = add_cursor(&actual, actual_cursor_pos);
     assert_eq_text!(after, &actual);
 }
diff --git a/crates/ra_ide_api_light/src/typing.rs b/crates/ra_ide_api/src/typing.rs
index 9dd9f1c1d..94b228466 100644
--- a/crates/ra_ide_api_light/src/typing.rs
+++ b/crates/ra_ide_api/src/typing.rs
@@ -5,30 +5,37 @@ use ra_syntax::{
     ast::{self, AstToken},
 };
 use ra_fmt::leading_indent;
-use crate::{LocalEdit, TextEditBuilder};
+use ra_text_edit::{TextEdit, TextEditBuilder};
+use ra_db::{FilePosition, SourceDatabase};
+use crate::{db::RootDatabase, SourceChange, SourceFileEdit};
 
-pub fn on_enter(file: &SourceFile, offset: TextUnit) -> Option<LocalEdit> {
-    let comment =
-        find_leaf_at_offset(file.syntax(), offset).left_biased().and_then(ast::Comment::cast)?;
+pub(crate) fn on_enter(db: &RootDatabase, position: FilePosition) -> Option<SourceChange> {
+    let file = db.parse(position.file_id);
+    let comment = find_leaf_at_offset(file.syntax(), position.offset)
+        .left_biased()
+        .and_then(ast::Comment::cast)?;
 
     if let ast::CommentFlavor::Multiline = comment.flavor() {
         return None;
     }
 
     let prefix = comment.prefix();
-    if offset < comment.syntax().range().start() + TextUnit::of_str(prefix) + TextUnit::from(1) {
+    if position.offset
+        < comment.syntax().range().start() + TextUnit::of_str(prefix) + TextUnit::from(1)
+    {
         return None;
     }
 
-    let indent = node_indent(file, comment.syntax())?;
+    let indent = node_indent(&file, comment.syntax())?;
     let inserted = format!("\n{}{} ", indent, prefix);
-    let cursor_position = offset + TextUnit::of_str(&inserted);
+    let cursor_position = position.offset + TextUnit::of_str(&inserted);
     let mut edit = TextEditBuilder::default();
-    edit.insert(offset, inserted);
-    Some(LocalEdit {
+    edit.insert(position.offset, inserted);
+    Some(SourceChange {
         label: "on enter".to_string(),
-        edit: edit.finish(),
-        cursor_position: Some(cursor_position),
+        source_file_edits: vec![SourceFileEdit { edit: edit.finish(), file_id: position.file_id }],
+        file_system_edits: vec![],
+        cursor_position: Some(FilePosition { offset: cursor_position, file_id: position.file_id }),
     })
 }
 
@@ -52,7 +59,7 @@ fn node_indent<'a>(file: &'a SourceFile, node: &SyntaxNode) -> Option<&'a str> {
     Some(&text[pos..])
 }
 
-pub fn on_eq_typed(file: &SourceFile, eq_offset: TextUnit) -> Option<LocalEdit> {
+pub fn on_eq_typed(file: &SourceFile, eq_offset: TextUnit) -> Option<TextEdit> {
     assert_eq!(file.syntax().text().char_at(eq_offset), Some('='));
     let let_stmt: &ast::LetStmt = find_node_at_offset(file.syntax(), eq_offset)?;
     if let_stmt.has_semi() {
@@ -72,17 +79,14 @@ pub fn on_eq_typed(file: &SourceFile, eq_offset: TextUnit) -> Option<LocalEdit>
     let offset = let_stmt.syntax().range().end();
     let mut edit = TextEditBuilder::default();
     edit.insert(offset, ";".to_string());
-    Some(LocalEdit {
-        label: "add semicolon".to_string(),
-        edit: edit.finish(),
-        cursor_position: None,
-    })
+    Some(edit.finish())
 }
 
-pub fn on_dot_typed(file: &SourceFile, dot_offset: TextUnit) -> Option<LocalEdit> {
-    assert_eq!(file.syntax().text().char_at(dot_offset), Some('.'));
+pub(crate) fn on_dot_typed(db: &RootDatabase, position: FilePosition) -> Option<SourceChange> {
+    let file = db.parse(position.file_id);
+    assert_eq!(file.syntax().text().char_at(position.offset), Some('.'));
 
-    let whitespace = find_leaf_at_offset(file.syntax(), dot_offset)
+    let whitespace = find_leaf_at_offset(file.syntax(), position.offset)
         .left_biased()
         .and_then(ast::Whitespace::cast)?;
 
@@ -103,22 +107,27 @@ pub fn on_dot_typed(file: &SourceFile, dot_offset: TextUnit) -> Option<LocalEdit
     }
     let mut edit = TextEditBuilder::default();
     edit.replace(
-        TextRange::from_to(dot_offset - current_indent_len, dot_offset),
+        TextRange::from_to(position.offset - current_indent_len, position.offset),
         target_indent.into(),
     );
-    let res = LocalEdit {
+    let res = SourceChange {
         label: "reindent dot".to_string(),
-        edit: edit.finish(),
-        cursor_position: Some(
-            dot_offset + target_indent_len - current_indent_len + TextUnit::of_char('.'),
-        ),
+        source_file_edits: vec![SourceFileEdit { edit: edit.finish(), file_id: position.file_id }],
+        file_system_edits: vec![],
+        cursor_position: Some(FilePosition {
+            offset: position.offset + target_indent_len - current_indent_len
+                + TextUnit::of_char('.'),
+            file_id: position.file_id,
+        }),
     };
     Some(res)
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::test_utils::{add_cursor, assert_eq_text, extract_offset};
+    use test_utils::{add_cursor, assert_eq_text, extract_offset};
+
+    use crate::mock_analysis::single_file;
 
     use super::*;
 
@@ -131,7 +140,7 @@ mod tests {
             let before = edit.finish().apply(&before);
             let file = SourceFile::parse(&before);
             if let Some(result) = on_eq_typed(&file, offset) {
-                let actual = result.edit.apply(&before);
+                let actual = result.apply(&before);
                 assert_eq_text!(after, &actual);
             } else {
                 assert_eq_text!(&before, after)
@@ -177,9 +186,10 @@ fn foo() {
         let mut edit = TextEditBuilder::default();
         edit.insert(offset, ".".to_string());
         let before = edit.finish().apply(&before);
-        let file = SourceFile::parse(&before);
-        if let Some(result) = on_dot_typed(&file, offset) {
-            let actual = result.edit.apply(&before);
+        let (analysis, file_id) = single_file(&before);
+        if let Some(result) = analysis.on_dot_typed(FilePosition { offset, file_id }) {
+            assert_eq!(result.source_file_edits.len(), 1);
+            let actual = result.source_file_edits[0].edit.apply(&before);
             assert_eq_text!(after, &actual);
         } else {
             assert_eq_text!(&before, after)
@@ -358,10 +368,12 @@ fn foo() {
     fn test_on_enter() {
         fn apply_on_enter(before: &str) -> Option<String> {
             let (offset, before) = extract_offset(before);
-            let file = SourceFile::parse(&before);
-            let result = on_enter(&file, offset)?;
-            let actual = result.edit.apply(&before);
-            let actual = add_cursor(&actual, result.cursor_position.unwrap());
+            let (analysis, file_id) = single_file(&before);
+            let result = analysis.on_enter(FilePosition { offset, file_id })?;
+
+            assert_eq!(result.source_file_edits.len(), 1);
+            let actual = result.source_file_edits[0].edit.apply(&before);
+            let actual = add_cursor(&actual, result.cursor_position.unwrap().offset);
             Some(actual)
         }
 
diff --git a/crates/ra_ide_api_light/Cargo.toml b/crates/ra_ide_api_light/Cargo.toml
index a30833dc3..4e69f5325 100644
--- a/crates/ra_ide_api_light/Cargo.toml
+++ b/crates/ra_ide_api_light/Cargo.toml
@@ -17,5 +17,10 @@ ra_fmt = { path = "../ra_fmt" }
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
-proptest = "0.9.0"
 insta = "0.7.0"
+
+[dev-dependencies.proptest]
+version = "0.9.0"
+# Disable `fork` feature to allow compiling on webassembly
+default-features = false
+features = ["std", "bit-set", "break-dead-code"]
diff --git a/crates/ra_ide_api_light/src/lib.rs b/crates/ra_ide_api_light/src/lib.rs
index 4036a598e..df7f144b6 100644
--- a/crates/ra_ide_api_light/src/lib.rs
+++ b/crates/ra_ide_api_light/src/lib.rs
@@ -4,151 +4,9 @@
 //! an edit or some auxiliary info.
 
 mod structure;
-#[cfg(test)]
-mod test_utils;
-mod join_lines;
-mod typing;
 
-use rustc_hash::FxHashSet;
-use ra_text_edit::TextEditBuilder;
-use ra_syntax::{
-    SourceFile, SyntaxNode, TextRange, TextUnit, Direction,
-    algo::find_leaf_at_offset,
-    SyntaxKind::{self, *},
-    ast::{self, AstNode},
-};
+use ra_syntax::TextRange;
 
 pub use crate::{
     structure::{file_structure, StructureNode},
-    join_lines::join_lines,
-    typing::{on_enter, on_dot_typed, on_eq_typed},
 };
-
-#[derive(Debug)]
-pub struct LocalEdit {
-    pub label: String,
-    pub edit: ra_text_edit::TextEdit,
-    pub cursor_position: Option<TextUnit>,
-}
-
-#[derive(Debug)]
-pub struct HighlightedRange {
-    pub range: TextRange,
-    pub tag: &'static str,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum Severity {
-    Error,
-    WeakWarning,
-}
-
-#[derive(Debug)]
-pub struct Diagnostic {
-    pub range: TextRange,
-    pub msg: String,
-    pub severity: Severity,
-    pub fix: Option<LocalEdit>,
-}
-
-pub fn matching_brace(file: &SourceFile, offset: TextUnit) -> Option<TextUnit> {
-    const BRACES: &[SyntaxKind] =
-        &[L_CURLY, R_CURLY, L_BRACK, R_BRACK, L_PAREN, R_PAREN, L_ANGLE, R_ANGLE];
-    let (brace_node, brace_idx) = find_leaf_at_offset(file.syntax(), offset)
-        .filter_map(|node| {
-            let idx = BRACES.iter().position(|&brace| brace == node.kind())?;
-            Some((node, idx))
-        })
-        .next()?;
-    let parent = brace_node.parent()?;
-    let matching_kind = BRACES[brace_idx ^ 1];
-    let matching_node = parent.children().find(|node| node.kind() == matching_kind)?;
-    Some(matching_node.range().start())
-}
-
-pub fn highlight(root: &SyntaxNode) -> Vec<HighlightedRange> {
-    // Visited nodes to handle highlighting priorities
-    let mut highlighted = FxHashSet::default();
-    let mut res = Vec::new();
-    for node in root.descendants() {
-        if highlighted.contains(&node) {
-            continue;
-        }
-        let tag = match node.kind() {
-            COMMENT => "comment",
-            STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string",
-            ATTR => "attribute",
-            NAME_REF => "text",
-            NAME => "function",
-            INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE => "literal",
-            LIFETIME => "parameter",
-            k if k.is_keyword() => "keyword",
-            _ => {
-                if let Some(macro_call) = ast::MacroCall::cast(node) {
-                    if let Some(path) = macro_call.path() {
-                        if let Some(segment) = path.segment() {
-                            if let Some(name_ref) = segment.name_ref() {
-                                highlighted.insert(name_ref.syntax());
-                                let range_start = name_ref.syntax().range().start();
-                                let mut range_end = name_ref.syntax().range().end();
-                                for sibling in path.syntax().siblings(Direction::Next) {
-                                    match sibling.kind() {
-                                        EXCL | IDENT => range_end = sibling.range().end(),
-                                        _ => (),
-                                    }
-                                }
-                                res.push(HighlightedRange {
-                                    range: TextRange::from_to(range_start, range_end),
-                                    tag: "macro",
-                                })
-                            }
-                        }
-                    }
-                }
-                continue;
-            }
-        };
-        res.push(HighlightedRange { range: node.range(), tag })
-    }
-    res
-}
-
-#[cfg(test)]
-mod tests {
-    use ra_syntax::AstNode;
-    use insta::assert_debug_snapshot_matches;
-
-    use crate::test_utils::{add_cursor, assert_eq_text, extract_offset};
-
-    use super::*;
-
-    #[test]
-    fn test_highlighting() {
-        let file = SourceFile::parse(
-            r#"
-// comment
-fn main() {}
-    println!("Hello, {}!", 92);
-"#,
-        );
-        let hls = highlight(file.syntax());
-        assert_debug_snapshot_matches!("highlighting", hls);
-    }
-
-    #[test]
-    fn test_matching_brace() {
-        fn do_check(before: &str, after: &str) {
-            let (pos, before) = extract_offset(before);
-            let file = SourceFile::parse(&before);
-            let new_pos = match matching_brace(&file, pos) {
-                None => pos,
-                Some(pos) => pos,
-            };
-            let actual = add_cursor(&before, new_pos);
-            assert_eq_text!(after, &actual);
-        }
-
-        do_check("struct Foo { a: i32, }<|>", "struct Foo <|>{ a: i32, }");
-    }
-
-}
diff --git a/crates/ra_ide_api_light/src/snapshots/tests__highlighting.snap b/crates/ra_ide_api_light/src/snapshots/tests__highlighting.snap
deleted file mode 100644
index ef306a7a0..000000000
--- a/crates/ra_ide_api_light/src/snapshots/tests__highlighting.snap
+++ /dev/null
@@ -1,32 +0,0 @@
----
-created: "2019-01-22T14:45:01.959724300+00:00"
-creator: [email protected]
-expression: hls
-source: "crates\\ra_ide_api_light\\src\\lib.rs"
----
-[
-    HighlightedRange {
-        range: [1; 11),
-        tag: "comment"
-    },
-    HighlightedRange {
-        range: [12; 14),
-        tag: "keyword"
-    },
-    HighlightedRange {
-        range: [15; 19),
-        tag: "function"
-    },
-    HighlightedRange {
-        range: [29; 37),
-        tag: "macro"
-    },
-    HighlightedRange {
-        range: [38; 50),
-        tag: "string"
-    },
-    HighlightedRange {
-        range: [52; 54),
-        tag: "literal"
-    }
-]
diff --git a/crates/ra_parser/src/grammar/items/consts.rs b/crates/ra_parser/src/grammar/items/consts.rs
index e6e6011c6..1f802246f 100644
--- a/crates/ra_parser/src/grammar/items/consts.rs
+++ b/crates/ra_parser/src/grammar/items/consts.rs
@@ -11,7 +11,7 @@ pub(super) fn const_def(p: &mut Parser, m: Marker) {
 fn const_or_static(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) {
     assert!(p.at(kw));
     p.bump();
-    p.eat(MUT_KW); // TODO: validator to forbid const mut
+    p.eat(MUT_KW); // FIXME: validator to forbid const mut
     name(p);
     types::ascription(p);
     if p.eat(EQ) {
diff --git a/crates/ra_parser/src/grammar/items/nominal.rs b/crates/ra_parser/src/grammar/items/nominal.rs
index a3579eebd..e93bd76b8 100644
--- a/crates/ra_parser/src/grammar/items/nominal.rs
+++ b/crates/ra_parser/src/grammar/items/nominal.rs
@@ -15,7 +15,7 @@ pub(super) fn struct_def(p: &mut Parser, m: Marker, kind: SyntaxKind) {
                 }
                 L_CURLY => named_field_def_list(p),
                 _ => {
-                    //TODO: special case `(` error message
+                    //FIXME: special case `(` error message
                     p.error("expected `;` or `{`");
                 }
             }
diff --git a/crates/ra_parser/src/grammar/items/traits.rs b/crates/ra_parser/src/grammar/items/traits.rs
index d5a8ccd98..f49615f6b 100644
--- a/crates/ra_parser/src/grammar/items/traits.rs
+++ b/crates/ra_parser/src/grammar/items/traits.rs
@@ -49,7 +49,7 @@ pub(super) fn impl_block(p: &mut Parser) {
         type_params::opt_type_param_list(p);
     }
 
-    // TODO: never type
+    // FIXME: never type
     // impl ! {}
 
     // test impl_block_neg
diff --git a/crates/ra_parser/src/grammar/items/use_item.rs b/crates/ra_parser/src/grammar/items/use_item.rs
index ea2f94604..908493789 100644
--- a/crates/ra_parser/src/grammar/items/use_item.rs
+++ b/crates/ra_parser/src/grammar/items/use_item.rs
@@ -21,7 +21,7 @@ fn use_tree(p: &mut Parser) {
         // This does not handle cases such as `use some::path::*`
         // N.B. in Rust 2015 `use *;` imports all from crate root
         // however in Rust 2018 `use *;` errors: ('cannot glob-import all possible crates')
-        // TODO: Add this error (if not out of scope)
+        // FIXME: Add this error (if not out of scope)
 
         // test use_star
         // use *;
@@ -33,7 +33,7 @@ fn use_tree(p: &mut Parser) {
             // Parse `use ::*;`, which imports all from the crate root in Rust 2015
             // This is invalid inside a use_tree_list, (e.g. `use some::path::{::*}`)
             // but still parses and errors later: ('crate root in paths can only be used in start position')
-            // TODO: Add this error (if not out of scope)
+            // FIXME: Add this error (if not out of scope)
             // In Rust 2018, it is always invalid (see above)
             p.bump();
             p.bump();
diff --git a/crates/ra_parser/src/grammar/types.rs b/crates/ra_parser/src/grammar/types.rs
index adc189a29..fdd4f2c52 100644
--- a/crates/ra_parser/src/grammar/types.rs
+++ b/crates/ra_parser/src/grammar/types.rs
@@ -202,12 +202,15 @@ pub(super) fn for_binder(p: &mut Parser) {
 
 // test for_type
 // type A = for<'a> fn() -> ();
+// fn foo<T>(_t: &T) where for<'a> &'a T: Iterator {}
+// fn bar<T>(_t: &T) where for<'a> &'a mut T: Iterator {}
 pub(super) fn for_type(p: &mut Parser) {
     assert!(p.at(FOR_KW));
     let m = p.start();
     for_binder(p);
     match p.current() {
         FN_KW | UNSAFE_KW | EXTERN_KW => fn_pointer_type(p),
+        AMP => reference_type(p),
         _ if paths::is_path_start(p) => path_type_(p, false),
         _ => p.error("expected a path"),
     }
diff --git a/crates/ra_parser/src/parser.rs b/crates/ra_parser/src/parser.rs
index 3c326452b..56f8b7126 100644
--- a/crates/ra_parser/src/parser.rs
+++ b/crates/ra_parser/src/parser.rs
@@ -121,7 +121,7 @@ impl<'t> Parser<'t> {
     /// final tree.
     pub(crate) fn bump_remap(&mut self, kind: SyntaxKind) {
         if self.nth(0) == EOF {
-            // TODO: panic!?
+            // FIXME: panic!?
             return;
         }
         self.do_bump(kind, 1);
@@ -135,7 +135,7 @@ impl<'t> Parser<'t> {
     }
 
     /// Emit error with the `message`
-    /// TODO: this should be much more fancy and support
+    /// FIXME: this should be much more fancy and support
     /// structured errors with spans and notes, like rustc
     /// does.
     pub(crate) fn error<T: Into<String>>(&mut self, message: T) {
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 6f46a2d43..3bad4f8d3 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -23,7 +23,7 @@ pub use crate::{
     sysroot::Sysroot,
 };
 
-// TODO use proper error enum
+// FIXME use proper error enum
 pub type Result<T> = ::std::result::Result<T, ::failure::Error>;
 
 #[derive(Debug, Clone)]
diff --git a/crates/ra_syntax/src/validation/char.rs b/crates/ra_syntax/src/validation/char.rs
index 3169ed590..c874e5d08 100644
--- a/crates/ra_syntax/src/validation/char.rs
+++ b/crates/ra_syntax/src/validation/char.rs
@@ -85,7 +85,7 @@ pub(super) fn is_ascii_escape(code: char) -> bool {
 fn validate_ascii_code_escape(text: &str, range: TextRange, errors: &mut Vec<SyntaxError>) {
     // An AsciiCodeEscape has 4 chars, example: `\xDD`
     if !text.is_ascii() {
-        // TODO: Give a more precise error message (say what the invalid character was)
+        // FIXME: Give a more precise error message (say what the invalid character was)
         errors.push(SyntaxError::new(AsciiCodeEscapeOutOfRange, range));
     } else if text.chars().count() < 4 {
         errors.push(SyntaxError::new(TooShortAsciiCodeEscape, range));
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs
index 4d6a18c6b..7cde5c532 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs
@@ -1 +1,3 @@
 type A = for<'a> fn() -> ();
+fn foo<T>(_t: &T) where for<'a> &'a T: Iterator {}
+fn bar<T>(_t: &T) where for<'a> &'a mut T: Iterator {}
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt
index 6e7e6bda1..568f61fb2 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt
@@ -1,4 +1,4 @@
-SOURCE_FILE@[0; 29)
+SOURCE_FILE@[0; 135)
   TYPE_ALIAS_DEF@[0; 28)
     TYPE_KW@[0; 4)
     WHITESPACE@[4; 5)
@@ -29,3 +29,127 @@ SOURCE_FILE@[0; 29)
             R_PAREN@[26; 27)
     SEMI@[27; 28)
   WHITESPACE@[28; 29)
+  FN_DEF@[29; 79)
+    FN_KW@[29; 31)
+    WHITESPACE@[31; 32)
+    NAME@[32; 35)
+      IDENT@[32; 35) "foo"
+    TYPE_PARAM_LIST@[35; 38)
+      L_ANGLE@[35; 36)
+      TYPE_PARAM@[36; 37)
+        NAME@[36; 37)
+          IDENT@[36; 37) "T"
+      R_ANGLE@[37; 38)
+    PARAM_LIST@[38; 46)
+      L_PAREN@[38; 39)
+      PARAM@[39; 45)
+        BIND_PAT@[39; 41)
+          NAME@[39; 41)
+            IDENT@[39; 41) "_t"
+        COLON@[41; 42)
+        WHITESPACE@[42; 43)
+        REFERENCE_TYPE@[43; 45)
+          AMP@[43; 44)
+          PATH_TYPE@[44; 45)
+            PATH@[44; 45)
+              PATH_SEGMENT@[44; 45)
+                NAME_REF@[44; 45)
+                  IDENT@[44; 45) "T"
+      R_PAREN@[45; 46)
+    WHITESPACE@[46; 47)
+    WHERE_CLAUSE@[47; 76)
+      WHERE_KW@[47; 52)
+      WHITESPACE@[52; 53)
+      WHERE_PRED@[53; 76)
+        FOR_TYPE@[53; 66)
+          FOR_KW@[53; 56)
+          TYPE_PARAM_LIST@[56; 60)
+            L_ANGLE@[56; 57)
+            LIFETIME_PARAM@[57; 59)
+              LIFETIME@[57; 59) "'a"
+            R_ANGLE@[59; 60)
+          WHITESPACE@[60; 61)
+          REFERENCE_TYPE@[61; 66)
+            AMP@[61; 62)
+            LIFETIME@[62; 64) "'a"
+            WHITESPACE@[64; 65)
+            PATH_TYPE@[65; 66)
+              PATH@[65; 66)
+                PATH_SEGMENT@[65; 66)
+                  NAME_REF@[65; 66)
+                    IDENT@[65; 66) "T"
+        COLON@[66; 67)
+        WHITESPACE@[67; 68)
+        PATH_TYPE@[68; 76)
+          PATH@[68; 76)
+            PATH_SEGMENT@[68; 76)
+              NAME_REF@[68; 76)
+                IDENT@[68; 76) "Iterator"
+    WHITESPACE@[76; 77)
+    BLOCK@[77; 79)
+      L_CURLY@[77; 78)
+      R_CURLY@[78; 79)
+  WHITESPACE@[79; 80)
+  FN_DEF@[80; 134)
+    FN_KW@[80; 82)
+    WHITESPACE@[82; 83)
+    NAME@[83; 86)
+      IDENT@[83; 86) "bar"
+    TYPE_PARAM_LIST@[86; 89)
+      L_ANGLE@[86; 87)
+      TYPE_PARAM@[87; 88)
+        NAME@[87; 88)
+          IDENT@[87; 88) "T"
+      R_ANGLE@[88; 89)
+    PARAM_LIST@[89; 97)
+      L_PAREN@[89; 90)
+      PARAM@[90; 96)
+        BIND_PAT@[90; 92)
+          NAME@[90; 92)
+            IDENT@[90; 92) "_t"
+        COLON@[92; 93)
+        WHITESPACE@[93; 94)
+        REFERENCE_TYPE@[94; 96)
+          AMP@[94; 95)
+          PATH_TYPE@[95; 96)
+            PATH@[95; 96)
+              PATH_SEGMENT@[95; 96)
+                NAME_REF@[95; 96)
+                  IDENT@[95; 96) "T"
+      R_PAREN@[96; 97)
+    WHITESPACE@[97; 98)
+    WHERE_CLAUSE@[98; 131)
+      WHERE_KW@[98; 103)
+      WHITESPACE@[103; 104)
+      WHERE_PRED@[104; 131)
+        FOR_TYPE@[104; 121)
+          FOR_KW@[104; 107)
+          TYPE_PARAM_LIST@[107; 111)
+            L_ANGLE@[107; 108)
+            LIFETIME_PARAM@[108; 110)
+              LIFETIME@[108; 110) "'a"
+            R_ANGLE@[110; 111)
+          WHITESPACE@[111; 112)
+          REFERENCE_TYPE@[112; 121)
+            AMP@[112; 113)
+            LIFETIME@[113; 115) "'a"
+            WHITESPACE@[115; 116)
+            MUT_KW@[116; 119)
+            WHITESPACE@[119; 120)
+            PATH_TYPE@[120; 121)
+              PATH@[120; 121)
+                PATH_SEGMENT@[120; 121)
+                  NAME_REF@[120; 121)
+                    IDENT@[120; 121) "T"
+        COLON@[121; 122)
+        WHITESPACE@[122; 123)
+        PATH_TYPE@[123; 131)
+          PATH@[123; 131)
+            PATH_SEGMENT@[123; 131)
+              NAME_REF@[123; 131)
+                IDENT@[123; 131) "Iterator"
+    WHITESPACE@[131; 132)
+    BLOCK@[132; 134)
+      L_CURLY@[132; 133)
+      R_CURLY@[133; 134)
+  WHITESPACE@[134; 135)
diff --git a/crates/ra_syntax/tests/test.rs b/crates/ra_syntax/tests/test.rs
index 537b01368..276756c85 100644
--- a/crates/ra_syntax/tests/test.rs
+++ b/crates/ra_syntax/tests/test.rs
@@ -61,7 +61,7 @@ fn reparse_fuzz_tests() {
 }
 
 /// Test that Rust-analyzer can parse and validate the rust-analyser
-/// TODO: Use this as a benchmark
+/// FIXME: Use this as a benchmark
 #[test]
 fn self_hosting_parsing() {
     use std::ffi::OsStr;
diff --git a/crates/ra_text_edit/Cargo.toml b/crates/ra_text_edit/Cargo.toml
index 5769940df..b40026004 100644
--- a/crates/ra_text_edit/Cargo.toml
+++ b/crates/ra_text_edit/Cargo.toml
@@ -7,7 +7,12 @@ publish = false
 
 [dependencies]
 text_unit = "0.1.6"
-proptest = "0.9.0"
+
+[dependencies.proptest]
+version = "0.9.0"
+# Disable `fork` feature to allow compiling on webassembly
+default-features = false
+features = ["std", "bit-set", "break-dead-code"]
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
diff --git a/crates/tools/tests/cli.rs b/crates/tools/tests/cli.rs
index aab52a4aa..6f82ae61d 100644
--- a/crates/tools/tests/cli.rs
+++ b/crates/tools/tests/cli.rs
@@ -1,4 +1,6 @@
-use tools::{generate, gen_tests, run_rustfmt, Verify};
+use walkdir::WalkDir;
+
+use tools::{generate, gen_tests, run_rustfmt, Verify, project_root};
 
 #[test]
 fn generated_grammar_is_fresh() {
@@ -20,3 +22,25 @@ fn check_code_formatting() {
         panic!("{}. Please format the code by running `cargo format`", error);
     }
 }
+
+#[test]
+fn no_todo() {
+    WalkDir::new(project_root().join("crates")).into_iter().for_each(|e| {
+        let e = e.unwrap();
+        if e.path().extension().map(|it| it != "rs").unwrap_or(true) {
+            return;
+        }
+        if e.path().ends_with("tests/cli.rs") {
+            return;
+        }
+        let text = std::fs::read_to_string(e.path()).unwrap();
+        if text.contains("TODO") {
+            panic!(
+                "\nTODO markers should not be commited to the master branch,\n\
+                 use FIXME instead\n\
+                 {}\n",
+                e.path().display(),
+            )
+        }
+    })
+}