diff options
Diffstat (limited to 'crates/ide')
-rw-r--r-- | crates/ide/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ide/src/lib.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml index bb28cca4d..3cbe3a397 100644 --- a/crates/ide/Cargo.toml +++ b/crates/ide/Cargo.toml | |||
@@ -29,7 +29,7 @@ profile = { path = "../profile", version = "0.0.0" } | |||
29 | test_utils = { path = "../test_utils", version = "0.0.0" } | 29 | test_utils = { path = "../test_utils", version = "0.0.0" } |
30 | assists = { path = "../assists", version = "0.0.0" } | 30 | assists = { path = "../assists", version = "0.0.0" } |
31 | ssr = { path = "../ssr", version = "0.0.0" } | 31 | ssr = { path = "../ssr", version = "0.0.0" } |
32 | completion = { path = "../completion", version = "0.0.0" } | 32 | ide_completion = { path = "../ide_completion", version = "0.0.0" } |
33 | 33 | ||
34 | # ide should depend only on the top-level `hir` package. if you need | 34 | # ide should depend only on the top-level `hir` package. if you need |
35 | # something from some `hir_xxx` subpackage, reexport the API via `hir`. | 35 | # something from some `hir_xxx` subpackage, reexport the API via `hir`. |
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index a2c8db505..f47ec61fe 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs | |||
@@ -83,11 +83,11 @@ pub use crate::{ | |||
83 | }, | 83 | }, |
84 | }; | 84 | }; |
85 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind}; | 85 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind}; |
86 | pub use completion::{ | 86 | pub use hir::{Documentation, Semantics}; |
87 | pub use ide_completion::{ | ||
87 | CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit, | 88 | CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit, |
88 | InsertTextFormat, | 89 | InsertTextFormat, |
89 | }; | 90 | }; |
90 | pub use hir::{Documentation, Semantics}; | ||
91 | pub use ide_db::{ | 91 | pub use ide_db::{ |
92 | base_db::{ | 92 | base_db::{ |
93 | Canceled, Change, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, | 93 | Canceled, Change, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, |
@@ -468,7 +468,7 @@ impl Analysis { | |||
468 | config: &CompletionConfig, | 468 | config: &CompletionConfig, |
469 | position: FilePosition, | 469 | position: FilePosition, |
470 | ) -> Cancelable<Option<Vec<CompletionItem>>> { | 470 | ) -> Cancelable<Option<Vec<CompletionItem>>> { |
471 | self.with_db(|db| completion::completions(db, config, position).map(Into::into)) | 471 | self.with_db(|db| ide_completion::completions(db, config, position).map(Into::into)) |
472 | } | 472 | } |
473 | 473 | ||
474 | /// Resolves additional completion data at the position given. | 474 | /// Resolves additional completion data at the position given. |
@@ -482,7 +482,7 @@ impl Analysis { | |||
482 | ) -> Cancelable<Vec<TextEdit>> { | 482 | ) -> Cancelable<Vec<TextEdit>> { |
483 | Ok(self | 483 | Ok(self |
484 | .with_db(|db| { | 484 | .with_db(|db| { |
485 | completion::resolve_completion_edits( | 485 | ide_completion::resolve_completion_edits( |
486 | db, | 486 | db, |
487 | config, | 487 | config, |
488 | position, | 488 | position, |