lib/scss_lint/linter/duplicate_property.rb in scss-lint-0.30.0 vs lib/scss_lint/linter/duplicate_property.rb in scss-lint-0.31.0

@@ -1,53 +1,58 @@
 module SCSSLint
   # Checks for a property declared twice in a rule set.
   class Linter::DuplicateProperty < Linter
     include LinterRegistry
 
-    def visit_rule(node)
-      check_properties(node)
-    end
+    def check_properties(node)
+      static_properties(node).each_with_object({}) do |prop, prop_names|
+        prop_key = property_key(prop)
 
-    def visit_mixindef(node)
-      check_properties(node)
+        if existing_prop = prop_names[prop_key]
+          add_lint(prop, "Property `#{existing_prop.name.join}` already "\
+                         "defined on line #{existing_prop.line}")
+        else
+          prop_names[prop_key] = prop
+        end
+      end
+
+      yield # Continue linting children
     end
 
+    alias_method :visit_rule,     :check_properties
+    alias_method :visit_mixindef, :check_properties
+
   private
 
+    def static_properties(node)
+      node.children
+          .select { |child| child.is_a?(Sass::Tree::PropNode) }
+          .reject { |prop| prop.name.any? { |item| item.is_a?(Sass::Script::Node) } }
+    end
+
+    # Returns a key identifying the bucket this property and value correspond to
+    # for purposes of uniqueness.
+    def property_key(prop)
+      prop_key = prop.name.join
+      prop_value = property_value(prop)
+
+      # Differentiate between values for different vendor prefixes
+      prop_value.to_s.scan(/^(-[^-]+-.+)/) do |vendor_keyword|
+        prop_key << vendor_keyword.first
+      end
+
+      prop_key
+    end
+
     def property_value(prop)
       case prop.value
       when Sass::Script::Funcall
         prop.value.name
       when Sass::Script::String
       when Sass::Script::Tree::Literal
         prop.value.value
       else
         prop.value.to_s
-      end
-    end
-
-    def check_properties(node)
-      properties = node.children
-                       .select { |child| child.is_a?(Sass::Tree::PropNode) }
-                       .reject { |prop| prop.name.any? { |item| item.is_a?(Sass::Script::Node) } }
-
-      prop_names = {}
-
-      properties.each do |prop|
-        name = prop.name.join
-
-        prop_hash = name
-        prop_value = property_value(prop)
-
-        prop_value.to_s.scan(/^(-[^-]+-.+)/) do |vendor_keyword|
-          prop_hash << vendor_keyword.first
-        end
-
-        if existing_prop = prop_names[prop_hash]
-          add_lint(prop, "Property `#{name}` already defined on line #{existing_prop.line}")
-        else
-          prop_names[prop_hash] = prop
-        end
       end
     end
   end
 end