From 8d3d509af77756758cea14cc4939d099b4f95993 Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Sat, 24 Oct 2020 10:47:23 +0300 Subject: Remove dependency on 'assists' from 'completion' crate --- crates/completion/Cargo.toml | 1 - crates/completion/src/complete_postfix.rs | 2 +- crates/completion/src/complete_trait_impl.rs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'crates/completion') diff --git a/crates/completion/Cargo.toml b/crates/completion/Cargo.toml index 25192456a..8b6e80448 100644 --- a/crates/completion/Cargo.toml +++ b/crates/completion/Cargo.toml @@ -21,7 +21,6 @@ base_db = { path = "../base_db", version = "0.0.0" } ide_db = { path = "../ide_db", version = "0.0.0" } profile = { path = "../profile", version = "0.0.0" } test_utils = { path = "../test_utils", version = "0.0.0" } -assists = { path = "../assists", version = "0.0.0" } call_info = { path = "../call_info", version = "0.0.0" } # completions crate should depend only on the top-level `hir` package. if you need diff --git a/crates/completion/src/complete_postfix.rs b/crates/completion/src/complete_postfix.rs index 700573cf2..2622f12ab 100644 --- a/crates/completion/src/complete_postfix.rs +++ b/crates/completion/src/complete_postfix.rs @@ -2,7 +2,7 @@ mod format_like; -use assists::utils::TryEnum; +use ide_db::ty_filter::TryEnum; use syntax::{ ast::{self, AstNode, AstToken}, TextRange, TextSize, diff --git a/crates/completion/src/complete_trait_impl.rs b/crates/completion/src/complete_trait_impl.rs index c06af99e2..a14be9c73 100644 --- a/crates/completion/src/complete_trait_impl.rs +++ b/crates/completion/src/complete_trait_impl.rs @@ -31,8 +31,8 @@ //! } //! ``` -use assists::utils::get_missing_assoc_items; use hir::{self, HasAttrs, HasSource}; +use ide_db::traits::get_missing_assoc_items; use syntax::{ ast::{self, edit, Impl}, display::function_declaration, -- cgit v1.2.3 From b6ea56ea091ad1dbd765831d8dfe79e4d3cdf004 Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Sat, 24 Oct 2020 11:07:10 +0300 Subject: Make call_info a part of ide_db --- crates/completion/Cargo.toml | 1 - crates/completion/src/completion_context.rs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'crates/completion') diff --git a/crates/completion/Cargo.toml b/crates/completion/Cargo.toml index 8b6e80448..b79ee33f7 100644 --- a/crates/completion/Cargo.toml +++ b/crates/completion/Cargo.toml @@ -21,7 +21,6 @@ base_db = { path = "../base_db", version = "0.0.0" } ide_db = { path = "../ide_db", version = "0.0.0" } profile = { path = "../profile", version = "0.0.0" } test_utils = { path = "../test_utils", version = "0.0.0" } -call_info = { path = "../call_info", version = "0.0.0" } # completions crate should depend only on the top-level `hir` package. if you need # something from some `hir_xxx` subpackage, reexport the API via `hir`. diff --git a/crates/completion/src/completion_context.rs b/crates/completion/src/completion_context.rs index e4f86d0e0..97c5c04ba 100644 --- a/crates/completion/src/completion_context.rs +++ b/crates/completion/src/completion_context.rs @@ -1,9 +1,8 @@ //! See `CompletionContext` structure. use base_db::{FilePosition, SourceDatabase}; -use call_info::ActiveParameter; use hir::{Local, ScopeDef, Semantics, SemanticsScope, Type}; -use ide_db::RootDatabase; +use ide_db::{call_info::ActiveParameter, RootDatabase}; use syntax::{ algo::{find_covering_element, find_node_at_offset}, ast, match_ast, AstNode, NodeOrToken, -- cgit v1.2.3 From 19cce08662222f012a0f50ff73afd4fdd34ca683 Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Sat, 24 Oct 2020 11:39:57 +0300 Subject: Re-export base_db from ide_db --- crates/completion/src/complete_mod.rs | 2 +- crates/completion/src/completion_context.rs | 2 +- crates/completion/src/lib.rs | 2 +- crates/completion/src/test_utils.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/completion') diff --git a/crates/completion/src/complete_mod.rs b/crates/completion/src/complete_mod.rs index 35a57aba3..385911afa 100644 --- a/crates/completion/src/complete_mod.rs +++ b/crates/completion/src/complete_mod.rs @@ -1,7 +1,7 @@ //! Completes mod declarations. -use base_db::{SourceDatabaseExt, VfsPath}; use hir::{Module, ModuleSource}; +use ide_db::base_db::{SourceDatabaseExt, VfsPath}; use ide_db::RootDatabase; use rustc_hash::FxHashSet; diff --git a/crates/completion/src/completion_context.rs b/crates/completion/src/completion_context.rs index 97c5c04ba..dca304a8f 100644 --- a/crates/completion/src/completion_context.rs +++ b/crates/completion/src/completion_context.rs @@ -1,7 +1,7 @@ //! See `CompletionContext` structure. -use base_db::{FilePosition, SourceDatabase}; use hir::{Local, ScopeDef, Semantics, SemanticsScope, Type}; +use ide_db::base_db::{FilePosition, SourceDatabase}; use ide_db::{call_info::ActiveParameter, RootDatabase}; use syntax::{ algo::{find_covering_element, find_node_at_offset}, diff --git a/crates/completion/src/lib.rs b/crates/completion/src/lib.rs index 0a60ea7f2..b72fd249d 100644 --- a/crates/completion/src/lib.rs +++ b/crates/completion/src/lib.rs @@ -23,7 +23,7 @@ mod complete_macro_in_item_position; mod complete_trait_impl; mod complete_mod; -use base_db::FilePosition; +use ide_db::base_db::FilePosition; use ide_db::RootDatabase; use crate::{ diff --git a/crates/completion/src/test_utils.rs b/crates/completion/src/test_utils.rs index f2cf2561f..b02556797 100644 --- a/crates/completion/src/test_utils.rs +++ b/crates/completion/src/test_utils.rs @@ -1,7 +1,7 @@ //! Runs completion for testing purposes. -use base_db::{fixture::ChangeFixture, FileLoader, FilePosition}; use hir::Semantics; +use ide_db::base_db::{fixture::ChangeFixture, FileLoader, FilePosition}; use ide_db::RootDatabase; use itertools::Itertools; use stdx::{format_to, trim_indent}; -- cgit v1.2.3