lib/scss_lint/linter/hex_format.rb in scss-lint-0.10.0 vs lib/scss_lint/linter/hex_format.rb in scss-lint-0.10.1

@@ -1,46 +1,33 @@
 module SCSSLint
   class Linter::HexFormat < Linter
     include LinterRegistry
 
-    def visit_prop(node)
-      if node.value.is_a?(Sass::Script::String) &&
-         node.value.type == :identifier
+    def visit_script_color(node)
+      return unless node.original && node.original.match(HEX_REGEX)
 
-        node.value.value.scan(HEX_REGEX) do |match|
-          add_hex_lint(node, match.first) unless valid_hex_format?(match.first)
-        end
+      unless valid_hex_format?(node.original[HEX_REGEX, 1])
+        add_hex_lint(node, node.original)
       end
-
-      yield # Continue visiting children
     end
 
-    def visit_script_color(node)
-      unless valid_hex_format?(node.original[HEX_REGEX, 1])
-        add_hex_lint(node, node.original)
+    def visit_script_string(node)
+      return unless node.type == :identifier
+
+      node.value.scan(HEX_REGEX) do |match|
+        add_hex_lint(node, match.first) unless valid_hex_format?(match.first)
       end
     end
 
   private
 
     HEX_REGEX = /(#\h{3,6})/
 
     def add_hex_lint(node, hex)
-      add_lint(node, "Color `#{hex}` should be written as `#{shortest_form(hex)}`")
+      add_lint(node, "Color `#{hex}` should be written as `#{shortest_hex_form(hex)}`")
     end
 
     def valid_hex_format?(hex)
-      hex == shortest_form(hex)
-    end
-
-    def shortest_form(hex)
-      (can_be_condensed?(hex) ? (hex[0..1] + hex[3] + hex[5]) : hex).downcase
-    end
-
-    def can_be_condensed?(hex)
-      hex.length == 7 &&
-        hex[1] == hex[2] &&
-        hex[3] == hex[4] &&
-        hex[5] == hex[6]
+      hex == shortest_hex_form(hex)
     end
   end
 end