Merge #4796

4796: Fix unsafe highlihgintngs r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

Author: bors[bot]

crates/ra_ide/src/snapshots/highlight_doctest.html

@@ -10,7 +10,8 @@
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.operator.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }

crates/ra_ide/src/snapshots/highlight_injection.html

@@ -10,7 +10,8 @@
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.operator.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }

crates/ra_ide/src/snapshots/highlight_strings.html

@@ -10,7 +10,8 @@
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.operator.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }

crates/ra_ide/src/snapshots/highlight_unsafe.html

@@ -10,7 +10,8 @@
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.operator.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }
@@ -42,7 +43,7 @@
     <span class="keyword unsafe">unsafe</span> {
         <span class="function unsafe">unsafe_fn</span>();
         <span class="struct">HasUnsafeFn</span>.<span class="function unsafe">unsafe_method</span>();
-        <span class="keyword">let</span> <span class="variable declaration">y</span> = <span class="operator unsafe">*</span><span class="variable">x</span>;
+        <span class="keyword">let</span> <span class="variable declaration">y</span> = <span class="operator unsafe">*</span>(<span class="variable">x</span>);
         <span class="keyword">let</span> <span class="variable declaration">z</span> = -<span class="variable">x</span>;
     }
 }</code></pre>

crates/ra_ide/src/snapshots/highlighting.html

@@ -10,7 +10,8 @@
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.operator.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }

crates/ra_ide/src/snapshots/rainbow_highlighting.html

@@ -10,7 +10,8 @@
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.operator.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }

crates/ra_ide/src/syntax_highlighting.rs

@@ -480,12 +480,8 @@ fn highlight_element(
                 _ => h,
             }
         }
-        PREFIX_EXPR => {
-            let prefix_expr = element.into_node().and_then(ast::PrefixExpr::cast)?;
-            match prefix_expr.op_kind() {
-                Some(ast::PrefixOp::Deref) => {}
-                _ => return None,
-            }
+        T![*] => {
+            let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
 
             let expr = prefix_expr.expr()?;
             let ty = sema.type_of_expr(&expr)?;

crates/ra_ide/src/syntax_highlighting/html.rs

@@ -69,7 +69,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.operator.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }

crates/ra_ide/src/syntax_highlighting/tests.rs

@@ -274,7 +274,7 @@ fn main() {
     unsafe {
         unsafe_fn();
         HasUnsafeFn.unsafe_method();
-        let y = *x;
+        let y = *(x);
         let z = -x;
     }
 }