diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_analysis/src/imp.rs | 12 | ||||
-rw-r--r-- | crates/ra_editor/src/assists.rs (renamed from crates/ra_editor/src/code_actions.rs) | 0 | ||||
-rw-r--r-- | crates/ra_editor/src/lib.rs | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index b812c3441..5c220d7c7 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs | |||
@@ -6,7 +6,7 @@ use hir::{ | |||
6 | self, FnSignatureInfo, Problem, source_binder, | 6 | self, FnSignatureInfo, Problem, source_binder, |
7 | }; | 7 | }; |
8 | use ra_db::{FilesDatabase, SourceRoot, SourceRootId, SyntaxDatabase}; | 8 | use ra_db::{FilesDatabase, SourceRoot, SourceRootId, SyntaxDatabase}; |
9 | use ra_editor::{self, find_node_at_offset, LocalEdit, Severity}; | 9 | use ra_editor::{self, find_node_at_offset, assists, LocalEdit, Severity}; |
10 | use ra_syntax::{ | 10 | use ra_syntax::{ |
11 | algo::{find_covering_node, visit::{visitor, Visitor}}, | 11 | algo::{find_covering_node, visit::{visitor, Visitor}}, |
12 | ast::{self, ArgListOwner, Expr, FnDef, NameOwner}, | 12 | ast::{self, ArgListOwner, Expr, FnDef, NameOwner}, |
@@ -335,11 +335,11 @@ impl db::RootDatabase { | |||
335 | let file = self.source_file(frange.file_id); | 335 | let file = self.source_file(frange.file_id); |
336 | let offset = frange.range.start(); | 336 | let offset = frange.range.start(); |
337 | let actions = vec![ | 337 | let actions = vec![ |
338 | ra_editor::flip_comma(&file, offset).map(|f| f()), | 338 | assists::flip_comma(&file, offset).map(|f| f()), |
339 | ra_editor::add_derive(&file, offset).map(|f| f()), | 339 | assists::add_derive(&file, offset).map(|f| f()), |
340 | ra_editor::add_impl(&file, offset).map(|f| f()), | 340 | assists::add_impl(&file, offset).map(|f| f()), |
341 | ra_editor::make_pub_crate(&file, offset).map(|f| f()), | 341 | assists::make_pub_crate(&file, offset).map(|f| f()), |
342 | ra_editor::introduce_variable(&file, frange.range).map(|f| f()), | 342 | assists::introduce_variable(&file, frange.range).map(|f| f()), |
343 | ]; | 343 | ]; |
344 | actions | 344 | actions |
345 | .into_iter() | 345 | .into_iter() |
diff --git a/crates/ra_editor/src/code_actions.rs b/crates/ra_editor/src/assists.rs index 7615f37a6..7615f37a6 100644 --- a/crates/ra_editor/src/code_actions.rs +++ b/crates/ra_editor/src/assists.rs | |||
diff --git a/crates/ra_editor/src/lib.rs b/crates/ra_editor/src/lib.rs index bfc745e58..46d521e4b 100644 --- a/crates/ra_editor/src/lib.rs +++ b/crates/ra_editor/src/lib.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | mod code_actions; | 1 | pub mod assists; |
2 | mod extend_selection; | 2 | mod extend_selection; |
3 | mod folding_ranges; | 3 | mod folding_ranges; |
4 | mod line_index; | 4 | mod line_index; |
@@ -10,7 +10,7 @@ mod typing; | |||
10 | mod diagnostics; | 10 | mod diagnostics; |
11 | 11 | ||
12 | pub use self::{ | 12 | pub use self::{ |
13 | code_actions::{add_derive, add_impl, flip_comma, introduce_variable, make_pub_crate, LocalEdit}, | 13 | assists::LocalEdit, |
14 | extend_selection::extend_selection, | 14 | extend_selection::extend_selection, |
15 | folding_ranges::{folding_ranges, Fold, FoldKind}, | 15 | folding_ranges::{folding_ranges, Fold, FoldKind}, |
16 | line_index::{LineCol, LineIndex}, | 16 | line_index::{LineCol, LineIndex}, |