Merge remote-tracking branch 'noprompt/master' into css-token-kinds

korny · korny · commit e23f69fb5878 · 2013-06-11T02:32:37.000+02:00
Conflicts:
	etc/todo/scanners/css.rb
diff --git a/lib/coderay/scanners/css.rb b/lib/coderay/scanners/css.rb
@@ -7,8 +7,8 @@ class CSS < Scanner
     
     KINDS_NOT_LOC = [
       :comment,
-      :class, :pseudo_class, :type,
-      :constant, :directive,
+      :class, :pseudo_class, :tag,
+      :id, :directive,
       :key, :value, :operator, :color, :float, :string,
       :error, :important,
     ]  # :nodoc:
@@ -64,13 +64,13 @@ def scan_tokens encoder, options
         elsif case states.last
           when :initial, :media
             if match = scan(/(?>#{RE::Ident})(?!\()|\*/ox)
-              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
@@ -99,7 +99,7 @@ def scan_tokens encoder, options
             
           when :media_before_name
             if match = scan(RE::Ident)
-              encoder.text_token match, :type
+              encoder.text_token match, :tag
               states[-1] = :media_after_name
               next
             end
diff --git a/lib/coderay/token_kinds.rb b/lib/coderay/token_kinds.rb
@@ -39,6 +39,7 @@ module CodeRay
     :function            => 'function',
     :global_variable     => 'global-variable',
     :hex                 => 'hex',
+    :id                  => 'id',
     :imaginary           => 'imaginary',
     :important           => 'important',
     :include             => 'include',
