3 files changed, 63 insertions, 53 deletions

diff --git a/crates/ra_ide/src/syntax_highlighting/html.rs b/crates/ra_ide/src/syntax_highlighting/html.rs
index 210d9a57b..54678c278 100644
--- a/crates/ra_ide/src/syntax_highlighting/html.rs
+++ b/crates/ra_ide/src/syntax_highlighting/html.rs
@@ -80,25 +80,27 @@ const STYLE: &str = "
 body                { margin: 0; }
 pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
 
+
 .comment            { color: #7F9F7F; }
-.string             { color: #CC9393; }
+.struct, .enum      { color: #7CB8BB; }
+.enum_variant       { color: #BDE0F3; }
+.string_literal     { color: #CC9393; }
 .field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
 .type               { color: #7CB8BB; }
-.type.builtin       { color: #8CD0D3; }
-.type.param         { color: #20999D; }
+.builtin_type       { color: #8CD0D3; }
+.type_param         { color: #DFAF8F; }
 .attribute          { color: #94BFF3; }
-.literal            { color: #BFEBBF; }
-.literal.numeric    { color: #6A8759; }
+.numeric_literal    { color: #BFEBBF; }
 .macro              { color: #94BFF3; }
 .module             { color: #AFD8AF; }
 .variable           { color: #DCDCCC; }
-.variable.mut       { color: #DCDCCC; text-decoration: underline; }
+.mutable            { text-decoration: underline; }
 
-.keyword            { color: #F0DFAF; }
-.keyword.unsafe     { color: #DFAF8F; }
-.keyword.control    { color: #F0DFAF; font-weight: bold; }
+.keyword            { color: #F0DFAF; font-weight: bold; }
+.keyword.unsafe     { color: #BC8383; font-weight: bold; }
+.control            { font-style: italic; }
 </style>
 ";
diff --git a/crates/ra_ide/src/syntax_highlighting/tags.rs b/crates/ra_ide/src/syntax_highlighting/tags.rs
index 383c74c98..9da80823c 100644
--- a/crates/ra_ide/src/syntax_highlighting/tags.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tags.rs
@@ -14,59 +14,71 @@ pub struct HighlightModifiers(u32);
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub enum HighlightTag {
+    Attribute,
+    BuiltinType,
+    ByteLiteral,
+    CharLiteral,
+    Comment,
+    Constant,
+    Enum,
+    EnumVariant,
     Field,
     Function,
-    Module,
-    Constant,
+    Keyword,
+    Lifetime,
     Macro,
-    Variable,
-
-    Type,
-    TypeSelf,
+    Module,
+    NumericLiteral,
+    SelfType,
+    Static,
+    StringLiteral,
+    Struct,
+    Trait,
+    TypeAlias,
     TypeParam,
-    TypeLifetime,
-
-    LiteralByte,
-    LiteralNumeric,
-    LiteralChar,
-
-    Comment,
-    LiteralString,
-    Attribute,
-
-    Keyword,
+    Union,
+    Local,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 #[repr(u8)]
 pub enum HighlightModifier {
-    Mutable = 0,
-    Unsafe,
     /// Used with keywords like `if` and `break`.
-    Control,
-    Builtin,
+    Control = 0,
+    /// `foo` in `fn foo(x: i32)` is a definition, `foo` in `foo(90 + 2)` is
+    /// not.
+    Definition,
+    Mutable,
+    Unsafe,
 }
 
 impl HighlightTag {
     fn as_str(self) -> &'static str {
         match self {
+            HighlightTag::Attribute => "attribute",
+            HighlightTag::BuiltinType => "builtin_type",
+            HighlightTag::ByteLiteral => "byte_literal",
+            HighlightTag::CharLiteral => "char_literal",
+            HighlightTag::Comment => "comment",
+            HighlightTag::Constant => "constant",
+            HighlightTag::Enum => "enum",
+            HighlightTag::EnumVariant => "enum_variant",
             HighlightTag::Field => "field",
             HighlightTag::Function => "function",
-            HighlightTag::Module => "module",
-            HighlightTag::Constant => "constant",
-            HighlightTag::Macro => "macro",
-            HighlightTag::Variable => "variable",
-            HighlightTag::Type => "type",
-            HighlightTag::TypeSelf => "type.self",
-            HighlightTag::TypeParam => "type.param",
-            HighlightTag::TypeLifetime => "type.lifetime",
-            HighlightTag::LiteralByte => "literal.byte",
-            HighlightTag::LiteralNumeric => "literal.numeric",
-            HighlightTag::LiteralChar => "literal.char",
-            HighlightTag::Comment => "comment",
-            HighlightTag::LiteralString => "string",
-            HighlightTag::Attribute => "attribute",
             HighlightTag::Keyword => "keyword",
+            HighlightTag::Lifetime => "lifetime",
+            HighlightTag::Macro => "macro",
+            HighlightTag::Module => "module",
+            HighlightTag::NumericLiteral => "numeric_literal",
+            HighlightTag::SelfType => "self_type",
+            HighlightTag::Static => "static",
+            HighlightTag::StringLiteral => "string_literal",
+            HighlightTag::Struct => "struct",
+            HighlightTag::Trait => "trait",
+            HighlightTag::TypeAlias => "type_alias",
+            HighlightTag::TypeParam => "type_param",
+            HighlightTag::Union => "union",
+            HighlightTag::Local => "variable",
         }
     }
 }
@@ -78,19 +90,15 @@ impl fmt::Display for HighlightTag {
 }
 
 impl HighlightModifier {
-    const ALL: &'static [HighlightModifier] = &[
-        HighlightModifier::Mutable,
-        HighlightModifier::Unsafe,
-        HighlightModifier::Control,
-        HighlightModifier::Builtin,
-    ];
+    const ALL: &'static [HighlightModifier] =
+        &[HighlightModifier::Mutable, HighlightModifier::Unsafe, HighlightModifier::Control];
 
     fn as_str(self) -> &'static str {
         match self {
+            HighlightModifier::Control => "control",
+            HighlightModifier::Definition => "declaration",
             HighlightModifier::Mutable => "mutable",
             HighlightModifier::Unsafe => "unsafe",
-            HighlightModifier::Control => "control",
-            HighlightModifier::Builtin => "builtin",
         }
     }
 
diff --git a/crates/ra_ide/src/syntax_highlighting/tests.rs b/crates/ra_ide/src/syntax_highlighting/tests.rs
index ff23d4ac5..2d90a072f 100644
--- a/crates/ra_ide/src/syntax_highlighting/tests.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tests.rs
@@ -26,7 +26,7 @@ macro_rules! def_fn {
     ($($tt:tt)*) => {$($tt)*}
 }
 
-def_fn!{
+def_fn! {
     fn bar() -> u32 {
         100
     }