]> git.lizzy.rs Git - rust.git/commitdiff
More UI friendly labels
authorJeremy Kolb <kjeremy@gmail.com>
Tue, 14 Jan 2020 16:49:14 +0000 (11:49 -0500)
committerJeremy Kolb <kjeremy@gmail.com>
Tue, 14 Jan 2020 16:49:14 +0000 (11:49 -0500)
23 files changed:
crates/ra_assists/src/assists/add_derive.rs
crates/ra_assists/src/assists/add_explicit_type.rs
crates/ra_assists/src/assists/add_impl.rs
crates/ra_assists/src/assists/add_import.rs
crates/ra_assists/src/assists/add_missing_impl_members.rs
crates/ra_assists/src/assists/add_new.rs
crates/ra_assists/src/assists/apply_demorgan.rs
crates/ra_assists/src/assists/change_visibility.rs
crates/ra_assists/src/assists/early_return.rs
crates/ra_assists/src/assists/fill_match_arms.rs
crates/ra_assists/src/assists/flip_binexpr.rs
crates/ra_assists/src/assists/flip_comma.rs
crates/ra_assists/src/assists/flip_trait_bound.rs
crates/ra_assists/src/assists/inline_local_variable.rs
crates/ra_assists/src/assists/introduce_variable.rs
crates/ra_assists/src/assists/invert_if.rs
crates/ra_assists/src/assists/merge_match_arms.rs
crates/ra_assists/src/assists/move_bounds.rs
crates/ra_assists/src/assists/move_guard.rs
crates/ra_assists/src/assists/raw_string.rs
crates/ra_assists/src/assists/remove_dbg.rs
crates/ra_assists/src/assists/replace_if_let_with_match.rs
crates/ra_assists/src/assists/split_import.rs

index 764b17bd8dc48c886c5a7161df9f250678806db1..6d9af390551f504d9afcb7b8cc14b8602243a6a1 100644 (file)
@@ -28,7 +28,7 @@
 pub(crate) fn add_derive(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
     let nominal = ctx.find_node_at_offset::<ast::NominalDef>()?;
     let node_start = derive_insertion_offset(&nominal)?;
-    ctx.add_assist(AssistId("add_derive"), "add `#[derive]`", |edit| {
+    ctx.add_assist(AssistId("add_derive"), "Add `#[derive]`", |edit| {
         let derive_attr = nominal
             .attrs()
             .filter_map(|x| x.as_simple_call())
index 2c602a79eee211dd6d306316ae756fad5a1d407c..b63ca50d0fddd1807080bbf5664092c18c883226 100644 (file)
@@ -47,10 +47,14 @@ pub(crate) fn add_explicit_type(ctx: AssistCtx<impl HirDatabase>) -> Option<Assi
         return None;
     }
 
-    ctx.add_assist(AssistId("add_explicit_type"), "add explicit type", |edit| {
-        edit.target(pat_range);
-        edit.insert(name_range.end(), format!(": {}", ty.display(db)));
-    })
+    ctx.add_assist(
+        AssistId("add_explicit_type"),
+        format!("Insert Explicit Type '{}'", ty.display(db)),
+        |edit| {
+            edit.target(pat_range);
+            edit.insert(name_range.end(), format!(": {}", ty.display(db)));
+        },
+    )
 }
 
 #[cfg(test)]
index 7da0cfd0d3261d9f8400801557af19d454d11961..4b326c83738bbe04e3151b231d4c95cf9a8ddf53 100644 (file)
@@ -30,7 +30,7 @@
 pub(crate) fn add_impl(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
     let nominal = ctx.find_node_at_offset::<ast::NominalDef>()?;
     let name = nominal.name()?;
-    ctx.add_assist(AssistId("add_impl"), "add impl", |edit| {
+    ctx.add_assist(AssistId("add_impl"), format!("Implement {}", name.text().as_str()), |edit| {
         edit.target(nominal.syntax().text_range());
         let type_params = nominal.type_param_list();
         let start_offset = nominal.syntax().text_range().end();
index b8752cbad52aea70267acf22dd0e79a7f257aec9..bf6cfe865adad02bb6cd3a36c7d595c5495a0f2c 100644 (file)
@@ -72,7 +72,7 @@ pub(crate) fn add_import(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
         }
     };
 
-    ctx.add_assist(AssistId("add_import"), format!("import {}", fmt_segments(&segments)), |edit| {
+    ctx.add_assist(AssistId("add_import"), format!("Import {}", fmt_segments(&segments)), |edit| {
         apply_auto_import(&position, &path, &segments, edit.text_edit_builder());
     })
 }
index bf1136193d376fde8a4e34172d497e639393c0b7..89a1d58b83fbca140f459d1473fc2551eece982d 100644 (file)
@@ -48,7 +48,7 @@ pub(crate) fn add_missing_impl_members(ctx: AssistCtx<impl HirDatabase>) -> Opti
         ctx,
         AddMissingImplMembersMode::NoDefaultMethods,
         "add_impl_missing_members",
-        "add missing impl members",
+        "Implement Missing Members",
     )
 }
 
@@ -89,7 +89,7 @@ pub(crate) fn add_missing_default_members(ctx: AssistCtx<impl HirDatabase>) -> O
         ctx,
         AddMissingImplMembersMode::DefaultMethodsOnly,
         "add_impl_default_members",
-        "add impl default members",
+        "Implement Default Members",
     )
 }
 
index b2f946fac36b144413f2ddc9954f3c9cce08ed8e..9102c2325228436e3c35ceed3d14e0a260db9ac9 100644 (file)
@@ -43,7 +43,7 @@ pub(crate) fn add_new(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
     // Return early if we've found an existing new fn
     let impl_block = find_struct_impl(&ctx, &strukt)?;
 
-    ctx.add_assist(AssistId("add_new"), "add new fn", |edit| {
+    ctx.add_assist(AssistId("add_new"), "Add Default Constructor", |edit| {
         edit.target(strukt.syntax().text_range());
 
         let mut buf = String::with_capacity(512);
index 7c57c0560dfc6d62ada217f6e2d50bd28065ce32..95585d8312ff2df9bcff80e5933609cac3824c58 100644 (file)
@@ -39,7 +39,7 @@ pub(crate) fn apply_demorgan(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist>
     let not_lhs = invert_boolean_expression(&lhs)?;
     let not_rhs = invert_boolean_expression(&rhs)?;
 
-    ctx.add_assist(AssistId("apply_demorgan"), "apply demorgan's law", |edit| {
+    ctx.add_assist(AssistId("apply_demorgan"), "Apply Demorgan's Law", |edit| {
         edit.target(op_range);
         edit.replace(op_range, opposite_op);
         edit.replace(lhs_range, format!("!({}", not_lhs.syntax().text()));
index 132c9dc1d750e243c560003baff8a81ce6e3e9aa..a5127704055923e5a591a1a6fbf6cdd88b4af697 100644 (file)
@@ -57,7 +57,7 @@ fn add_vis(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
         (vis_offset(field.syntax()), ident.text_range())
     };
 
-    ctx.add_assist(AssistId("change_visibility"), "make pub(crate)", |edit| {
+    ctx.add_assist(AssistId("change_visibility"), "Change Visibility to pub(crate)", |edit| {
         edit.target(target);
         edit.insert(offset, "pub(crate) ");
         edit.set_cursor(offset);
@@ -77,14 +77,18 @@ fn vis_offset(node: &SyntaxNode) -> TextUnit {
 
 fn change_vis(ctx: AssistCtx<impl HirDatabase>, vis: ast::Visibility) -> Option<Assist> {
     if vis.syntax().text() == "pub" {
-        return ctx.add_assist(AssistId("change_visibility"), "change to pub(crate)", |edit| {
-            edit.target(vis.syntax().text_range());
-            edit.replace(vis.syntax().text_range(), "pub(crate)");
-            edit.set_cursor(vis.syntax().text_range().start())
-        });
+        return ctx.add_assist(
+            AssistId("change_visibility"),
+            "Change Visibility to pub(crate)",
+            |edit| {
+                edit.target(vis.syntax().text_range());
+                edit.replace(vis.syntax().text_range(), "pub(crate)");
+                edit.set_cursor(vis.syntax().text_range().start())
+            },
+        );
     }
     if vis.syntax().text() == "pub(crate)" {
-        return ctx.add_assist(AssistId("change_visibility"), "change to pub", |edit| {
+        return ctx.add_assist(AssistId("change_visibility"), "Change Visibility to pub", |edit| {
             edit.target(vis.syntax().text_range());
             edit.replace(vis.syntax().text_range(), "pub");
             edit.set_cursor(vis.syntax().text_range().start());
index 023917aca7b1d717e3ad94d49624a54d5f7e2972..6b6319959fde4df597df1897496713e0332735bd 100644 (file)
@@ -95,7 +95,7 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx<impl HirDatabase>) -> Opt
     then_block.syntax().last_child_or_token().filter(|t| t.kind() == R_CURLY)?;
     let cursor_position = ctx.frange.range.start();
 
-    ctx.add_assist(AssistId("convert_to_guarded_return"), "convert to guarded return", |edit| {
+    ctx.add_assist(AssistId("convert_to_guarded_return"), "Convert to Guarded Return", |edit| {
         let if_indent_level = IndentLevel::from_node(&if_expr.syntax());
         let new_block = match if_let_pat {
             None => {
index 99d80998c20c1c34f4f6fafe3448f8a42ea58926..90ddfc3d0b38fa297c95790d058f0fdf9abe1a27 100644 (file)
@@ -57,7 +57,7 @@ pub(crate) fn fill_match_arms(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist
 
     let db = ctx.db;
 
-    ctx.add_assist(AssistId("fill_match_arms"), "fill match arms", |edit| {
+    ctx.add_assist(AssistId("fill_match_arms"), "Fill Match Arms", |edit| {
         let indent_level = IndentLevel::from_node(match_arm_list.syntax());
 
         let new_arm_list = {
index 2d91b2a7e58df3e23a50cf9bf60bdd432ef5f74c..808248d884a051fc9db5903a028c86119f88d7f4 100644 (file)
@@ -34,7 +34,7 @@ pub(crate) fn flip_binexpr(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
         return None;
     }
 
-    ctx.add_assist(AssistId("flip_binexpr"), "flip binary expression", |edit| {
+    ctx.add_assist(AssistId("flip_binexpr"), "Flip Binary Expression", |edit| {
         edit.target(op_range);
         if let FlipAction::FlipAndReplaceOp(new_op) = action {
             edit.replace(op_range, new_op);
index 9be1c1dc6997b0f769c8e2e7cb3978d96d5882c5..b274681b3dda2a644fb13917da6ec8aa5d521312 100644 (file)
@@ -29,7 +29,7 @@ pub(crate) fn flip_comma(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
         return None;
     }
 
-    ctx.add_assist(AssistId("flip_comma"), "flip comma", |edit| {
+    ctx.add_assist(AssistId("flip_comma"), "Flip Comma", |edit| {
         edit.target(comma.text_range());
         edit.replace(prev.text_range(), next.to_string());
         edit.replace(next.text_range(), prev.to_string());
index 6017b39dd84b3678f7ddf656fcbb5f23b769613b..b691c9509f9477eb192b947bd852028a7cd7934d 100644 (file)
@@ -33,7 +33,7 @@ pub(crate) fn flip_trait_bound(ctx: AssistCtx<impl HirDatabase>) -> Option<Assis
         non_trivia_sibling(plus.clone().into(), Direction::Next)?,
     );
 
-    ctx.add_assist(AssistId("flip_trait_bound"), "flip trait bound", |edit| {
+    ctx.add_assist(AssistId("flip_trait_bound"), "Flip Trait Bounds", |edit| {
         edit.target(plus.text_range());
         edit.replace(before.text_range(), after.to_string());
         edit.replace(after.text_range(), before.to_string());
index 18a34502ccdd404da9204bdfe7000a1226f0cd6d..754ada70775025cfc31c661d410be5c63eb9d955 100644 (file)
@@ -93,7 +93,7 @@ pub(crate) fn inline_local_varialbe(ctx: AssistCtx<impl HirDatabase>) -> Option<
 
     ctx.add_assist(
         AssistId("inline_local_variable"),
-        "inline local variable",
+        "Inline Variable",
         move |edit: &mut AssistBuilder| {
             edit.delete(delete_range);
             for (desc, should_wrap) in refs.iter().zip(wrap_in_parens) {
index 0623d44759e5dd3d11d0fb3d04176ed93d036067..7ac79d9103a9bebdfdf2370a82fa158045a3a2e2 100644 (file)
@@ -43,7 +43,7 @@ pub(crate) fn introduce_variable(ctx: AssistCtx<impl HirDatabase>) -> Option<Ass
     if indent.kind() != WHITESPACE {
         return None;
     }
-    ctx.add_assist(AssistId("introduce_variable"), "introduce variable", move |edit| {
+    ctx.add_assist(AssistId("introduce_variable"), "Extract into Variable", move |edit| {
         let mut buf = String::new();
 
         let cursor_offset = if wrap_in_block {
index bababa3e25f38cb2e9c9f45f97a9ff043e17f40c..05bd2b037823391b053a40c9ef3f70877730e6f9 100644 (file)
@@ -41,7 +41,7 @@ pub(crate) fn invert_if(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
         let else_node = else_block.syntax();
         let else_range = else_node.text_range();
         let then_range = then_node.text_range();
-        return ctx.add_assist(AssistId("invert_if"), "invert if branches", |edit| {
+        return ctx.add_assist(AssistId("invert_if"), "Invert If", |edit| {
             edit.target(if_range);
             edit.replace(cond_range, flip_cond.syntax().text());
             edit.replace(else_range, then_node.text());
index e9f2cae91d3514fbc3de646a5f5ff9779e98c085..6406e1febe89657222b5e8255f77d61f249f855e 100644 (file)
@@ -52,7 +52,7 @@ pub(crate) fn merge_match_arms(ctx: AssistCtx<impl HirDatabase>) -> Option<Assis
 
     let cursor_to_end = current_arm.syntax().text_range().end() - ctx.frange.range.start();
 
-    ctx.add_assist(AssistId("merge_match_arms"), "merge match arms", |edit| {
+    ctx.add_assist(AssistId("merge_match_arms"), "Merge Match Arms", |edit| {
         fn contains_placeholder(a: &MatchArm) -> bool {
             a.pats().any(|x| match x {
                 ra_syntax::ast::Pat::PlaceholderPat(..) => true,
index 3145d7625de6095a0533cf92984ccbd86122bc8e..6e6c1d67d7136d01d5441780d73c68cab65f6976 100644 (file)
@@ -46,7 +46,7 @@ pub(crate) fn move_bounds_to_where_clause(ctx: AssistCtx<impl HirDatabase>) -> O
         _ => return None,
     };
 
-    ctx.add_assist(AssistId("move_bounds_to_where_clause"), "move_bounds_to_where_clause", |edit| {
+    ctx.add_assist(AssistId("move_bounds_to_where_clause"), "Move to Where Clause", |edit| {
         let new_params = type_param_list
             .type_params()
             .filter(|it| it.type_bound_list().is_some())
index b49ec6172ac35dd6d536c29f2db2dc9abf513ba8..59ba9e3f38963ab50e390dff113c31cb52af36a4 100644 (file)
@@ -41,7 +41,7 @@ pub(crate) fn move_guard_to_arm_body(ctx: AssistCtx<impl HirDatabase>) -> Option
     let arm_expr = match_arm.expr()?;
     let buf = format!("if {} {{ {} }}", guard_conditions.syntax().text(), arm_expr.syntax().text());
 
-    ctx.add_assist(AssistId("move_guard_to_arm_body"), "move guard to arm body", |edit| {
+    ctx.add_assist(AssistId("move_guard_to_arm_body"), "Move Guard to Arm Body", |edit| {
         edit.target(guard.syntax().text_range());
         let offseting_amount = match space_before_guard.and_then(|it| it.into_token()) {
             Some(tok) => {
index 93912a4706686a81cb4cce55358ce3cc03d07105..3583b636a97c23bc653b65c5e972bf3077e305ae 100644 (file)
@@ -25,7 +25,7 @@
 pub(crate) fn make_raw_string(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
     let token = ctx.find_token_at_offset(STRING).and_then(ast::String::cast)?;
     let value = token.value()?;
-    ctx.add_assist(AssistId("make_raw_string"), "make raw string", |edit| {
+    ctx.add_assist(AssistId("make_raw_string"), "Rewrite as Raw String", |edit| {
         edit.target(token.syntax().text_range());
         let max_hash_streak = count_hashes(&value);
         let mut hashes = String::with_capacity(max_hash_streak + 1);
@@ -54,7 +54,7 @@ pub(crate) fn make_raw_string(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist
 pub(crate) fn make_usual_string(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
     let token = ctx.find_token_at_offset(RAW_STRING).and_then(ast::RawString::cast)?;
     let value = token.value()?;
-    ctx.add_assist(AssistId("make_usual_string"), "make usual string", |edit| {
+    ctx.add_assist(AssistId("make_usual_string"), "Rewrite as Regular String", |edit| {
         edit.target(token.syntax().text_range());
         // parse inside string to escape `"`
         let escaped = value.escape_default().to_string();
@@ -79,7 +79,7 @@ pub(crate) fn make_usual_string(ctx: AssistCtx<impl HirDatabase>) -> Option<Assi
 // ```
 pub(crate) fn add_hash(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
     let token = ctx.find_token_at_offset(RAW_STRING)?;
-    ctx.add_assist(AssistId("add_hash"), "add hash to raw string", |edit| {
+    ctx.add_assist(AssistId("add_hash"), "Add # to Raw String", |edit| {
         edit.target(token.text_range());
         edit.insert(token.text_range().start() + TextUnit::of_char('r'), "#");
         edit.insert(token.text_range().end(), "#");
index aedf8747f22a79dc2d87ee2cab1f782b626c202d..cf211ab840ac672f0a9b7ea19fe49f941a0e3486 100644 (file)
@@ -58,7 +58,7 @@ pub(crate) fn remove_dbg(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
         text.slice(without_parens).to_string()
     };
 
-    ctx.add_assist(AssistId("remove_dbg"), "remove dbg!()", |edit| {
+    ctx.add_assist(AssistId("remove_dbg"), "Remove dbg!()", |edit| {
         edit.target(macro_call.syntax().text_range());
         edit.replace(macro_range, macro_content);
         edit.set_cursor(cursor_pos);
index 3272801ff81081738ae1eb5310051b53d187968a..dacbf8758c167b82e4a579ab5ef2e6b9f7a9614d 100644 (file)
@@ -42,7 +42,7 @@ pub(crate) fn replace_if_let_with_match(ctx: AssistCtx<impl HirDatabase>) -> Opt
         ast::ElseBranch::IfExpr(_) => return None,
     };
 
-    ctx.add_assist(AssistId("replace_if_let_with_match"), "replace with match", |edit| {
+    ctx.add_assist(AssistId("replace_if_let_with_match"), "Replace with Match", |edit| {
         let match_expr = build_match_expr(expr, pat, then_block, else_block);
         edit.target(if_expr.syntax().text_range());
         edit.replace_node_and_indent(if_expr.syntax(), match_expr);
index 5f8d6b0be1ff11b9a3d7359de8af24c8fcd51377..d36df069acd62ce39ef1e7e29697aead07b6f40a 100644 (file)
@@ -32,7 +32,7 @@ pub(crate) fn split_import(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
         None => top_path.syntax().text_range().end(),
     };
 
-    ctx.add_assist(AssistId("split_import"), "split import", |edit| {
+    ctx.add_assist(AssistId("split_import"), "Split Import", |edit| {
         edit.target(colon_colon.text_range());
         edit.insert(l_curly, "{");
         edit.insert(r_curly, "}");