diff options
Diffstat (limited to 'crates/ra_assists/src/handlers/fix_visibility.rs')
| -rw-r--r-- | crates/ra_assists/src/handlers/fix_visibility.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crates/ra_assists/src/handlers/fix_visibility.rs b/crates/ra_assists/src/handlers/fix_visibility.rs index 19d4dac5e..c0f57c329 100644 --- a/crates/ra_assists/src/handlers/fix_visibility.rs +++ b/crates/ra_assists/src/handlers/fix_visibility.rs | |||
| @@ -41,14 +41,14 @@ fn add_vis_to_referenced_module_def(acc: &mut Assists, ctx: &AssistContext) -> O | |||
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | let current_module = ctx.sema.scope(&path.syntax()).module()?; | 43 | let current_module = ctx.sema.scope(&path.syntax()).module()?; |
| 44 | let target_module = def.module(ctx.db)?; | 44 | let target_module = def.module(ctx.db())?; |
| 45 | 45 | ||
| 46 | let vis = target_module.visibility_of(ctx.db, &def)?; | 46 | let vis = target_module.visibility_of(ctx.db(), &def)?; |
| 47 | if vis.is_visible_from(ctx.db, current_module.into()) { | 47 | if vis.is_visible_from(ctx.db(), current_module.into()) { |
| 48 | return None; | 48 | return None; |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 51 | let (offset, target, target_file, target_name) = target_data_for_def(ctx.db, def)?; | 51 | let (offset, target, target_file, target_name) = target_data_for_def(ctx.db(), def)?; |
| 52 | 52 | ||
| 53 | let missing_visibility = | 53 | let missing_visibility = |
| 54 | if current_module.krate() == target_module.krate() { "pub(crate)" } else { "pub" }; | 54 | if current_module.krate() == target_module.krate() { "pub(crate)" } else { "pub" }; |
| @@ -72,16 +72,16 @@ fn add_vis_to_referenced_record_field(acc: &mut Assists, ctx: &AssistContext) -> | |||
| 72 | let (record_field_def, _) = ctx.sema.resolve_record_field(&record_field)?; | 72 | let (record_field_def, _) = ctx.sema.resolve_record_field(&record_field)?; |
| 73 | 73 | ||
| 74 | let current_module = ctx.sema.scope(record_field.syntax()).module()?; | 74 | let current_module = ctx.sema.scope(record_field.syntax()).module()?; |
| 75 | let visibility = record_field_def.visibility(ctx.db); | 75 | let visibility = record_field_def.visibility(ctx.db()); |
| 76 | if visibility.is_visible_from(ctx.db, current_module.into()) { | 76 | if visibility.is_visible_from(ctx.db(), current_module.into()) { |
| 77 | return None; | 77 | return None; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | let parent = record_field_def.parent_def(ctx.db); | 80 | let parent = record_field_def.parent_def(ctx.db()); |
| 81 | let parent_name = parent.name(ctx.db); | 81 | let parent_name = parent.name(ctx.db()); |
| 82 | let target_module = parent.module(ctx.db); | 82 | let target_module = parent.module(ctx.db()); |
| 83 | 83 | ||
| 84 | let in_file_source = record_field_def.source(ctx.db); | 84 | let in_file_source = record_field_def.source(ctx.db()); |
| 85 | let (offset, target) = match in_file_source.value { | 85 | let (offset, target) = match in_file_source.value { |
| 86 | hir::FieldSource::Named(it) => { | 86 | hir::FieldSource::Named(it) => { |
| 87 | let s = it.syntax(); | 87 | let s = it.syntax(); |
| @@ -95,9 +95,9 @@ fn add_vis_to_referenced_record_field(acc: &mut Assists, ctx: &AssistContext) -> | |||
| 95 | 95 | ||
| 96 | let missing_visibility = | 96 | let missing_visibility = |
| 97 | if current_module.krate() == target_module.krate() { "pub(crate)" } else { "pub" }; | 97 | if current_module.krate() == target_module.krate() { "pub(crate)" } else { "pub" }; |
| 98 | let target_file = in_file_source.file_id.original_file(ctx.db); | 98 | let target_file = in_file_source.file_id.original_file(ctx.db()); |
| 99 | 99 | ||
| 100 | let target_name = record_field_def.name(ctx.db); | 100 | let target_name = record_field_def.name(ctx.db()); |
| 101 | let assist_label = | 101 | let assist_label = |
| 102 | format!("Change visibility of {}.{} to {}", parent_name, target_name, missing_visibility); | 102 | format!("Change visibility of {}.{} to {}", parent_name, target_name, missing_visibility); |
| 103 | 103 | ||