aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_assists/src/assists/change_visibility.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_assists/src/assists/change_visibility.rs')
-rw-r--r--crates/ra_assists/src/assists/change_visibility.rs18
1 files changed, 11 insertions, 7 deletions
diff --git a/crates/ra_assists/src/assists/change_visibility.rs b/crates/ra_assists/src/assists/change_visibility.rs
index 132c9dc1d..fd766bb46 100644
--- a/crates/ra_assists/src/assists/change_visibility.rs
+++ b/crates/ra_assists/src/assists/change_visibility.rs
@@ -57,7 +57,7 @@ fn add_vis(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
57 (vis_offset(field.syntax()), ident.text_range()) 57 (vis_offset(field.syntax()), ident.text_range())
58 }; 58 };
59 59
60 ctx.add_assist(AssistId("change_visibility"), "make pub(crate)", |edit| { 60 ctx.add_assist(AssistId("change_visibility"), "Change visibility to pub(crate)", |edit| {
61 edit.target(target); 61 edit.target(target);
62 edit.insert(offset, "pub(crate) "); 62 edit.insert(offset, "pub(crate) ");
63 edit.set_cursor(offset); 63 edit.set_cursor(offset);
@@ -77,14 +77,18 @@ fn vis_offset(node: &SyntaxNode) -> TextUnit {
77 77
78fn change_vis(ctx: AssistCtx<impl HirDatabase>, vis: ast::Visibility) -> Option<Assist> { 78fn change_vis(ctx: AssistCtx<impl HirDatabase>, vis: ast::Visibility) -> Option<Assist> {
79 if vis.syntax().text() == "pub" { 79 if vis.syntax().text() == "pub" {
80 return ctx.add_assist(AssistId("change_visibility"), "change to pub(crate)", |edit| { 80 return ctx.add_assist(
81 edit.target(vis.syntax().text_range()); 81 AssistId("change_visibility"),
82 edit.replace(vis.syntax().text_range(), "pub(crate)"); 82 "Change Visibility to pub(crate)",
83 edit.set_cursor(vis.syntax().text_range().start()) 83 |edit| {
84 }); 84 edit.target(vis.syntax().text_range());
85 edit.replace(vis.syntax().text_range(), "pub(crate)");
86 edit.set_cursor(vis.syntax().text_range().start())
87 },
88 );
85 } 89 }
86 if vis.syntax().text() == "pub(crate)" { 90 if vis.syntax().text() == "pub(crate)" {
87 return ctx.add_assist(AssistId("change_visibility"), "change to pub", |edit| { 91 return ctx.add_assist(AssistId("change_visibility"), "Change visibility to pub", |edit| {
88 edit.target(vis.syntax().text_range()); 92 edit.target(vis.syntax().text_range());
89 edit.replace(vis.syntax().text_range(), "pub"); 93 edit.replace(vis.syntax().text_range(), "pub");
90 edit.set_cursor(vis.syntax().text_range().start()); 94 edit.set_cursor(vis.syntax().text_range().start());