tweak CSS tag/id token kind patch from noprompt

korny · korny · commit b159057934d2 · 2013-06-11T03:29:54.000+02:00
diff --git a/Changes.textile b/Changes.textile
@@ -15,6 +15,8 @@ h2. Changes in 1.1
 * @CodeRay::TokenKinds@ should not be frozen [#130, thanks to Gavin Kistner]
 * Override Bootstrap's pre word-break setting for line numbers [#102, thanks to lightswitch05]
 * Accept keywords as Ruby 1.9 hash keys [#126]
+* New token type @:id@ for CSS/Sass [#27]
+* CSS scanner uses @:id@ and @:tag@ now [#27]
 
 h2. Changes in 1.0.9
 
diff --git a/lib/coderay/scanners/css.rb b/lib/coderay/scanners/css.rb
@@ -10,7 +10,7 @@ class CSS < Scanner
       :class, :pseudo_class, :tag,
       :id, :directive,
       :key, :value, :operator, :color, :float, :string,
-      :error, :important,
+      :error, :important, :type,
     ]  # :nodoc:
     
     module RE  # :nodoc:
@@ -99,7 +99,7 @@ def scan_tokens encoder, options
             
           when :media_before_name
             if match = scan(RE::Ident)
-              encoder.text_token match, :tag
+              encoder.text_token match, :type
               states[-1] = :media_after_name
               next
             end
diff --git a/lib/coderay/scanners/sass.rb b/lib/coderay/scanners/sass.rb
@@ -38,16 +38,16 @@ def scan_tokens encoder, options
         elsif case states.last
           when :initial, :media, :sass_inline
             if match = scan(/(?>#{RE::Ident})(?!\()/ox)
-              encoder.text_token match, value_expected ? :value : (check(/.*:/) ? :key : :type)
+              encoder.text_token match, value_expected ? :value : (check(/.*:/) ? :key : :tag)
               next
             elsif !value_expected && (match = scan(/\*/))
-              encoder.text_token match, :type
+              encoder.text_token match, :tag
               next
             elsif match = scan(RE::Class)
               encoder.text_token match, :class
               next
             elsif match = scan(RE::Id)
-              encoder.text_token match, :constant
+              encoder.text_token match, :id
               next
             elsif match = scan(RE::PseudoClass)
               encoder.text_token match, :pseudo_class
diff --git a/lib/coderay/styles/alpha.rb b/lib/coderay/styles/alpha.rb
@@ -84,6 +84,7 @@ class Alpha < Style
 .function .delimiter { color:#024; font-weight:bold }
 .global-variable { color:#d70 }
 .hex { color:#02b }
+.id  { color:#33D; font-weight:bold }
 .imaginary { color:#f00 }
 .include { color:#B44; font-weight:bold }
 .inline { background-color: hsla(0,0%,0%,0.07); color: black }
