aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorJeremy Kolb <[email protected]>2019-02-05 13:13:16 +0000
committerJeremy Kolb <[email protected]>2019-02-05 13:13:16 +0000
commite696342afad79b0aa7638a8c51ef3ce45489ed21 (patch)
tree6f50440df7778581e7a16e6634ffa24e177efc8e /crates
parent41838254750fac3822bfe43b04158977e5355e42 (diff)
Rename assits to assists
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_ide_api/src/assists.rs (renamed from crates/ra_ide_api/src/assits.rs)0
-rw-r--r--crates/ra_ide_api/src/assists/fill_match_arm.rs (renamed from crates/ra_ide_api/src/assits/fill_match_arm.rs)6
-rw-r--r--crates/ra_ide_api/src/assists/snapshots/tests__fill_match_arm1.snap (renamed from crates/ra_ide_api/src/assits/snapshots/tests__fill_match_arm1.snap)0
-rw-r--r--crates/ra_ide_api/src/assists/snapshots/tests__fill_match_arm2.snap (renamed from crates/ra_ide_api/src/assits/snapshots/tests__fill_match_arm2.snap)0
-rw-r--r--crates/ra_ide_api/src/imp.rs2
-rw-r--r--crates/ra_ide_api/src/lib.rs2
6 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_ide_api/src/assits.rs b/crates/ra_ide_api/src/assists.rs
index 2da251df5..2da251df5 100644
--- a/crates/ra_ide_api/src/assits.rs
+++ b/crates/ra_ide_api/src/assists.rs
diff --git a/crates/ra_ide_api/src/assits/fill_match_arm.rs b/crates/ra_ide_api/src/assists/fill_match_arm.rs
index d433861a0..6ae829d85 100644
--- a/crates/ra_ide_api/src/assits/fill_match_arm.rs
+++ b/crates/ra_ide_api/src/assists/fill_match_arm.rs
@@ -18,7 +18,7 @@ use ra_syntax::{
18 } 18 }
19}; 19};
20 20
21use crate::assits::AssistCtx; 21use crate::assists::AssistCtx;
22 22
23pub fn fill_match_arm(ctx: AssistCtx) -> Option<Assist> { 23pub fn fill_match_arm(ctx: AssistCtx) -> Option<Assist> {
24 let match_expr = ctx.node_at_offset::<ast::MatchExpr>()?; 24 let match_expr = ctx.node_at_offset::<ast::MatchExpr>()?;
@@ -110,8 +110,8 @@ mod tests {
110 .with_db(|db| db.parse(frange.file_id)) 110 .with_db(|db| db.parse(frange.file_id))
111 .expect("source file"); 111 .expect("source file");
112 let ret = analysis 112 let ret = analysis
113 .with_db(|db| crate::assits::assists(db, frange.file_id, &source_file, frange.range)) 113 .with_db(|db| crate::assists::assists(db, frange.file_id, &source_file, frange.range))
114 .expect("assits"); 114 .expect("assists");
115 115
116 assert_debug_snapshot_matches!(name, ret); 116 assert_debug_snapshot_matches!(name, ret);
117 } 117 }
diff --git a/crates/ra_ide_api/src/assits/snapshots/tests__fill_match_arm1.snap b/crates/ra_ide_api/src/assists/snapshots/tests__fill_match_arm1.snap
index 980726d92..980726d92 100644
--- a/crates/ra_ide_api/src/assits/snapshots/tests__fill_match_arm1.snap
+++ b/crates/ra_ide_api/src/assists/snapshots/tests__fill_match_arm1.snap
diff --git a/crates/ra_ide_api/src/assits/snapshots/tests__fill_match_arm2.snap b/crates/ra_ide_api/src/assists/snapshots/tests__fill_match_arm2.snap
index cee0efe74..cee0efe74 100644
--- a/crates/ra_ide_api/src/assits/snapshots/tests__fill_match_arm2.snap
+++ b/crates/ra_ide_api/src/assists/snapshots/tests__fill_match_arm2.snap
diff --git a/crates/ra_ide_api/src/imp.rs b/crates/ra_ide_api/src/imp.rs
index 5f672367c..fd8637ad2 100644
--- a/crates/ra_ide_api/src/imp.rs
+++ b/crates/ra_ide_api/src/imp.rs
@@ -240,7 +240,7 @@ impl db::RootDatabase {
240 let file = self.parse(frange.file_id); 240 let file = self.parse(frange.file_id);
241 ra_ide_api_light::assists::assists(&file, frange.range) 241 ra_ide_api_light::assists::assists(&file, frange.range)
242 .into_iter() 242 .into_iter()
243 .chain(crate::assits::assists(self, frange.file_id, &file, frange.range).into_iter()) 243 .chain(crate::assists::assists(self, frange.file_id, &file, frange.range).into_iter())
244 .map(|local_edit| SourceChange::from_local_edit(frange.file_id, local_edit)) 244 .map(|local_edit| SourceChange::from_local_edit(frange.file_id, local_edit))
245 .collect() 245 .collect()
246 } 246 }
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 65941a5ca..3a187d7a5 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -30,7 +30,7 @@ mod syntax_highlighting;
30mod parent_module; 30mod parent_module;
31mod rename; 31mod rename;
32mod impls; 32mod impls;
33mod assits; 33mod assists;
34 34
35#[cfg(test)] 35#[cfg(test)]
36mod marks; 36mod marks;