5 files changed, 61 insertions, 8 deletions
diff --git a/crates/ra_ide/src/snapshots/highlight_injection.html b/crates/ra_ide/src/snapshots/highlight_injection.html
index 748f07625..1b0349bae 100644
--- a/crates/ra_ide/src/snapshots/highlight_injection.html
+++ b/crates/ra_ide/src/snapshots/highlight_injection.html
@@ -12,8 +12,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.function.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
-.operator.unsafe    { color: #E28C14; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }
diff --git a/crates/ra_ide/src/snapshots/highlight_strings.html b/crates/ra_ide/src/snapshots/highlight_strings.html
index 12a68ce62..d184b5691 100644
--- a/crates/ra_ide/src/snapshots/highlight_strings.html
+++ b/crates/ra_ide/src/snapshots/highlight_strings.html
@@ -12,8 +12,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.function.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
-.operator.unsafe    { color: #E28C14; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }
diff --git a/crates/ra_ide/src/snapshots/highlight_unsafe.html b/crates/ra_ide/src/snapshots/highlight_unsafe.html
new file mode 100644
index 000000000..6936e949f
--- /dev/null
+++ b/crates/ra_ide/src/snapshots/highlight_unsafe.html
@@ -0,0 +1,53 @@
+<style>
+body                { margin: 0; }
+pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
+.lifetime           { color: #DFAF8F; font-style: italic; }
+.comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
+.struct, .enum      { color: #7CB8BB; }
+.enum_variant       { color: #BDE0F3; }
+.string_literal     { color: #CC9393; }
+.field              { color: #94BFF3; }
+.function           { color: #93E0E3; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
+.parameter          { color: #94BFF3; }
+.text               { color: #DCDCCC; }
+.type               { color: #7CB8BB; }
+.builtin_type       { color: #8CD0D3; }
+.type_param         { color: #DFAF8F; }
+.attribute          { color: #94BFF3; }
+.numeric_literal    { color: #BFEBBF; }
+.bool_literal       { color: #BFE6EB; }
+.macro              { color: #94BFF3; }
+.module             { color: #AFD8AF; }
+.variable           { color: #DCDCCC; }
+.format_specifier   { color: #CC696B; }
+.mutable            { text-decoration: underline; }
+.unresolved_reference { color: #FC5555; }
+.escape_sequence    { color: #94BFF3; }
+.keyword            { color: #F0DFAF; font-weight: bold; }
+.keyword.unsafe     { color: #BC8383; font-weight: bold; }
+.control            { font-style: italic; }
+</style>
+<pre><code><span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_fn</span>() {}
+<span class="keyword">struct</span> <span class="struct declaration">HasUnsafeFn</span>;
+<span class="keyword">impl</span> <span class="struct">HasUnsafeFn</span> {
+    <span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_method</span>(&<span class="self_keyword">self</span>) {}
+}
+<span class="keyword">fn</span> <span class="function declaration">main</span>() {
+    <span class="keyword">let</span> <span class="variable declaration">x</span> = &<span class="numeric_literal">5</span> <span class="keyword">as</span> *<span class="keyword">const</span> <span class="builtin_type">usize</span>;
+    <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">z</span> = -<span class="variable">x</span>;
+    }
+}</code></pre>
+\ No newline at end of file
diff --git a/crates/ra_ide/src/snapshots/highlighting.html b/crates/ra_ide/src/snapshots/highlighting.html
index d093a6266..8d0b38f95 100644
--- a/crates/ra_ide/src/snapshots/highlighting.html
+++ b/crates/ra_ide/src/snapshots/highlighting.html
@@ -12,8 +12,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.function.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
-.operator.unsafe    { color: #E28C14; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }
diff --git a/crates/ra_ide/src/snapshots/rainbow_highlighting.html b/crates/ra_ide/src/snapshots/rainbow_highlighting.html
index 192d564a6..9516c7441 100644
--- a/crates/ra_ide/src/snapshots/rainbow_highlighting.html
+++ b/crates/ra_ide/src/snapshots/rainbow_highlighting.html
@@ -12,8 +12,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
-.function.unsafe    { color: #E28C14; }
+.function.unsafe    { color: #BC8383; }
-.operator.unsafe    { color: #E28C14; }
+.operator.unsafe    { color: #BC8383; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }

diff --git a/crates/ra_ide/src/snapshots/highlight_injection.html b/crates/ra_ide/src/snapshots/highlight_injection.html index 748f07625..1b0349bae 100644 --- a/crates/ra_ide/src/snapshots/highlight_injection.html +++ b/crates/ra_ide/src/snapshots/highlight_injection.html
@@ -12,8 +12,8 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
12	.string_literal { color: #CC9393; }	12	.string_literal { color: #CC9393; }
13	.field { color: #94BFF3; }	13	.field { color: #94BFF3; }
14	.function { color: #93E0E3; }	14	.function { color: #93E0E3; }
15	.function.unsafe { color: #E28C14; }	15	.function.unsafe { color: #BC8383; }
16	.operator.unsafe { color: #E28C14; }	16	.operator.unsafe { color: #BC8383; }
17	.parameter { color: #94BFF3; }	17	.parameter { color: #94BFF3; }
18	.text { color: #DCDCCC; }	18	.text { color: #DCDCCC; }
19	.type { color: #7CB8BB; }	19	.type { color: #7CB8BB; }


diff --git a/crates/ra_ide/src/snapshots/highlight_strings.html b/crates/ra_ide/src/snapshots/highlight_strings.html index 12a68ce62..d184b5691 100644 --- a/crates/ra_ide/src/snapshots/highlight_strings.html +++ b/crates/ra_ide/src/snapshots/highlight_strings.html
@@ -12,8 +12,8 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
12	.string_literal { color: #CC9393; }	12	.string_literal { color: #CC9393; }
13	.field { color: #94BFF3; }	13	.field { color: #94BFF3; }
14	.function { color: #93E0E3; }	14	.function { color: #93E0E3; }
15	.function.unsafe { color: #E28C14; }	15	.function.unsafe { color: #BC8383; }
16	.operator.unsafe { color: #E28C14; }	16	.operator.unsafe { color: #BC8383; }
17	.parameter { color: #94BFF3; }	17	.parameter { color: #94BFF3; }
18	.text { color: #DCDCCC; }	18	.text { color: #DCDCCC; }
19	.type { color: #7CB8BB; }	19	.type { color: #7CB8BB; }


diff --git a/crates/ra_ide/src/snapshots/highlight_unsafe.html b/crates/ra_ide/src/snapshots/highlight_unsafe.html new file mode 100644 index 000000000..6936e949f --- /dev/null +++ b/crates/ra_ide/src/snapshots/highlight_unsafe.html
@@ -0,0 +1,53 @@
		1
		2	<style>
		3	body { margin: 0; }
		4	pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
		5
		6	.lifetime { color: #DFAF8F; font-style: italic; }
		7	.comment { color: #7F9F7F; }
		8	.documentation { color: #629755; }
		9	.injected { opacity: 0.65 ; }
		10	.struct, .enum { color: #7CB8BB; }
		11	.enum_variant { color: #BDE0F3; }
		12	.string_literal { color: #CC9393; }
		13	.field { color: #94BFF3; }
		14	.function { color: #93E0E3; }
		15	.function.unsafe { color: #BC8383; }
		16	.operator.unsafe { color: #BC8383; }
		17	.parameter { color: #94BFF3; }
		18	.text { color: #DCDCCC; }
		19	.type { color: #7CB8BB; }
		20	.builtin_type { color: #8CD0D3; }
		21	.type_param { color: #DFAF8F; }
		22	.attribute { color: #94BFF3; }
		23	.numeric_literal { color: #BFEBBF; }
		24	.bool_literal { color: #BFE6EB; }
		25	.macro { color: #94BFF3; }
		26	.module { color: #AFD8AF; }
		27	.variable { color: #DCDCCC; }
		28	.format_specifier { color: #CC696B; }
		29	.mutable { text-decoration: underline; }
		30	.unresolved_reference { color: #FC5555; }
		31	.escape_sequence { color: #94BFF3; }
		32
		33	.keyword { color: #F0DFAF; font-weight: bold; }
		34	.keyword.unsafe { color: #BC8383; font-weight: bold; }
		35	.control { font-style: italic; }
		36	</style>
		37	<pre><code><span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_fn</span>() {}
		38
		39	<span class="keyword">struct</span> <span class="struct declaration">HasUnsafeFn</span>;
		40
		41	<span class="keyword">impl</span> <span class="struct">HasUnsafeFn</span> {
		42	<span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_method</span>(&<span class="self_keyword">self</span>) {}
		43	}
		44
		45	<span class="keyword">fn</span> <span class="function declaration">main</span>() {
		46	<span class="keyword">let</span> <span class="variable declaration">x</span> = &<span class="numeric_literal">5</span> <span class="keyword">as</span> *<span class="keyword">const</span> <span class="builtin_type">usize</span>;
		47	<span class="keyword unsafe">unsafe</span> {
		48	<span class="function unsafe">unsafe_fn</span>();
		49	<span class="struct">HasUnsafeFn</span>.<span class="function unsafe">unsafe_method</span>();
		50	<span class="keyword">let</span> <span class="variable declaration">y</span> = <span class="operator unsafe">*</span>(<span class="variable">x</span>);
		51	<span class="keyword">let</span> <span class="variable declaration">z</span> = -<span class="variable">x</span>;
		52	}
		53	}</code></pre> \ No newline at end of file


diff --git a/crates/ra_ide/src/snapshots/highlighting.html b/crates/ra_ide/src/snapshots/highlighting.html index d093a6266..8d0b38f95 100644 --- a/crates/ra_ide/src/snapshots/highlighting.html +++ b/crates/ra_ide/src/snapshots/highlighting.html
@@ -12,8 +12,8 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
12	.string_literal { color: #CC9393; }	12	.string_literal { color: #CC9393; }
13	.field { color: #94BFF3; }	13	.field { color: #94BFF3; }
14	.function { color: #93E0E3; }	14	.function { color: #93E0E3; }
15	.function.unsafe { color: #E28C14; }	15	.function.unsafe { color: #BC8383; }
16	.operator.unsafe { color: #E28C14; }	16	.operator.unsafe { color: #BC8383; }
17	.parameter { color: #94BFF3; }	17	.parameter { color: #94BFF3; }
18	.text { color: #DCDCCC; }	18	.text { color: #DCDCCC; }
19	.type { color: #7CB8BB; }	19	.type { color: #7CB8BB; }


diff --git a/crates/ra_ide/src/snapshots/rainbow_highlighting.html b/crates/ra_ide/src/snapshots/rainbow_highlighting.html index 192d564a6..9516c7441 100644 --- a/crates/ra_ide/src/snapshots/rainbow_highlighting.html +++ b/crates/ra_ide/src/snapshots/rainbow_highlighting.html
@@ -12,8 +12,8 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
12	.string_literal { color: #CC9393; }	12	.string_literal { color: #CC9393; }
13	.field { color: #94BFF3; }	13	.field { color: #94BFF3; }
14	.function { color: #93E0E3; }	14	.function { color: #93E0E3; }
15	.function.unsafe { color: #E28C14; }	15	.function.unsafe { color: #BC8383; }
16	.operator.unsafe { color: #E28C14; }	16	.operator.unsafe { color: #BC8383; }
17	.parameter { color: #94BFF3; }	17	.parameter { color: #94BFF3; }
18	.text { color: #DCDCCC; }	18	.text { color: #DCDCCC; }
19	.type { color: #7CB8BB; }	19	.type { color: #7CB8BB; }