aboutsummaryrefslogtreecommitdiff
path: root/crates/ide
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ide')
-rw-r--r--crates/ide/Cargo.toml4
-rw-r--r--crates/ide/src/fn_references.rs2
-rw-r--r--crates/ide/src/join_lines.rs2
-rw-r--r--crates/ide/src/lib.rs9
-rw-r--r--crates/ide/src/runnables.rs2
5 files changed, 10 insertions, 9 deletions
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index 3cbe3a397..f6aaaeda4 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -27,8 +27,8 @@ ide_db = { path = "../ide_db", version = "0.0.0" }
27cfg = { path = "../cfg", version = "0.0.0" } 27cfg = { path = "../cfg", version = "0.0.0" }
28profile = { path = "../profile", version = "0.0.0" } 28profile = { path = "../profile", version = "0.0.0" }
29test_utils = { path = "../test_utils", version = "0.0.0" } 29test_utils = { path = "../test_utils", version = "0.0.0" }
30assists = { path = "../assists", version = "0.0.0" } 30ide_assists = { path = "../ide_assists", version = "0.0.0" }
31ssr = { path = "../ssr", version = "0.0.0" } 31ide_ssr = { path = "../ide_ssr", version = "0.0.0" }
32ide_completion = { path = "../ide_completion", version = "0.0.0" } 32ide_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
diff --git a/crates/ide/src/fn_references.rs b/crates/ide/src/fn_references.rs
index f6e5a522b..1a99a1f37 100644
--- a/crates/ide/src/fn_references.rs
+++ b/crates/ide/src/fn_references.rs
@@ -1,8 +1,8 @@
1//! This module implements a methods and free functions search in the specified file. 1//! This module implements a methods and free functions search in the specified file.
2//! We have to skip tests, so cannot reuse file_structure module. 2//! We have to skip tests, so cannot reuse file_structure module.
3 3
4use assists::utils::test_related_attribute;
5use hir::Semantics; 4use hir::Semantics;
5use ide_assists::utils::test_related_attribute;
6use ide_db::RootDatabase; 6use ide_db::RootDatabase;
7use syntax::{ast, ast::NameOwner, AstNode, SyntaxNode}; 7use syntax::{ast, ast::NameOwner, AstNode, SyntaxNode};
8 8
diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs
index e3f3985d1..2c077ed1f 100644
--- a/crates/ide/src/join_lines.rs
+++ b/crates/ide/src/join_lines.rs
@@ -1,4 +1,4 @@
1use assists::utils::extract_trivial_expression; 1use ide_assists::utils::extract_trivial_expression;
2use itertools::Itertools; 2use itertools::Itertools;
3use syntax::{ 3use syntax::{
4 algo::non_trivia_sibling, 4 algo::non_trivia_sibling,
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};
85pub use assists::{Assist, AssistConfig, AssistId, AssistKind};
86pub use hir::{Documentation, Semantics}; 85pub use hir::{Documentation, Semantics};
86pub use ide_assists::{Assist, AssistConfig, AssistId, AssistKind};
87pub use ide_completion::{ 87pub 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};
104pub use ssr::SsrError; 104pub use ide_ssr::SsrError;
105pub use syntax::{TextRange, TextSize}; 105pub use syntax::{TextRange, TextSize};
106pub use text_edit::{Indel, TextEdit}; 106pub 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))
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index 33170906d..1e7baed20 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -1,8 +1,8 @@
1use std::fmt; 1use std::fmt;
2 2
3use assists::utils::test_related_attribute;
4use cfg::CfgExpr; 3use cfg::CfgExpr;
5use hir::{AsAssocItem, HasAttrs, HasSource, Semantics}; 4use hir::{AsAssocItem, HasAttrs, HasSource, Semantics};
5use ide_assists::utils::test_related_attribute;
6use ide_db::{defs::Definition, RootDatabase, SymbolKind}; 6use ide_db::{defs::Definition, RootDatabase, SymbolKind};
7use itertools::Itertools; 7use itertools::Itertools;
8use syntax::{ 8use syntax::{