scss-lint 0.24.1 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a3663e2870c45af5654c5fea5a7289ac4fb9632
-  data.tar.gz: 1167dbea3c255892fda1ccd621cb47b4b50f632f
+  metadata.gz: d8878aa5e26975ddb7c46f6bfd18f7db76e50a27
+  data.tar.gz: 729a1794663d878b450c6ed221ad3bd538c5f5bc
 SHA512:
-  metadata.gz: 507b9deb0e2cbcde999f141ae35d9ebba74e80e045054334a0d448a94afadc3934b5963d88276cfee4be1f8ee98d3b1b4c0136f2ad1030b75554f9170a052c79
-  data.tar.gz: 67c939b682e3b4f05d260ebc771a8a0c68455c4766025badf8d69ccecb91ffddabe01ef1b68af2bb69434707ea21c41bf6465645a8475d43125bbf13ffe43657
+  metadata.gz: 329e54beb7daf2457817fb6e9be9c69f603b3b058d11f1dc241fc36f25f7038b524f80e2e7a332b6bfe2f53d4f5e80b80cac202641489ff6a643faca0849d6ea
+  data.tar.gz: ee4adc133055f837029d44500a0ae360829985922fb96a1dbc6fe76da64d5d318b6d94b1c223855448b69fca2e602f143eb6e6c8b2f0c6f1bb685f9d6bd95782

data/config/default.yml

@@ -21,6 +21,10 @@ linters:
   DuplicateProperty:
     enabled: true
 
+  ElsePlacement:
+    enabled: true
+    style: same_line # or 'new_line'
+
   EmptyLineBetweenBlocks:
     enabled: true
     ignore_single_line_blocks: true
@@ -87,6 +91,7 @@ linters:
 
   SpaceAfterPropertyColon:
     enabled: true
+    style: one_space # or 'no_space', or 'at_least_one_space', or 'aligned'
 
   SpaceAfterPropertyName:
     enabled: true

data/lib/scss_lint/linter/else_placement.rb

@@ -0,0 +1,48 @@
+module SCSSLint
+  # Checks where `@else` and `@else if` directives are placed with respect to
+  # the previous curly brace.
+  class Linter::ElsePlacement < Linter
+    include LinterRegistry
+
+    def visit_if(node)
+      visit_else(node, node.else) if node.else
+    end
+
+    def visit_else(if_node, else_node)
+      # Check each @else branch if there are multiple `@else if`s
+      visit_else(else_node, else_node.else) if else_node.else
+
+      # Skip @else statements on the same line as the previous @if, since we
+      # don't care about placement in that case
+      return if if_node.line == else_node.line
+
+      spaces = 0
+      while (char = character_at(else_node.source_range.start_pos, - (spaces + 1)))
+        if char == '}'
+          curly_on_same_line = true
+          break
+        end
+        spaces += 1
+      end
+
+      check_placement(else_node, curly_on_same_line)
+    end
+
+  private
+
+    def check_placement(else_node, curly_on_same_line)
+      if same_line_preferred?
+        unless curly_on_same_line
+          add_lint(else_node,
+                   '@else should be placed on same line as previous curly brace')
+        end
+      elsif curly_on_same_line
+        add_lint(else_node, '@else should be placed on its own line')
+      end
+    end
+
+    def same_line_preferred?
+      config['style'] == 'same_line'
+    end
+  end
+end

data/lib/scss_lint/linter/empty_line_between_blocks.rb

@@ -72,12 +72,5 @@ module SCSSLint
       index = siblings.index(node)
       siblings[index - 1] if index > 0 && siblings.count > 1
     end
-
-    def node_siblings(node)
-      return unless node && node.node_parent
-      node.node_parent
-          .children
-          .select { |child| child.is_a?(Sass::Tree::Node) }
-    end
   end
 end

data/lib/scss_lint/linter/indentation.rb

@@ -25,7 +25,9 @@ module SCSSLint
 
       # Ignore the case where the node is on the same line as its previous
       # sibling or its parent, as indentation isn't possible
-      return if (previous = previous_node(node)) && previous.line == node.line
+      return if (previous = previous_node(node)) &&
+        (previous.line == node.line ||
+         previous.source_range.end_pos.line == node.line)
 
       actual_indent = engine.lines[node.line - 1][/^(\s*)/, 1]
 
@@ -43,8 +45,34 @@ module SCSSLint
       visit(node.else) if node.else
     end
 
+    # Need to define this explicitly since @at-root directives can contain
+    # inline selectors which produces the same parse tree as if the selector was
+    # nested within it. For example:
+    #
+    #   @at-root {
+    #     .something {
+    #       ...
+    #     }
+    #   }
+    #
+    # ...and...
+    #
+    #   @at-root .something {
+    #     ...
+    #   }
+    #
+    # ...produce the same parse tree, but result in different indentation
+    # levels.
+    def visit_atroot(node, &block)
+      if at_root_contains_inline_selector?(node)
+        return if check_indentation(node)
+        yield
+      else
+        check_and_visit_children(node, &block)
+      end
+    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
@@ -66,5 +94,13 @@ module SCSSLint
     alias_method :visit_return,    :check_indentation
     alias_method :visit_variable,  :check_indentation
     alias_method :visit_warn,      :check_indentation
+
+  private
+
+    def at_root_contains_inline_selector?(node)
+      return unless node.children.any?
+
+      same_position?(node.source_range.end_pos, node.children.first.source_range.start_pos)
+    end
   end
 end

data/lib/scss_lint/linter/placeholder_in_extend.rb

@@ -4,9 +4,15 @@ module SCSSLint
     include LinterRegistry
 
     def visit_extend(node)
+      # Ignore if it cannot be statically determined that this selector is a
+      # placeholder since its prefix is dynamically generated
+      return if node.selector.first.is_a?(Sass::Script::Tree::Node)
+
       # 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
+
+      # Ignore if this is a placeholder
       return if selector.start_with?('%')
 
       add_lint(node, 'Prefer using placeholder selectors (e.g. ' \

data/lib/scss_lint/linter/space_after_property_colon.rb

@@ -4,25 +4,63 @@ module SCSSLint
   class Linter::SpaceAfterPropertyColon < Linter
     include LinterRegistry
 
-    MINIMUM_SPACES_AFTER_COLON = 1
+    def visit_rule(node)
+      if config['style'] == 'aligned'
+        check_properties_alignment(node)
+      end
+
+      yield # Continue linting children
+    end
 
     def visit_prop(node)
       spaces = spaces_after_colon(node)
 
-      if config['allow_extra_spaces']
-        if spaces < MINIMUM_SPACES_AFTER_COLON
-          add_lint node, 'Colon after property should be followed by ' \
-                         "at least #{pluralize(MINIMUM_SPACES_AFTER_COLON, 'space')}"
-        end
-      elsif spaces != MINIMUM_SPACES_AFTER_COLON
-        add_lint node, 'Colon after property should be followed by ' \
-                       "#{pluralize(MINIMUM_SPACES_AFTER_COLON, 'space')} " \
-                       "instead of #{pluralize(spaces, 'space')}"
+      case config['style']
+      when 'no_space'
+        check_for_no_spaces(node, spaces)
+      when 'one_space'
+        check_for_one_space(node, spaces)
+      when 'at_least_one_space'
+        check_for_at_least_one_space(node, spaces)
       end
     end
 
   private
 
+    def check_for_no_spaces(node, spaces)
+      return if spaces == 0
+      add_lint(node, 'Colon after property should not be followed by any spaces')
+    end
+
+    def check_for_one_space(node, spaces)
+      return if spaces == 1
+      add_lint(node, 'Colon after property should be followed by one space')
+    end
+
+    def check_for_at_least_one_space(node, spaces)
+      return if spaces >= 1
+      add_lint(node, 'Colon after property should be followed by at least one space')
+    end
+
+    def check_properties_alignment(rule_node)
+      properties = rule_node.children.select { |node| node.is_a?(Sass::Tree::PropNode) }
+
+      properties.each_slice(2) do |prop1, prop2|
+        next unless prop2
+        next unless value_offset(prop1) != value_offset(prop2)
+        add_lint(prop1, 'Property values should be aligned')
+        break
+      end
+    end
+
+    # Offset of value for property
+    def value_offset(prop)
+      src_range = prop.name_source_range
+      src_range.start_pos.offset +
+        (src_range.end_pos.offset - src_range.start_pos.offset) +
+        spaces_after_colon(prop)
+    end
+
     def spaces_after_colon(node)
       spaces = 0
       offset = 1

data/lib/scss_lint/utils.rb

@@ -41,8 +41,22 @@ module SCSSLint
       end
     end
 
+    def node_siblings(node)
+      return unless node && node.node_parent
+      node.node_parent
+          .children
+          .select { |child| child.is_a?(Sass::Tree::Node) }
+    end
+
     def pluralize(value, word)
       value == 1 ? "#{value} #{word}" : "#{value} #{word}s"
     end
+
+    # Sass doesn't define an equality operator for Sass::Source::Position
+    # objects, so we define a helper for our own use.
+    def same_position?(pos1, pos2)
+      return unless pos1 && pos2
+      pos1.line == pos2.line && pos1.offset == pos2.offset
+    end
   end
 end

data/lib/scss_lint/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.0
 description: Configurable tool for writing clean and consistent SCSS
 email:
 - eng@causes.com
@@ -125,6 +125,7 @@ files:
 - lib/scss_lint/linter/zero_unit.rb
 - lib/scss_lint/linter/placeholder_in_extend.rb
 - lib/scss_lint/linter/selector_depth.rb
+- lib/scss_lint/linter/else_placement.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