From 5323e599964005bc58cf89c27201973bc1ff51dd Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 3 Jan 2019 14:14:17 +0300
Subject: [PATCH] rename code-actions -> assists

---
 crates/ra_analysis/src/imp.rs                        | 12 ++++++------
 crates/ra_editor/src/{code_actions.rs => assists.rs} |  0
 crates/ra_editor/src/lib.rs                          |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename crates/ra_editor/src/{code_actions.rs => assists.rs} (100%)

diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index b812c344102..5c220d7c7b0 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -6,7 +6,7 @@ use hir::{
     self, FnSignatureInfo, Problem, source_binder,
 };
 use ra_db::{FilesDatabase, SourceRoot, SourceRootId, SyntaxDatabase};
-use ra_editor::{self, find_node_at_offset, LocalEdit, Severity};
+use ra_editor::{self, find_node_at_offset, assists, LocalEdit, Severity};
 use ra_syntax::{
     algo::{find_covering_node, visit::{visitor, Visitor}},
     ast::{self, ArgListOwner, Expr, FnDef, NameOwner},
@@ -335,11 +335,11 @@ impl db::RootDatabase {
         let file = self.source_file(frange.file_id);
         let offset = frange.range.start();
         let actions = vec![
-            ra_editor::flip_comma(&file, offset).map(|f| f()),
-            ra_editor::add_derive(&file, offset).map(|f| f()),
-            ra_editor::add_impl(&file, offset).map(|f| f()),
-            ra_editor::make_pub_crate(&file, offset).map(|f| f()),
-            ra_editor::introduce_variable(&file, frange.range).map(|f| f()),
+            assists::flip_comma(&file, offset).map(|f| f()),
+            assists::add_derive(&file, offset).map(|f| f()),
+            assists::add_impl(&file, offset).map(|f| f()),
+            assists::make_pub_crate(&file, offset).map(|f| f()),
+            assists::introduce_variable(&file, frange.range).map(|f| f()),
         ];
         actions
             .into_iter()
diff --git a/crates/ra_editor/src/code_actions.rs b/crates/ra_editor/src/assists.rs
similarity index 100%
rename from crates/ra_editor/src/code_actions.rs
rename to crates/ra_editor/src/assists.rs
diff --git a/crates/ra_editor/src/lib.rs b/crates/ra_editor/src/lib.rs
index bfc745e58c3..46d521e4b13 100644
--- a/crates/ra_editor/src/lib.rs
+++ b/crates/ra_editor/src/lib.rs
@@ -1,4 +1,4 @@
-mod code_actions;
+pub mod assists;
 mod extend_selection;
 mod folding_ranges;
 mod line_index;
@@ -10,7 +10,7 @@ mod typing;
 mod diagnostics;
 
 pub use self::{
-    code_actions::{add_derive, add_impl, flip_comma, introduce_variable, make_pub_crate, LocalEdit},
+    assists::LocalEdit,
     extend_selection::extend_selection,
     folding_ranges::{folding_ranges, Fold, FoldKind},
     line_index::{LineCol, LineIndex},