From d659b7a2f03788eb0f4f15e3730bbf65a18ed818 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 27 Nov 2018 21:45:42 +0300
Subject: start descriptors -> hir rename

---
 crates/ra_analysis/src/completion/mod.rs                  | 2 +-
 crates/ra_analysis/src/completion/reference_completion.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_analysis/src/completion')

diff --git a/crates/ra_analysis/src/completion/mod.rs b/crates/ra_analysis/src/completion/mod.rs
index 5ef278127..1eb804c85 100644
--- a/crates/ra_analysis/src/completion/mod.rs
+++ b/crates/ra_analysis/src/completion/mod.rs
@@ -11,7 +11,7 @@ use rustc_hash::{FxHashMap};
 
 use crate::{
     db::{self, SyntaxDatabase},
-    descriptors::{
+    hir::{
         module::{ModuleDescriptor}
     },
     Cancelable, FilePosition
diff --git a/crates/ra_analysis/src/completion/reference_completion.rs b/crates/ra_analysis/src/completion/reference_completion.rs
index 858b52e76..ac6ef1d4a 100644
--- a/crates/ra_analysis/src/completion/reference_completion.rs
+++ b/crates/ra_analysis/src/completion/reference_completion.rs
@@ -10,7 +10,7 @@ use ra_syntax::{
 use crate::{
     db::RootDatabase,
     completion::CompletionItem,
-    descriptors::{
+    hir::{
         module::{ModuleDescriptor},
         function::FnScopes,
         Def,
-- 
cgit v1.2.3


From 93fae0826194b1590013c9bb0d977e60bd135918 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 27 Nov 2018 23:35:53 +0300
Subject: make module module private

---
 crates/ra_analysis/src/completion/mod.rs                  | 6 +++---
 crates/ra_analysis/src/completion/reference_completion.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates/ra_analysis/src/completion')

diff --git a/crates/ra_analysis/src/completion/mod.rs b/crates/ra_analysis/src/completion/mod.rs
index 1eb804c85..08fb149af 100644
--- a/crates/ra_analysis/src/completion/mod.rs
+++ b/crates/ra_analysis/src/completion/mod.rs
@@ -11,9 +11,9 @@ use rustc_hash::{FxHashMap};
 
 use crate::{
     db::{self, SyntaxDatabase},
-    hir::{
-        module::{ModuleDescriptor}
-    },
+    hir::
+        ModuleDescriptor
+    ,
     Cancelable, FilePosition
 };
 
diff --git a/crates/ra_analysis/src/completion/reference_completion.rs b/crates/ra_analysis/src/completion/reference_completion.rs
index ac6ef1d4a..1bf210685 100644
--- a/crates/ra_analysis/src/completion/reference_completion.rs
+++ b/crates/ra_analysis/src/completion/reference_completion.rs
@@ -11,7 +11,7 @@ use crate::{
     db::RootDatabase,
     completion::CompletionItem,
     hir::{
-        module::{ModuleDescriptor},
+        ModuleDescriptor,
         function::FnScopes,
         Def,
         Path,
-- 
cgit v1.2.3


From 67de38ec7d5c235dec209fe859d6bf6b0dbe497a Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 27 Nov 2018 23:40:23 +0300
Subject: move resolve_local_scope

---
 crates/ra_analysis/src/completion/reference_completion.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_analysis/src/completion')

diff --git a/crates/ra_analysis/src/completion/reference_completion.rs b/crates/ra_analysis/src/completion/reference_completion.rs
index 1bf210685..5bf8c3725 100644
--- a/crates/ra_analysis/src/completion/reference_completion.rs
+++ b/crates/ra_analysis/src/completion/reference_completion.rs
@@ -12,7 +12,7 @@ use crate::{
     completion::CompletionItem,
     hir::{
         ModuleDescriptor,
-        function::FnScopes,
+        FnScopes,
         Def,
         Path,
     },
-- 
cgit v1.2.3


From 36b1d20c1661877c0c5a55ccd07522bc97bfc254 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 28 Nov 2018 01:19:55 +0300
Subject: rename ModuleDescriptor -> Module

---
 crates/ra_analysis/src/completion/mod.rs                  | 6 ++----
 crates/ra_analysis/src/completion/reference_completion.rs | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'crates/ra_analysis/src/completion')

diff --git a/crates/ra_analysis/src/completion/mod.rs b/crates/ra_analysis/src/completion/mod.rs
index 08fb149af..67ec9a735 100644
--- a/crates/ra_analysis/src/completion/mod.rs
+++ b/crates/ra_analysis/src/completion/mod.rs
@@ -11,9 +11,7 @@ use rustc_hash::{FxHashMap};
 
 use crate::{
     db::{self, SyntaxDatabase},
-    hir::
-        ModuleDescriptor
-    ,
+    hir,
     Cancelable, FilePosition
 };
 
@@ -38,7 +36,7 @@ pub(crate) fn completions(
         original_file.reparse(&edit)
     };
 
-    let module = ctry!(ModuleDescriptor::guess_from_position(db, position)?);
+    let module = ctry!(hir::Module::guess_from_position(db, position)?);
 
     let mut res = Vec::new();
     let mut has_completions = false;
diff --git a/crates/ra_analysis/src/completion/reference_completion.rs b/crates/ra_analysis/src/completion/reference_completion.rs
index 5bf8c3725..881d29916 100644
--- a/crates/ra_analysis/src/completion/reference_completion.rs
+++ b/crates/ra_analysis/src/completion/reference_completion.rs
@@ -11,7 +11,7 @@ use crate::{
     db::RootDatabase,
     completion::CompletionItem,
     hir::{
-        ModuleDescriptor,
+        self,
         FnScopes,
         Def,
         Path,
@@ -22,7 +22,7 @@ use crate::{
 pub(super) fn completions(
     acc: &mut Vec<CompletionItem>,
     db: &RootDatabase,
-    module: &ModuleDescriptor,
+    module: &hir::Module,
     file: &SourceFileNode,
     name_ref: ast::NameRef,
 ) -> Cancelable<()> {
@@ -150,7 +150,7 @@ fn complete_fn(name_ref: ast::NameRef, scopes: &FnScopes, acc: &mut Vec<Completi
 fn complete_path(
     acc: &mut Vec<CompletionItem>,
     db: &RootDatabase,
-    module: &ModuleDescriptor,
+    module: &hir::Module,
     mut path: Path,
 ) -> Cancelable<()> {
     if path.segments.is_empty() {
-- 
cgit v1.2.3


From ec45dfea1e37ba40ea3e2c8c6df0991a3d49213f Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 28 Nov 2018 02:25:03 +0300
Subject: rename file_syntax -> source_file

---
 crates/ra_analysis/src/completion/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_analysis/src/completion')

diff --git a/crates/ra_analysis/src/completion/mod.rs b/crates/ra_analysis/src/completion/mod.rs
index 67ec9a735..844dabb19 100644
--- a/crates/ra_analysis/src/completion/mod.rs
+++ b/crates/ra_analysis/src/completion/mod.rs
@@ -29,7 +29,7 @@ pub(crate) fn completions(
     db: &db::RootDatabase,
     position: FilePosition,
 ) -> Cancelable<Option<Vec<CompletionItem>>> {
-    let original_file = db.file_syntax(position.file_id);
+    let original_file = db.source_file(position.file_id);
     // Insert a fake ident to get a valid parse tree
     let file = {
         let edit = AtomEdit::insert(position.offset, "intellijRulezz".to_string());
-- 
cgit v1.2.3


From 11168c464cd962af3336a2cc68295496066edd6c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 28 Nov 2018 03:25:20 +0300
Subject: move db basics to ra_db

This should allow to move hir to a separate crate
---
 crates/ra_analysis/src/completion/mod.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'crates/ra_analysis/src/completion')

diff --git a/crates/ra_analysis/src/completion/mod.rs b/crates/ra_analysis/src/completion/mod.rs
index 844dabb19..538b51633 100644
--- a/crates/ra_analysis/src/completion/mod.rs
+++ b/crates/ra_analysis/src/completion/mod.rs
@@ -7,10 +7,11 @@ use ra_syntax::{
     AstNode, AtomEdit,
     SyntaxNodeRef,
 };
+use ra_db::SyntaxDatabase;
 use rustc_hash::{FxHashMap};
 
 use crate::{
-    db::{self, SyntaxDatabase},
+    db,
     hir,
     Cancelable, FilePosition
 };
-- 
cgit v1.2.3


From 59e29aef633e906837f8fed604435976a46be691 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 28 Nov 2018 04:09:44 +0300
Subject: Move hir to a separate crate

---
 crates/ra_analysis/src/completion/mod.rs                  |  1 -
 crates/ra_analysis/src/completion/reference_completion.rs | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'crates/ra_analysis/src/completion')

diff --git a/crates/ra_analysis/src/completion/mod.rs b/crates/ra_analysis/src/completion/mod.rs
index 538b51633..e5ba92acd 100644
--- a/crates/ra_analysis/src/completion/mod.rs
+++ b/crates/ra_analysis/src/completion/mod.rs
@@ -12,7 +12,6 @@ use rustc_hash::{FxHashMap};
 
 use crate::{
     db,
-    hir,
     Cancelable, FilePosition
 };
 
diff --git a/crates/ra_analysis/src/completion/reference_completion.rs b/crates/ra_analysis/src/completion/reference_completion.rs
index 881d29916..e1a2d5241 100644
--- a/crates/ra_analysis/src/completion/reference_completion.rs
+++ b/crates/ra_analysis/src/completion/reference_completion.rs
@@ -6,16 +6,16 @@ use ra_syntax::{
     ast::{self, LoopBodyOwner},
     SyntaxKind::*,
 };
-
-use crate::{
-    db::RootDatabase,
-    completion::CompletionItem,
-    hir::{
+use     hir::{
         self,
         FnScopes,
         Def,
         Path,
-    },
+};
+
+use crate::{
+    db::RootDatabase,
+    completion::CompletionItem,
     Cancelable
 };
 
-- 
cgit v1.2.3