user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better naming and fix some review comments

Browse source
This commit is contained in:
Mikhail Rakhmanov 2020-05-23 01:23:40 +02:00
parent ef1aaeb595
commit fce10200a0
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/ra_assists/src/assist_context.rs
View file

@ -292,13 +292,12 @@ impl AssistBuilder {
}
pub(crate) struct AssistDirector {
source_changes: Vec<SourceChange>,
builders: FxHashMap<FileId, AssistBuilder>,
}
impl AssistDirector {
fn new() -> AssistDirector {
AssistDirector { source_changes: vec![], builders: FxHashMap::default() }
AssistDirector { builders: FxHashMap::default() }
}
pub(crate) fn perform(&mut self, file_id: FileId, f: impl FnOnce(&mut AssistBuilder)) {
@ -306,10 +305,10 @@ impl AssistDirector {
f(&mut builder);
}
fn finish(mut self) -> Vec<SourceChange> {
for (_, builder) in self.builders.into_iter().collect::<Vec<(FileId, AssistBuilder)>>() {
self.source_changes.push(builder.finish());
}
self.source_changes
fn finish(self) -> Vec<SourceChange> {
self.builders
.into_iter()
.map(|(_, builder)| builder.finish())
.collect::<Vec<SourceChange>>()
}
}

16
crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
View file

@ -59,8 +59,8 @@ pub(crate) fn extract_struct_from_enum(acc: &mut Assists, ctx: &AssistContext) -
let res = definition.find_usages(&ctx.db, None);
let module_def = mod_def_for_target_module(ctx, &enum_name);
let start_offset = variant.parent_enum().syntax().text_range().start();
let mut seen_files_map: FxHashSet<Module> = FxHashSet::default();
seen_files_map.insert(module_def.module(ctx.db).unwrap());
let mut visited_modules_set: FxHashSet<Module> = FxHashSet::default();
visited_modules_set.insert(module_def.module(ctx.db).unwrap());
for reference in res {
let source_file = ctx.sema.parse(reference.file_range.file_id);
update_reference(
@ -69,7 +69,7 @@ pub(crate) fn extract_struct_from_enum(acc: &mut Assists, ctx: &AssistContext) -
reference,
&source_file,
&module_def,
&mut seen_files_map,
&mut visited_modules_set,
);
}
extract_struct_def(
@ -101,7 +101,7 @@ fn mod_def_for_target_module(ctx: &AssistContext, enum_name: &str) -> ModuleDef
ImportsLocator::new(ctx.db).find_imports(enum_name).first().unwrap().left().unwrap()
}
fn insert_use_import(
fn insert_import(
ctx: &AssistContext,
builder: &mut AssistBuilder,
path: &ast::PathExpr,
@ -179,7 +179,7 @@ fn update_reference(
reference: Reference,
source_file: &SourceFile,
module_def: &ModuleDef,
seen_files_map: &mut FxHashSet<Module>,
visited_modules_set: &mut FxHashSet<Module>,
) -> Option<()> {
let path_expr: ast::PathExpr = find_node_at_offset::<ast::PathExpr>(
source_file.syntax(),
@ -195,8 +195,8 @@ fn update_reference(
);
edit.perform(reference.file_range.file_id, |builder| {
let module = ctx.sema.scope(&path_expr.syntax()).module().unwrap();
if !seen_files_map.contains(&module) {
if insert_use_import(
if !visited_modules_set.contains(&module) {
if insert_import(
ctx,
builder,
&path_expr,
@ -206,7 +206,7 @@ fn update_reference(
)
.is_some()
{
seen_files_map.insert(module);
visited_modules_set.insert(module);
}
}
builder.replace(inside_list_range, format!("{}{}", segment, list));