diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-22 20:28:17 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-02-22 20:28:17 +0000 |
commit | 27ed1ebf8997cea55fb446ce249b390607b84105 (patch) | |
tree | a49a763fee848041fd607f449ad13a0b1040636e /crates/ide/src/lib.rs | |
parent | 8687053b118f47ce1a4962d0baa19b22d40d2758 (diff) | |
parent | eb6cfa7f157690480fca5d55c69dba3fae87ad4f (diff) |
Merge #7759
7759: 7526: Rename ide related crates r=Veykril a=chetankhilosiya
renamed assists -> ide_assists and ssr -> ide_ssr.
the completion crate is already renamed.
Co-authored-by: Chetan Khilosiya <[email protected]>
Diffstat (limited to 'crates/ide/src/lib.rs')
-rw-r--r-- | crates/ide/src/lib.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index f47ec61fe..b600178ee 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs | |||
@@ -82,8 +82,8 @@ pub use crate::{ | |||
82 | HlRange, | 82 | HlRange, |
83 | }, | 83 | }, |
84 | }; | 84 | }; |
85 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind}; | ||
86 | pub use hir::{Documentation, Semantics}; | 85 | pub use hir::{Documentation, Semantics}; |
86 | pub use ide_assists::{Assist, AssistConfig, AssistId, AssistKind}; | ||
87 | pub use ide_completion::{ | 87 | pub use ide_completion::{ |
88 | CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit, | 88 | CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit, |
89 | InsertTextFormat, | 89 | InsertTextFormat, |
@@ -101,7 +101,7 @@ pub use ide_db::{ | |||
101 | symbol_index::Query, | 101 | symbol_index::Query, |
102 | RootDatabase, | 102 | RootDatabase, |
103 | }; | 103 | }; |
104 | pub use ssr::SsrError; | 104 | pub use ide_ssr::SsrError; |
105 | pub use syntax::{TextRange, TextSize}; | 105 | pub use syntax::{TextRange, TextSize}; |
106 | pub use text_edit::{Indel, TextEdit}; | 106 | pub use text_edit::{Indel, TextEdit}; |
107 | 107 | ||
@@ -549,8 +549,9 @@ impl Analysis { | |||
549 | selections: Vec<FileRange>, | 549 | selections: Vec<FileRange>, |
550 | ) -> Cancelable<Result<SourceChange, SsrError>> { | 550 | ) -> Cancelable<Result<SourceChange, SsrError>> { |
551 | self.with_db(|db| { | 551 | self.with_db(|db| { |
552 | let rule: ssr::SsrRule = query.parse()?; | 552 | let rule: ide_ssr::SsrRule = query.parse()?; |
553 | let mut match_finder = ssr::MatchFinder::in_context(db, resolve_context, selections); | 553 | let mut match_finder = |
554 | ide_ssr::MatchFinder::in_context(db, resolve_context, selections); | ||
554 | match_finder.add_rule(rule)?; | 555 | match_finder.add_rule(rule)?; |
555 | let edits = if parse_only { Default::default() } else { match_finder.edits() }; | 556 | let edits = if parse_only { Default::default() } else { match_finder.edits() }; |
556 | Ok(SourceChange::from(edits)) | 557 | Ok(SourceChange::from(edits)) |