squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #746

Browse source 
746: Rename assits to assists r=kjeremy a=kjeremy



Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
This commit is contained in:
bors[bot] 2019-02-05 13:21:42 +00:00
commit 569e1e871e
6 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
crates/ra_ide_api/src/assits.rs → crates/ra_ide_api/src/assists.rs
View file

6
crates/ra_ide_api/src/assits/fill_match_arm.rs → crates/ra_ide_api/src/assists/fill_match_arm.rs
View file

@ -18,7 +18,7 @@ use ra_syntax::{
} }
}; };
use crate::assits::AssistCtx; use crate::assists::AssistCtx;
pub fn fill_match_arm(ctx: AssistCtx) -> Option<Assist> { pub fn fill_match_arm(ctx: AssistCtx) -> Option<Assist> {
let match_expr = ctx.node_at_offset::<ast::MatchExpr>()?; let match_expr = ctx.node_at_offset::<ast::MatchExpr>()?;
@ -110,8 +110,8 @@ mod tests {
.with_db(|db| db.parse(frange.file_id)) .with_db(|db| db.parse(frange.file_id))
.expect("source file"); .expect("source file");
let ret = analysis let ret = analysis
.with_db(|db| crate::assits::assists(db, frange.file_id, &source_file, frange.range)) .with_db(|db| crate::assists::assists(db, frange.file_id, &source_file, frange.range))
.expect("assits"); .expect("assists");
assert_debug_snapshot_matches!(name, ret); assert_debug_snapshot_matches!(name, ret);
} }

0
crates/ra_ide_api/src/assits/snapshots/tests__fill_match_arm1.snap → crates/ra_ide_api/src/assists/snapshots/tests__fill_match_arm1.snap
View file

0
crates/ra_ide_api/src/assits/snapshots/tests__fill_match_arm2.snap → crates/ra_ide_api/src/assists/snapshots/tests__fill_match_arm2.snap
View file

2
crates/ra_ide_api/src/imp.rs
View file

@ -240,7 +240,7 @@ impl db::RootDatabase {
let file = self.parse(frange.file_id); let file = self.parse(frange.file_id);
ra_ide_api_light::assists::assists(&file, frange.range) ra_ide_api_light::assists::assists(&file, frange.range)
.into_iter() .into_iter()
.chain(crate::assits::assists(self, frange.file_id, &file, frange.range).into_iter()) .chain(crate::assists::assists(self, frange.file_id, &file, frange.range).into_iter())
.map(|local_edit| SourceChange::from_local_edit(frange.file_id, local_edit)) .map(|local_edit| SourceChange::from_local_edit(frange.file_id, local_edit))
.collect() .collect()
} }

2
crates/ra_ide_api/src/lib.rs
View file

@ -30,7 +30,7 @@ mod syntax_highlighting;
mod parent_module; mod parent_module;
mod rename; mod rename;
mod impls; mod impls;
mod assits; mod assists;
#[cfg(test)] #[cfg(test)]
mod marks; mod marks;