From f62e8616c879255e70052ae35ce7f98bffedac11 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Fri, 18 Sep 2020 23:40:11 +0300
Subject: Add imports in auto completion

---
 crates/hir/src/code_model.rs | 10 ++--------
 crates/hir/src/lib.rs        |  1 +
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'crates/hir')

diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs
index 30a5e4580..37ed092ad 100644
--- a/crates/hir/src/code_model.rs
+++ b/crates/hir/src/code_model.rs
@@ -110,15 +110,9 @@ impl Crate {
     pub fn query_external_importables(
         self,
         db: &dyn DefDatabase,
-        query: &str,
+        query: import_map::Query,
     ) -> impl Iterator<Item = Either<ModuleDef, MacroDef>> {
-        import_map::search_dependencies(
-            db,
-            self.into(),
-            import_map::Query::new(query).anchor_end().case_sensitive().limit(40),
-        )
-        .into_iter()
-        .map(|item| match item {
+        import_map::search_dependencies(db, self.into(), query).into_iter().map(|item| match item {
             ItemInNs::Types(mod_id) | ItemInNs::Values(mod_id) => Either::Left(mod_id.into()),
             ItemInNs::Macros(mac_id) => Either::Right(mac_id.into()),
         })
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 0d184379f..ad58a7cfe 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -49,6 +49,7 @@ pub use hir_def::{
     builtin_type::BuiltinType,
     docs::Documentation,
     find_path::PrefixKind,
+    import_map::Query,
     item_scope::ItemInNs,
     nameres::ModuleSource,
     path::{ModPath, PathKind},
-- 
cgit v1.2.3


From 4c8edd003aa447bd2da10fd81b24f582deacdc11 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Fri, 13 Nov 2020 19:16:56 +0200
Subject: Use imports_locator

---
 crates/hir/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/hir')

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index ad58a7cfe..4b7ea3aa9 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -49,7 +49,7 @@ pub use hir_def::{
     builtin_type::BuiltinType,
     docs::Documentation,
     find_path::PrefixKind,
-    import_map::Query,
+    import_map::Query as ExternalImportablesQuery,
     item_scope::ItemInNs,
     nameres::ModuleSource,
     path::{ModPath, PathKind},
-- 
cgit v1.2.3


From 410996893489f6c64b472e6128f099f1de229806 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Mon, 16 Nov 2020 21:24:54 +0200
Subject: Remove query aliases

---
 crates/hir/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/hir')

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 4b7ea3aa9..5fea25ef1 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -49,7 +49,7 @@ pub use hir_def::{
     builtin_type::BuiltinType,
     docs::Documentation,
     find_path::PrefixKind,
-    import_map::Query as ExternalImportablesQuery,
+    import_map,
     item_scope::ItemInNs,
     nameres::ModuleSource,
     path::{ModPath, PathKind},
-- 
cgit v1.2.3