4 files changed, 14 insertions, 18 deletions

diff --git a/crates/ra_ide/src/completion/complete_keyword.rs b/crates/ra_ide/src/completion/complete_keyword.rs
index b2f621a11..3b174f916 100644
--- a/crates/ra_ide/src/completion/complete_keyword.rs
+++ b/crates/ra_ide/src/completion/complete_keyword.rs
@@ -11,14 +11,14 @@ pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
     let source_range = ctx.source_range();
     match (ctx.use_item_syntax.as_ref(), ctx.path_prefix.as_ref()) {
         (Some(_), None) => {
-            CompletionItem::new(CompletionKind::Keyword, source_range, "crate")
+            CompletionItem::new(CompletionKind::Keyword, source_range, "crate::")
                 .kind(CompletionItemKind::Keyword)
                 .insert_text("crate::")
                 .add_to(acc);
             CompletionItem::new(CompletionKind::Keyword, source_range, "self")
                 .kind(CompletionItemKind::Keyword)
                 .add_to(acc);
-            CompletionItem::new(CompletionKind::Keyword, source_range, "super")
+            CompletionItem::new(CompletionKind::Keyword, source_range, "super::")
                 .kind(CompletionItemKind::Keyword)
                 .insert_text("super::")
                 .add_to(acc);
@@ -27,7 +27,7 @@ pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
             CompletionItem::new(CompletionKind::Keyword, source_range, "self")
                 .kind(CompletionItemKind::Keyword)
                 .add_to(acc);
-            CompletionItem::new(CompletionKind::Keyword, source_range, "super")
+            CompletionItem::new(CompletionKind::Keyword, source_range, "super::")
                 .kind(CompletionItemKind::Keyword)
                 .insert_text("super::")
                 .add_to(acc);
@@ -182,9 +182,9 @@ mod tests {
         assert_snapshot!(
             get_keyword_completions(r"use <|>"),
             @r###"
-            kw crate
+            kw crate::
             kw self
-            kw super
+            kw super::
         "###
         );
 
@@ -192,7 +192,7 @@ mod tests {
             get_keyword_completions(r"use a::<|>"),
             @r###"
             kw self
-            kw super
+            kw super::
         "###
         );
 
@@ -200,7 +200,7 @@ mod tests {
             get_keyword_completions(r"use a::{b, <|>}"),
             @r###"
             kw self
-            kw super
+            kw super::
         "###
         );
     }
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 3fd08b1e8..c87652555 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -258,6 +258,7 @@ fn should_show_param_name_hint(
     if param_name.is_empty()
         || Some(param_name) == fn_signature.name.as_ref().map(|s| s.trim_start_matches('_'))
         || is_argument_similar_to_param_name(sema, argument, param_name)
+        || param_name.starts_with("ra_fixture")
     {
         return false;
     }
@@ -270,7 +271,7 @@ fn should_show_param_name_hint(
 
     // avoid displaying hints for common functions like map, filter, etc.
     // or other obvious words used in std
-    parameters_len != 1 || !is_obvious_param(param_name)
+    !(parameters_len == 1 && is_obvious_param(param_name))
 }
 
 fn is_argument_similar_to_param_name(
@@ -312,10 +313,8 @@ fn get_string_representation(expr: &ast::Expr) -> Option<String> {
 }
 
 fn is_obvious_param(param_name: &str) -> bool {
-    let is_obvious_param_name = match param_name {
-        "predicate" | "value" | "pat" | "rhs" | "other" => true,
-        _ => false,
-    };
+    let is_obvious_param_name =
+        matches!(param_name, "predicate" | "value" | "pat" | "rhs" | "other");
     param_name.len() == 1 || is_obvious_param_name
 }
 
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs
index 5036c1fb0..6907c09e8 100644
--- a/crates/ra_ide/src/join_lines.rs
+++ b/crates/ra_ide/src/join_lines.rs
@@ -165,10 +165,7 @@ fn join_single_use_tree(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Opti
 }
 
 fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool {
-    match (left, right) {
-        (T![,], T![')']) | (T![,], T![']']) => true,
-        _ => false,
-    }
+    matches!((left, right), (T![,], T![')']) | (T![,], T![']']))
 }
 
 #[cfg(test)]
diff --git a/crates/ra_ide/src/syntax_highlighting/tags.rs b/crates/ra_ide/src/syntax_highlighting/tags.rs
index e8e251cfc..13d9dd195 100644
--- a/crates/ra_ide/src/syntax_highlighting/tags.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tags.rs
@@ -25,7 +25,6 @@ pub enum HighlightTag {
     EnumVariant,
     EscapeSequence,
     Field,
-    FormatSpecifier,
     Function,
     Generic,
     Keyword,
@@ -33,7 +32,6 @@ pub enum HighlightTag {
     Macro,
     Module,
     NumericLiteral,
-    Operator,
     SelfKeyword,
     SelfType,
     Static,
@@ -45,6 +43,8 @@ pub enum HighlightTag {
     Union,
     Local,
     UnresolvedReference,
+    FormatSpecifier,
+    Operator,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]