scss-lint 0.23.1 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d1a01eec7c1dd954e81749c6a668a660013b228
-  data.tar.gz: 05988d04580327776387a94171c4297f6a7493d1
+  metadata.gz: 17fa291ee89e19fe0f6103299f2615c7e3a83633
+  data.tar.gz: e52fcd5476a7f944884cb7d8714649dc51ea4e89
 SHA512:
-  metadata.gz: f82ac7a86ac50b2f172f0bb08879ec3fef8fc20f6fbdbf35816ea6cab6feae0963062da65ae550a86bf7106d3e44e755c3d510baf81a2ed43f779b3248d0ba2e
-  data.tar.gz: a47bd582bb1208992367eb5f7f3f61fde36a9d308f8be3745532333a08c70d0e04f90a14adb00e71e409ee3ea6547b46bb1d9d27909e345fe332f3082fe67474
+  metadata.gz: 19b28041ce7fa7c14ff869de3be4193543a9c1e43285c2f150e23dc22cdaac3aeaebf4764803a61880646fb4baf5e5d9a5d78e6a970956b0eeae7763f14c0d8e
+  data.tar.gz: b87d1c50bbd9805083d687de07e8eaafbd90e931c85171a58fa6ca09cc344d57da30b6fd85ab55d928b633ff4cf7c4c680a2b5671c310c79f7f9cec03e6181c6

data/config/default.yml

@@ -21,9 +21,6 @@ linters:
   DuplicateProperty:
     enabled: true
 
-  DuplicateRoot:
-    enabled: true
-
   EmptyLineBetweenBlocks:
     enabled: true
     ignore_single_line_blocks: true
@@ -35,7 +32,15 @@ linters:
     enabled: true
     present: true
 
-  HexFormat:
+  HexLength:
+    enabled: true
+    style: short # or 'long'
+
+  HexNotation:
+    enabled: true
+    style: lowercase # or 'uppercase'
+
+  HexValidation:
     enabled: true
 
   IdWithExtraneousSelector:
@@ -49,6 +54,10 @@ linters:
     enabled: true
     style: exclude_zero # or 'include_zero'
 
+  MergeableSelector:
+    enabled: true
+    force_nesting: true
+
   NameFormat:
     enabled: true
     convention: hyphenated_lowercase # or 'BEM', or a regex pattern

data/lib/scss_lint/cli.rb

@@ -65,6 +65,10 @@ module SCSSLint
           define_output_format(format)
         end
 
+        opts.on_tail('--show-formatters', 'Shows available formatters') do
+          print_formatters
+        end
+
         opts.on('-i', '--include-linter linter,...', Array,
                 'Specify which linters you want to run') do |linters|
           @options[:included_linters] = linters
@@ -196,6 +200,20 @@ module SCSSLint
       halt :config
     end
 
+    def print_formatters
+      puts 'Installed formatters:'
+
+      reporter_names = SCSSLint::Reporter.descendants.map do |reporter|
+        reporter.name.split('::').last.split('Reporter').first
+      end
+
+      reporter_names.sort.each do |reporter_name|
+        puts " - #{reporter_name}"
+      end
+
+      halt
+    end
+
     def print_linters
       puts 'Installed linters:'
 

data/lib/scss_lint/config.rb

@@ -128,11 +128,10 @@ module SCSSLint
 
           LinterRegistry.linters.each do |linter_class|
             name = linter_name(linter_class)
+            next unless name.match(class_name_regex)
 
-            if name.match(class_name_regex)
-              old_options = options['linters'].fetch(name, {})
-              options['linters'][name] = smart_merge(old_options, wildcard_options)
-            end
+            old_options = options['linters'].fetch(name, {})
+            options['linters'][name] = smart_merge(old_options, wildcard_options)
           end
         end
 
@@ -187,7 +186,7 @@ module SCSSLint
 
       # Merge two hashes, concatenating lists and further merging nested hashes.
       def smart_merge(parent, child)
-        parent.merge(child) do |key, old, new|
+        parent.merge(child) do |_key, old, new|
           case old
           when Array
             old + new

data/lib/scss_lint/lint.rb

@@ -1,13 +1,15 @@
 module SCSSLint
   # Stores information about a single problem that was detected by a [Linter].
   class Lint
-    attr_reader :filename, :location, :description, :severity
+    attr_reader :linter, :filename, :location, :description, :severity
 
+    # @param linter [SCSSLint::Linter]
     # @param filename [String]
     # @param location [SCSSLint::Location]
     # @param description [String]
     # @param severity [Symbol]
-    def initialize(filename, location, description, severity = :warning)
+    def initialize(linter, filename, location, description, severity = :warning)
+      @linter      = linter
       @filename    = filename
       @location    = location
       @description = description

data/lib/scss_lint/linter.rb

@@ -18,21 +18,16 @@ module SCSSLint
       visit(engine.tree)
     end
 
+  protected
+
     # Helper for creating lint from a parse tree node
     #
-    # @param node_or_line [Sass::Script::Tree::Node, Sass::Engine::Line]
+    # @param node_or_line_or_location [Sass::Script::Tree::Node, Fixnum, SCSSLint::Location]
     # @param message [String]
-    def add_lint(node_or_line, message)
-      location = if node_or_line.respond_to?(:source_range) && node_or_line.source_range
-                   location_from_range(node_or_line.source_range)
-                 elsif node_or_line.respond_to?(:line)
-                   Location.new(node_or_line.line)
-                 else
-                   Location.new(node_or_line)
-                 end
-
-      @lints << Lint.new(engine.filename,
-                         location,
+    def add_lint(node_or_line_or_location, message)
+      @lints << Lint.new(self,
+                         engine.filename,
+                         extract_location(node_or_line_or_location),
                          message)
     end
 
@@ -130,5 +125,20 @@ module SCSSLint
         visit(child)
       end
     end
+
+  private
+
+    def extract_location(node_or_line_or_location)
+      if node_or_line_or_location.is_a?(Location)
+        node_or_line_or_location
+      elsif node_or_line_or_location.respond_to?(:source_range) &&
+            node_or_line_or_location.source_range
+        location_from_range(node_or_line_or_location.source_range)
+      elsif node_or_line_or_location.respond_to?(:line)
+        Location.new(node_or_line_or_location.line)
+      else
+        Location.new(node_or_line_or_location)
+      end
+    end
   end
 end

data/lib/scss_lint/linter/border_zero.rb

@@ -5,10 +5,9 @@ module SCSSLint
 
     def visit_prop(node)
       return unless BORDER_PROPERTIES.include?(node.name.first.to_s)
+      return unless node.value.to_sass.strip == 'none'
 
-      if node.value.to_sass.strip == 'none'
-        add_lint(node, '`border: 0;` is preferred over `border: none;`')
-      end
+      add_lint(node, '`border: 0;` is preferred over `border: none;`')
     end
 
   private

data/lib/scss_lint/linter/capitalization_in_selector.rb

@@ -31,11 +31,11 @@ module SCSSLint
 
     def check(node, selector_name = nil)
       name = node.name.join
-      if name =~ /[A-Z]/
-        selector_name ||= node.class.name.split('::').last
-        add_lint(node, "#{selector_name} `#{name}` in selector should be " \
-                       "written in all lowercase as `#{name.downcase}`")
-      end
+      return unless name =~ /[A-Z]/
+
+      selector_name ||= node.class.name.split('::').last
+      add_lint(node, "#{selector_name} `#{name}` in selector should be " \
+                     "written in all lowercase as `#{name.downcase}`")
     end
   end
 end

data/lib/scss_lint/linter/color_keyword.rb

@@ -4,9 +4,10 @@ module SCSSLint
   class Linter::ColorKeyword < Linter
     include LinterRegistry
 
+    COLOR_REGEX = /(#?[a-f0-9]{3,6}|[a-z]+)/i
+
     def visit_script_color(node)
       color = source_from_range(node.source_range)[COLOR_REGEX, 1]
-
       add_color_lint(node, color) if color_keyword?(color)
     end
 
@@ -20,8 +21,6 @@ module SCSSLint
 
   private
 
-    COLOR_REGEX = /(#?[a-f0-9]{3,6}|[a-z]+)/i
-
     def add_color_lint(node, original)
       hex_form = Sass::Script::Value::Color.new(color_rgb(original)).tap do |color|
         color.options = {} # `inspect` requires options to be set
@@ -29,7 +28,7 @@ module SCSSLint
 
       add_lint(node,
                "Color `#{original}` should be written in hexadecimal form " \
-               "as `#{shortest_hex_form(hex_form)}`")
+               "as `#{hex_form}`")
     end
 
     def color_keyword?(string)

data/lib/scss_lint/linter/compass/property_with_mixin.rb

@@ -4,16 +4,8 @@ module SCSSLint
     include LinterRegistry
 
     def visit_prop(node)
-      prop_name = node.name.join
-
-      if PROPERTIES_WITH_MIXINS.include?(prop_name)
-        add_lint node, "Use the Compass `#{prop_name}` mixin instead of the property"
-      end
-
-      if prop_name == 'display' && node.value.to_sass == 'inline-block'
-        add_lint node,
-                 'Use the Compass `inline-block` mixin instead of `display: inline-block`'
-      end
+      check_for_properties_with_mixins(node)
+      check_for_inline_block(node)
     end
 
   private
@@ -29,5 +21,20 @@ module SCSSLint
       text-shadow
       transform
     ].to_set
+
+    def check_for_properties_with_mixins(node)
+      prop_name = node.name.join
+      return unless PROPERTIES_WITH_MIXINS.include?(prop_name)
+
+      add_lint node, "Use the Compass `#{prop_name}` mixin instead of the property"
+    end
+
+    def check_for_inline_block(node)
+      prop_name = node.name.join
+      return unless prop_name == 'display' && node.value.to_sass == 'inline-block'
+
+      add_lint node,
+               'Use the Compass `inline-block` mixin instead of `display: inline-block`'
+    end
   end
 end

data/lib/scss_lint/linter/empty_line_between_blocks.rb

@@ -36,11 +36,10 @@ module SCSSLint
     end
 
     def check_following_node(node, type)
-      if (following_node = next_node(node)) && (next_start_line = following_node.line)
-        unless engine.lines[next_start_line - 2].strip.empty?
-          add_lint(next_start_line - 1, MESSAGE_FORMAT % [type, 'followed'])
-        end
-      end
+      return unless (following_node = next_node(node)) && (next_start_line = following_node.line)
+      return if engine.lines[next_start_line - 2].strip.empty?
+
+      add_lint(next_start_line - 1, MESSAGE_FORMAT % [type, 'followed'])
     end
 
     # In cases where the previous node is not a block declaration, we won't

data/lib/scss_lint/linter/final_newline.rb

@@ -3,7 +3,7 @@ module SCSSLint
   class Linter::FinalNewline < Linter
     include LinterRegistry
 
-    def visit_root(node)
+    def visit_root(_node)
       return if engine.lines.empty?
 
       ends_with_newline = engine.lines[-1][-1] == "\n"

data/lib/scss_lint/linter/hex_length.rb

@@ -0,0 +1,56 @@
+module SCSSLint
+  # Checks that hexadecimal colors are written in the desired number of
+  # characters.
+  class Linter::HexLength < Linter
+    include LinterRegistry
+
+    HEX_REGEX = /(#(\h{3}|\h{6}))(?!\h)/
+
+    def visit_script_color(node)
+      return unless hex = source_from_range(node.source_range)[HEX_REGEX, 1]
+      check_hex(hex, node)
+    end
+
+    def visit_script_string(node)
+      return unless node.type == :identifier
+
+      node.value.scan(HEX_REGEX) do |match|
+        check_hex(match.first, node)
+      end
+    end
+
+  private
+
+    def check_hex(hex, node)
+      return if expected(hex) == hex
+
+      add_lint(node, "Color `#{hex}` should be written as `#{expected(hex)}`")
+    end
+
+    def expected(hex)
+      return short_hex_form(hex) if can_be_shorter?(hex) && short_style?
+      return long_hex_form(hex) if hex.length == 4 && !short_style?
+
+      hex
+    end
+
+    def can_be_shorter?(hex)
+      hex.length == 7 &&
+        hex[1] == hex[2] &&
+        hex[3] == hex[4] &&
+        hex[5] == hex[6]
+    end
+
+    def short_hex_form(hex)
+      [hex[0..1], hex[3], hex[5]].join
+    end
+
+    def long_hex_form(hex)
+      [hex[0..1], hex[1], hex[2], hex[2], hex[3], hex[3]].join
+    end
+
+    def short_style?
+      config['style'] == 'short'
+    end
+  end
+end

data/lib/scss_lint/linter/hex_notation.rb

@@ -0,0 +1,38 @@
+module SCSSLint
+  # Checks if hexadecimal colors are written lowercase / uppercase.
+  class Linter::HexNotation < Linter
+    include LinterRegistry
+
+    HEX_REGEX = /(#(\h{3}|\h{6}))(?!\h)/
+
+    def visit_script_color(node)
+      return unless hex = source_from_range(node.source_range)[HEX_REGEX, 1]
+      check_hex(hex, node)
+    end
+
+    def visit_script_string(node)
+      return unless node.type == :identifier
+
+      node.value.scan(HEX_REGEX) do |match|
+        check_hex(match.first, node)
+      end
+    end
+
+  private
+
+    def check_hex(hex, node)
+      return if expected(hex) == hex
+
+      add_lint(node, "Color `#{hex}` should be written as `#{expected(hex)}`")
+    end
+
+    def expected(color)
+      return color.downcase if lowercase_style?
+      color.upcase
+    end
+
+    def lowercase_style?
+      config['style'] == 'lowercase'
+    end
+  end
+end

data/lib/scss_lint/linter/hex_validation.rb

@@ -0,0 +1,23 @@
+module SCSSLint
+  # Checks for invalid hexadecimal colors.
+  class Linter::HexValidation < Linter
+    include LinterRegistry
+
+    def visit_script_string(node)
+      return unless node.type == :identifier
+
+      node.value.scan(/(#\h+)/) do |match|
+        check_hex(match.first, node)
+      end
+    end
+
+  private
+
+    HEX_REGEX = /(#(\h{3}|\h{6}))(?!\h)/
+
+    def check_hex(hex, node)
+      return if HEX_REGEX.match(hex)
+      add_lint(node, "Colors must have either three or six digits: `#{hex}`")
+    end
+  end
+end

data/lib/scss_lint/linter/id_with_extraneous_selector.rb

@@ -11,13 +11,12 @@ module SCSSLint
         !simple.is_a?(Sass::Selector::Id) &&
           !simple.is_a?(Sass::Selector::Pseudo)
       end
+      return unless can_be_simplified
 
-      if can_be_simplified
-        # TODO: Sass::Selector::SimpleSequence#source_range sometimes lies about
-        # its line, so reference `#line` directly
-        add_lint(seq.line, "Selector `#{seq}` can be simplified to `#{id_sel}`, " \
-                           'since IDs should be uniquely identifying')
-      end
+      # TODO: Sass::Selector::SimpleSequence#source_range sometimes lies about
+      # its line, so reference `#line` directly
+      add_lint(seq.line, "Selector `#{seq}` can be simplified to `#{id_sel}`, " \
+                         'since IDs should be uniquely identifying')
     end
   end
 end

data/lib/scss_lint/linter/indentation.rb

@@ -3,7 +3,7 @@ module SCSSLint
   class Linter::Indentation < Linter
     include LinterRegistry
 
-    def visit_root(node)
+    def visit_root(_node)
       @indent_width = config['width']
       @indent = 0
       yield
@@ -29,12 +29,12 @@ module SCSSLint
 
       actual_indent = engine.lines[node.line - 1][/^(\s*)/, 1]
 
-      if actual_indent.length != @indent
-        add_lint(node.line,
-                 "Line should be indented #{@indent} spaces, " \
-                 "but was indented #{actual_indent.length} spaces")
-        return true
-      end
+      return if actual_indent.length == @indent
+
+      add_lint(node.line,
+               "Line should be indented #{@indent} spaces, " \
+               "but was indented #{actual_indent.length} spaces")
+      true
     end
 
     # Deal with `else` statements
@@ -44,6 +44,7 @@ module SCSSLint
     end
 
     # Define node types that increase indentation level
+    alias_method :visit_atroot,    :check_and_visit_children
     alias_method :visit_directive, :check_and_visit_children
     alias_method :visit_each,      :check_and_visit_children
     alias_method :visit_for,       :check_and_visit_children

data/lib/scss_lint/linter/leading_zero.rb

@@ -7,11 +7,9 @@ module SCSSLint
       return unless node.type == :identifier
 
       non_string_values = remove_quoted_strings(node.value).split
-
       non_string_values.each do |value|
-        if number = value[FRACTIONAL_DIGIT_REGEX, 1]
-          check_number(node, number)
-        end
+        next unless number = value[FRACTIONAL_DIGIT_REGEX, 1]
+        check_number(node, number)
       end
     end
 
@@ -41,12 +39,10 @@ module SCSSLint
     def check_number(node, original_number)
       style = config.fetch('style', 'exclude_zero')
       convention = CONVENTIONS[style]
+      return if convention[:validator].call(original_number)
 
-      unless convention[:validator].call(original_number)
-        corrected = convention[:converter].call(original_number)
-
-        add_lint(node, convention[:explanation] % [original_number, corrected])
-      end
+      corrected = convention[:converter].call(original_number)
+      add_lint(node, convention[:explanation] % [original_number, corrected])
     end
   end
 end

data/lib/scss_lint/linter/mergeable_selector.rb

@@ -0,0 +1,59 @@
+module SCSSLint
+  # Checks for rule sets that can be merged with other rule sets.
+  class Linter::MergeableSelector < Linter
+    include LinterRegistry
+
+    def check_node(node)
+      node.children.each_with_object([]) do |child_node, seen_nodes|
+        next unless child_node.is_a?(Sass::Tree::RuleNode)
+
+        mergeable_node = find_mergeable_node(child_node, seen_nodes)
+        seen_nodes << child_node
+        next unless mergeable_node
+
+        add_lint child_node.line,
+                 "Merge rule `#{node_rule(child_node)}` with rule " \
+                 "on line #{mergeable_node.line}"
+      end
+
+      yield # Continue linting children
+    end
+
+    alias_method :visit_root, :check_node
+    alias_method :visit_rule, :check_node
+
+  private
+
+    def find_mergeable_node(node, seen_nodes)
+      seen_nodes.find do |seen_node|
+        equal?(node, seen_node) ||
+          (config['force_nesting'] && nested?(node, seen_node))
+      end
+    end
+
+    def equal?(node1, node2)
+      node_rule(node1) == node_rule(node2)
+    end
+
+    def nested?(node1, node2)
+      return false unless single_rule?(node1) && single_rule?(node2)
+
+      rule1 = node_rule(node1)
+      rule2 = node_rule(node2)
+      subrule?(rule1, rule2) || subrule?(rule2, rule1)
+    end
+
+    def node_rule(node)
+      node.rule.join
+    end
+
+    def single_rule?(node)
+      node.parsed_rules.members.count == 1
+    end
+
+    def subrule?(rule1, rule2)
+      "#{rule1}".start_with?("#{rule2} ") ||
+        "#{rule1}".start_with?("#{rule2}.")
+    end
+  end
+end

data/lib/scss_lint/linter/name_format.rb

@@ -46,10 +46,10 @@ module SCSSLint
     ].to_set
 
     def check_name(node, node_type, node_text = node.name)
-      if convention = violated_convention(node_text)
-        add_lint(node, "Name of #{node_type} `#{node_text}` should be " \
-                       "written #{convention[:explanation]}")
-      end
+      return unless violation = violated_convention(node_text)
+
+      add_lint(node, "Name of #{node_type} `#{node_text}` should be " \
+                     "written #{violation[:explanation]}")
     end
 
     def check_placeholder(node)

data/lib/scss_lint/linter/placeholder_in_extend.rb

@@ -7,11 +7,10 @@ module SCSSLint
       # The array returned by the parser is a bit awkward in that it splits on
       # every word boundary (so %placeholder becomes ['%', 'placeholder']).
       selector = node.selector.join
+      return if selector.start_with?('%')
 
-      unless selector.start_with?('%')
-        add_lint(node,
-                 'Prefer using placeholder selectors (e.g. %some-placeholder) with @extend')
-      end
+      add_lint(node, 'Prefer using placeholder selectors (e.g. ' \
+                     '%some-placeholder) with @extend')
     end
   end
 end

data/lib/scss_lint/linter/property_sort_order.rb

@@ -21,10 +21,10 @@ module SCSSLint
         .sort { |a, b| compare_properties(a, b) }
 
       sorted_props.each_with_index do |prop, index|
-        if prop != sortable_prop_info[index]
-          add_lint(sortable_props[index], MESSAGE)
-          break
-        end
+        next unless prop != sortable_prop_info[index]
+
+        add_lint(sortable_props[index], MESSAGE)
+        break
       end
 
       yield # Continue linting children

data/lib/scss_lint/linter/property_spelling.rb

@@ -3,7 +3,7 @@ module SCSSLint
   class Linter::PropertySpelling < Linter
     include LinterRegistry
 
-    def visit_root(node)
+    def visit_root(_node)
       @extra_properties = config['extra_properties'].to_set
       yield # Continue linting children
     end
@@ -16,10 +16,10 @@ module SCSSLint
 
       # Ignore vendor-prefixed properties
       return if name.start_with?('-')
+      return if KNOWN_PROPERTIES.include?(name) ||
+        @extra_properties.include?(name)
 
-      unless KNOWN_PROPERTIES.include?(name) || @extra_properties.include?(name)
-        add_lint(node, "Unknown property #{name}")
-      end
+      add_lint(node, "Unknown property #{name}")
     end
 
   private

data/lib/scss_lint/linter/selector_depth.rb

@@ -3,7 +3,7 @@ module SCSSLint
   class Linter::SelectorDepth < Linter
     include LinterRegistry
 
-    def visit_root(node)
+    def visit_root(_node)
       @max_depth = config['max_depth']
       @depth = 0
       yield # Continue

data/lib/scss_lint/linter/shorthand.rb

@@ -37,25 +37,23 @@ module SCSSLint
       # HACK: node_parent may not be initialized at this point, so we need to
       # set it ourselves
       value.node_parent = literal
+      return unless value.is_a?(Sass::Script::Value::String)
 
-      if value.is_a?(Sass::Script::Value::String)
-        check_script_string(prop, value)
-      end
+      check_script_string(prop, value)
     end
 
-    LIST_LITERAL_REGEX = %r{
+    LIST_LITERAL_REGEX = /
       \A
       (\S+\s+\S+(\s+\S+){0,2})   # Two to four values separated by spaces
       (\s+!\w+)?                 # Ignore `!important` priority overrides
       \z
-    }x
+    /x
 
     def check_script_string(prop, script_string)
       return unless script_string.type == :identifier
+      return unless values = script_string.value.strip[LIST_LITERAL_REGEX, 1]
 
-      if values = script_string.value.strip[LIST_LITERAL_REGEX, 1]
-        check_shorthand(prop, script_string, values.split)
-      end
+      check_shorthand(prop, script_string, values.split)
     end
 
     def check_shorthand(prop, node, values)
@@ -82,10 +80,10 @@ module SCSSLint
     end
 
     def can_condense_to_one_value(top, right, bottom, left)
-      if top == right
-        top == bottom && (bottom == left || left.nil?) ||
-          bottom.nil? && left.nil?
-      end
+      return unless top == right
+
+      top == bottom && (bottom == left || left.nil?) ||
+        bottom.nil? && left.nil?
     end
 
     def can_condense_to_two_values(top, right, bottom, left)

data/lib/scss_lint/linter/single_line_per_selector.rb

@@ -21,7 +21,7 @@ module SCSSLint
     # Sass::Script::Nodes, we need to condense it into a single string that we
     # can run a regex against.
     def condense_to_string(sequence_list)
-      sequence_list.select { |item| item.is_a?(String) }.inject(:+)
+      sequence_list.select { |item| item.is_a?(String) }.inject(:+) || ''
     end
 
     # Removes extra spacing between lines in a comma-separated sequence due to

data/lib/scss_lint/linter/space_after_comma.rb

@@ -90,10 +90,9 @@ module SCSSLint
           spaces += 1
           offset += 1
         end
+        next if spaces == EXPECTED_SPACES_AFTER_COMMA
 
-        if spaces != EXPECTED_SPACES_AFTER_COMMA
-          add_lint arg, "Commas in #{arg_type} should be followed by a single space"
-        end
+        add_lint arg, "Commas in #{arg_type} should be followed by a single space"
       end
     end
   end

data/lib/scss_lint/linter/space_after_property_name.rb

@@ -5,9 +5,8 @@ module SCSSLint
     include LinterRegistry
 
     def visit_prop(node)
-      if character_at(node.name_source_range.end_pos) != ':'
-        add_lint node, 'Property name should be immediately followed by a colon'
-      end
+      return unless character_at(node.name_source_range.end_pos) != ':'
+      add_lint node, 'Property name should be immediately followed by a colon'
     end
   end
 end

data/lib/scss_lint/linter/space_between_parens.rb

@@ -3,7 +3,7 @@ module SCSSLint
   class Linter::SpaceBetweenParens < Linter
     include LinterRegistry
 
-    def visit_root(node)
+    def visit_root(_node)
       @spaces = config['spaces']
 
       engine.lines.each_with_index do |line, index|
@@ -15,22 +15,21 @@ module SCSSLint
             [ ]*\)
           )?
         /x) do |match|
-          check(match[2], index, engine) if match[2]
+          check(match[2], index) if match[2]
         end
       end
     end
 
   private
 
-    def check(str, index, engine)
+    def check(str, index)
       spaces = str.count ' '
+      return if spaces == @spaces
 
-      if spaces != @spaces
-        location = Location.new(index + 1)
-        message = "Expected #{pluralize(@spaces, 'space')} " \
-                  "between parentheses instead of #{spaces}"
-        @lints << Lint.new(engine.filename, location, message)
-      end
+      location = Location.new(index + 1)
+      message = "Expected #{pluralize(@spaces, 'space')} " \
+                "between parentheses instead of #{spaces}"
+      add_lint(location, message)
     end
   end
 end

data/lib/scss_lint/linter/string_quotes.rb

@@ -43,9 +43,8 @@ module SCSSLint
     }x
 
     def extract_string_without_quotes(source)
-      if match = STRING_WITHOUT_QUOTES_REGEX.match(source)
-        match[1]
-      end
+      return unless match = STRING_WITHOUT_QUOTES_REGEX.match(source)
+      match[1]
     end
 
     def check_double_quotes(node, string)

data/lib/scss_lint/linter/unnecessary_mantissa.rb

@@ -16,22 +16,22 @@ module SCSSLint
 
     def visit_script_number(node)
       return unless match = REAL_NUMBER_REGEX.match(source_from_range(node.source_range))
+      return unless unnecessary_mantissa?(match[:mantissa])
 
-      if unnecessary_mantissa?(match[:mantissa])
-        add_lint(node, MESSAGE_FORMAT % [match[:number], match[:integer], match[:units]])
-      end
+      add_lint(node, MESSAGE_FORMAT % [match[:number], match[:integer],
+                                       match[:units]])
     end
 
   private
 
-    REAL_NUMBER_REGEX = %r{
+    REAL_NUMBER_REGEX = /
       \b(?<number>
         (?<integer>\d*)
         \.
         (?<mantissa>\d+)
         (?<units>\w*)
       )\b
-    }ix
+    /ix
 
     MESSAGE_FORMAT = '`%s` should be written without the mantissa as `%s%s`'
 

data/lib/scss_lint/linter/url_quotes.rb

@@ -18,9 +18,8 @@ module SCSSLint
   private
 
     def check(node, string)
-      if string =~ /^\s*url\(\s*[^"']/
-        add_lint(node, 'URLs should be enclosed in quotes')
-      end
+      return unless string =~ /^\s*url\(\s*[^"']/
+      add_lint(node, 'URLs should be enclosed in quotes')
     end
   end
 end

data/lib/scss_lint/linter/zero_unit.rb

@@ -7,31 +7,33 @@ module SCSSLint
       return unless node.type == :identifier
 
       node.value.scan(ZERO_UNIT_REGEX) do |match|
+        next unless zero_with_length_units?(match.first)
         add_lint(node, MESSAGE_FORMAT % match.first)
       end
     end
 
     def visit_script_number(node)
       length = source_from_range(node.source_range)[ZERO_UNIT_REGEX, 1]
+      return unless zero_with_length_units?(length)
 
-      if node.value == 0 && zero_with_units?(length)
-        add_lint(node, MESSAGE_FORMAT % length)
-      end
+      add_lint(node, MESSAGE_FORMAT % length)
     end
 
   private
 
-    ZERO_UNIT_REGEX = %r{
+    ZERO_UNIT_REGEX = /
       \b
-      (?<!\.|\#)    # Ignore zeroes following `#` or `.` (colors / decimals)
-      (0[a-z]+)     # Zero followed by letters (indicating some sort of unit)
+      (?<!\.|\#)    # Ignore zeroes following `#` (colors) or `.` (decimals)
+      (0[a-z]+)     # Zero followed by letters indicating some sort of unit
       \b
-    }ix
+    /ix
 
     MESSAGE_FORMAT = '`%s` should be written without units as `0`'
 
-    def zero_with_units?(string)
-      string =~ /^0[a-z]+/
+    LENGTH_UNITS = %w[em ex ch rem vw vh vmin vmax cm mm in pt pc px].to_set
+
+    def zero_with_length_units?(string)
+      string =~ /^0([a-z]+)/ && LENGTH_UNITS.include?(Regexp.last_match(1))
     end
   end
 end

data/lib/scss_lint/reporter.rb

@@ -3,6 +3,10 @@ module SCSSLint
   class Reporter
     attr_reader :lints
 
+    def self.descendants
+      ObjectSpace.each_object(Class).select { |klass| klass < self }
+    end
+
     def initialize(lints)
       @lints = lints
     end

data/lib/scss_lint/reporter/config_reporter.rb

@@ -0,0 +1,26 @@
+module SCSSLint
+  # Returns a YAML configuration where all linters are disabled which
+  # caused a lint.
+  class Reporter::ConfigReporter < Reporter
+    def report_lints
+      { 'linters' => disabled_linters }.to_yaml unless lints.empty?
+    end
+
+  private
+
+    def disabled_linters
+      linters.each_with_object({}) do |linter, m|
+        m[linter] = { 'enabled' => false }
+      end
+    end
+
+    def linters
+      lints.map { |lint| linter_name(lint.linter) }.compact.uniq.sort
+    end
+
+    def linter_name(linter)
+      return unless linter
+      linter.class.to_s.split('::').last
+    end
+  end
+end

data/lib/scss_lint/reporter/default_reporter.rb

@@ -2,13 +2,13 @@ module SCSSLint
   # Reports a single line per lint.
   class Reporter::DefaultReporter < Reporter
     def report_lints
-      if lints.any?
-        lints.map do |lint|
-          type = lint.error? ? '[E]'.color(:red) : '[W]'.color(:yellow)
-          "#{lint.filename.color(:cyan)}:" << "#{lint.location.line}".color(:magenta) <<
-                                      " #{type} #{lint.description}"
-        end.join("\n") + "\n"
-      end
+      return unless lints.any?
+
+      lints.map do |lint|
+        type = lint.error? ? '[E]'.color(:red) : '[W]'.color(:yellow)
+        "#{lint.filename.color(:cyan)}:" << "#{lint.location.line}".color(:magenta) <<
+                                    " #{type} #{lint.description}"
+      end.join("\n") + "\n"
     end
   end
 end

data/lib/scss_lint/reporter/xml_reporter.rb

@@ -9,10 +9,10 @@ module SCSSLint
         output << "<file name=#{filename.encode(xml: :attr)}>"
 
         file_lints.each do |lint|
-          output << "<issue line=\"#{lint.location.line}\" " <<
-                           "column=\"#{lint.location.column}\" " <<
-                           "length=\"#{lint.location.length}\" " <<
-                           "severity=\"#{lint.severity}\" " <<
+          output << "<issue line=\"#{lint.location.line}\" " \
+                           "column=\"#{lint.location.column}\" " \
+                           "length=\"#{lint.location.length}\" " \
+                           "severity=\"#{lint.severity}\" " \
                            "reason=#{lint.description.encode(xml: :attr)} />"
         end
 

data/lib/scss_lint/runner.rb

@@ -49,9 +49,9 @@ module SCSSLint
         end
       end
     rescue Sass::SyntaxError => ex
-      @lints << Lint.new(ex.sass_filename, Location.new(ex.sass_line), ex.to_s, :error)
+      @lints << Lint.new(nil, ex.sass_filename, Location.new(ex.sass_line), ex.to_s, :error)
     rescue FileEncodingError => ex
-      @lints << Lint.new(file, Location.new, ex.to_s, :error)
+      @lints << Lint.new(nil, file, Location.new, ex.to_s, :error)
     end
   end
 end

data/lib/scss_lint/sass/tree.rb

@@ -15,7 +15,7 @@ module Sass::Tree
     # Sass::Script::Variable nodes with no line numbers. This adds the line
     # numbers back in so lint reporting works for those nodes.
     def add_line_numbers_to_args(arg_list)
-      arg_list.each do |variable, default_expr|
+      arg_list.each do |variable, _default_expr|
         add_line_number(variable)
       end
     end

data/lib/scss_lint/utils.rb

@@ -20,17 +20,6 @@ module SCSSLint
                     .split
     end
 
-    def shortest_hex_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]
-    end
-
     # Takes a string like `hello "world" 'how are' you` and turns it into:
     # `hello   you`.
     # This is useful for scanning for keywords in shorthand properties or lists

data/lib/scss_lint/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module SCSSLint
-  VERSION = '0.23.1'
+  VERSION = '0.24.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -71,16 +71,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.0
 description: Configurable tool for writing clean and consistent SCSS
 email:
 - eng@causes.com
@@ -99,6 +99,7 @@ files:
 - lib/scss_lint/reporter/files_reporter.rb
 - lib/scss_lint/reporter/xml_reporter.rb
 - lib/scss_lint/reporter/default_reporter.rb
+- lib/scss_lint/reporter/config_reporter.rb
 - lib/scss_lint/runner.rb
 - lib/scss_lint/reporter.rb
 - lib/scss_lint/lint.rb
@@ -112,7 +113,9 @@ files:
 - lib/scss_lint/linter/space_after_comma.rb
 - lib/scss_lint/linter/space_before_brace.rb
 - lib/scss_lint/linter/capitalization_in_selector.rb
+- lib/scss_lint/linter/hex_length.rb
 - lib/scss_lint/linter/indentation.rb
+- lib/scss_lint/linter/mergeable_selector.rb
 - lib/scss_lint/linter/trailing_semicolon_after_property_value.rb
 - lib/scss_lint/linter/shorthand.rb
 - lib/scss_lint/linter/final_newline.rb
@@ -121,8 +124,8 @@ files:
 - lib/scss_lint/linter/declaration_order.rb
 - lib/scss_lint/linter/zero_unit.rb
 - lib/scss_lint/linter/placeholder_in_extend.rb
-- lib/scss_lint/linter/duplicate_root.rb
 - lib/scss_lint/linter/selector_depth.rb
+- lib/scss_lint/linter/hex_validation.rb
 - lib/scss_lint/linter/compass/property_with_mixin.rb
 - lib/scss_lint/linter/space_after_property_name.rb
 - lib/scss_lint/linter/property_spelling.rb
@@ -134,7 +137,6 @@ files:
 - lib/scss_lint/linter/debug_statement.rb
 - lib/scss_lint/linter/duplicate_property.rb
 - lib/scss_lint/linter/property_sort_order.rb
-- lib/scss_lint/linter/hex_format.rb
 - lib/scss_lint/linter/color_keyword.rb
 - lib/scss_lint/linter/string_quotes.rb
 - lib/scss_lint/linter/leading_zero.rb
@@ -142,6 +144,7 @@ files:
 - lib/scss_lint/linter/comment.rb
 - lib/scss_lint/linter/empty_rule.rb
 - lib/scss_lint/linter/single_line_per_selector.rb
+- lib/scss_lint/linter/hex_notation.rb
 - lib/scss_lint/linter/url_format.rb
 - lib/scss_lint/cli.rb
 - lib/scss_lint/engine.rb

data/lib/scss_lint/linter/duplicate_root.rb

@@ -1,34 +0,0 @@
-module SCSSLint
-  # Checks for identical root selectors.
-  class Linter::DuplicateRoot < Linter
-    include LinterRegistry
-
-    def visit_root(node)
-      # Root rules are evaluated per document, so use new hashes for eash file
-      @roots = {}
-      yield # Continue linting children
-    end
-
-    def visit_rule(node)
-      if @roots[node.rule]
-        add_lint node.line,
-                 "Merge root rule `#{node.rule.join}` with identical " \
-                 "rule on line #{@roots[node.rule].line}"
-      else
-        @roots[node.rule] = node
-      end
-
-      # Don't yield so we only check one level deep
-    end
-
-    # Define stubs so we don't check rules nested in other constructs
-    %w[
-      directive
-      media
-      mixin
-      mixindef
-    ].each do |node_type|
-      define_method("visit_#{node_type}") { |*args| }
-    end
-  end
-end

data/lib/scss_lint/linter/hex_format.rb

@@ -1,34 +0,0 @@
-module SCSSLint
-  # Checks for hexadecimal colors that can be shortened.
-  class Linter::HexFormat < Linter
-    include LinterRegistry
-
-    def visit_script_color(node)
-      return unless color = source_from_range(node.source_range)[HEX_REGEX, 1]
-
-      unless valid_hex_format?(color)
-        add_hex_lint(node, color)
-      end
-    end
-
-    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_hex_form(hex)}`")
-    end
-
-    def valid_hex_format?(hex)
-      hex == shortest_hex_form(hex)
-    end
-  end
-end