Fix highlighting token names

diff --git a/crates/ra_ide/src/snapshots/highlighting.html b/crates/ra_ide/src/snapshots/highlighting.html
index 40605d9efdfbc4a69573a08538bbac9e19622758..2157139f66440f3a96414ddbff13881774b3adb5 100644 (file)
--- a/crates/ra_ide/src/snapshots/highlighting.html
+++ b/crates/ra_ide/src/snapshots/highlighting.html
@@ -7,9 +7,9 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .string             { color: #CC9393; }
 .function           { color: #93E0E3; }
 .parameter          { color: #94BFF3; }
-.builtin            { color: #DD6718; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }
+.type\.builtin     { color: #8CD0D3; }
 .type\.param       { color: #20999D; }
 .attribute          { color: #94BFF3; }
 .literal            { color: #BFEBBF; }

diff --git a/crates/ra_ide/src/snapshots/rainbow_highlighting.html b/crates/ra_ide/src/snapshots/rainbow_highlighting.html
index ecf26c708472c97caa96c553d9501472f4b66d3b..871a52cf62fdbebb0afb5915d1942f3de617ec41 100644 (file)
--- a/crates/ra_ide/src/snapshots/rainbow_highlighting.html
+++ b/crates/ra_ide/src/snapshots/rainbow_highlighting.html
@@ -7,9 +7,9 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .string             { color: #CC9393; }
 .function           { color: #93E0E3; }
 .parameter          { color: #94BFF3; }
-.builtin            { color: #DD6718; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }
+.type\.builtin     { color: #8CD0D3; }
 .type\.param       { color: #20999D; }
 .attribute          { color: #94BFF3; }
 .literal            { color: #BFEBBF; }

diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index eb3dd177935368ede8d56ea27dc9f7870dab7d5a..15e75709c1d1ae8cd2547d6cdde31efbe57c4b71 100644 (file)
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -284,9 +284,9 @@ fn html_escape(text: &str) -> String {
 .string             { color: #CC9393; }
 .function           { color: #93E0E3; }
 .parameter          { color: #94BFF3; }
-.builtin            { color: #DD6718; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }
+.type\\.builtin     { color: #8CD0D3; }
 .type\\.param       { color: #20999D; }
 .attribute          { color: #94BFF3; }
 .literal            { color: #BFEBBF; }

diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index d7c0ae1316a6b7105f5227b42ffd9e3ce0223d96..e1b0d13e701a8f26948392b5d79302689d90cbef 100644 (file)
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -52,12 +52,12 @@ export class Highlighter {
             decoration('function'),
             decoration('parameter'),
             decoration('constant'),
-            decoration('type'),
-            decoration('type.self'),
+            decoration('type.builtin'),
             decoration('type.generic'),
-            decoration('type.param'),
             decoration('type.lifetime'),
-            decoration('builtin'),
+            decoration('type.param'),
+            decoration('type.self'),
+            decoration('type'),
             decoration('text'),
             decoration('attribute'),
             decoration('literal'),