aboutsummaryrefslogtreecommitdiff
path: root/crates/ide/src/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ide/src/lib.rs')
-rw-r--r--crates/ide/src/lib.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index f8d69382e..3abbb14c6 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -86,18 +86,15 @@ pub use completion::{
86 InsertTextFormat, 86 InsertTextFormat,
87}; 87};
88pub use hir::{Documentation, Semantics}; 88pub use hir::{Documentation, Semantics};
89pub use ide_db::base_db::{
90 Canceled, Change, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot,
91 SourceRootId,
92};
93pub use ide_db::{ 89pub use ide_db::{
90 base_db::{
91 Canceled, Change, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange,
92 SourceRoot, SourceRootId,
93 },
94 call_info::CallInfo, 94 call_info::CallInfo,
95 search::{FileReference, ReferenceAccess, ReferenceKind},
96};
97pub use ide_db::{
98 label::Label, 95 label::Label,
99 line_index::{LineCol, LineIndex}, 96 line_index::{LineCol, LineIndex},
100 search::SearchScope, 97 search::{FileReference, ReferenceAccess, ReferenceKind, SearchScope},
101 source_change::{FileSystemEdit, SourceChange}, 98 source_change::{FileSystemEdit, SourceChange},
102 symbol_index::Query, 99 symbol_index::Query,
103 RootDatabase, 100 RootDatabase,
@@ -481,6 +478,7 @@ impl Analysis {
481 position: FilePosition, 478 position: FilePosition,
482 full_import_path: &str, 479 full_import_path: &str,
483 imported_name: String, 480 imported_name: String,
481 import_for_trait_assoc_item: bool,
484 ) -> Cancelable<Vec<TextEdit>> { 482 ) -> Cancelable<Vec<TextEdit>> {
485 Ok(self 483 Ok(self
486 .with_db(|db| { 484 .with_db(|db| {
@@ -490,6 +488,7 @@ impl Analysis {
490 position, 488 position,
491 full_import_path, 489 full_import_path,
492 imported_name, 490 imported_name,
491 import_for_trait_assoc_item,
493 ) 492 )
494 })? 493 })?
495 .unwrap_or_default()) 494 .unwrap_or_default())
@@ -523,7 +522,7 @@ impl Analysis {
523 &self, 522 &self,
524 position: FilePosition, 523 position: FilePosition,
525 new_name: &str, 524 new_name: &str,
526 ) -> Cancelable<Result<RangeInfo<SourceChange>, RenameError>> { 525 ) -> Cancelable<Result<SourceChange, RenameError>> {
527 self.with_db(|db| references::rename::rename(db, position, new_name)) 526 self.with_db(|db| references::rename::rename(db, position, new_name))
528 } 527 }
529 528