diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-03 12:22:17 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-03 12:22:17 +0000 |
commit | aea2183799e7975d3d9000cec9bb9a3c001a3d4e (patch) | |
tree | f57f648b33797c8482735da800808f9709467ccf /crates/ra_analysis/src | |
parent | d7ca7b8aacc931fe2efe6cbfefc73d30e80289a2 (diff) | |
parent | a5935687cbc62e893753ec81a00655281b03feae (diff) |
Merge #413
413: add visibility owner, refactor assists r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src')
-rw-r--r-- | crates/ra_analysis/src/imp.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index b812c3441..136e7f7dc 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::change_visibility(&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() |