scss-lint 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1861dcef7f2f3be9166fd44664791979a1f1f7b
-  data.tar.gz: 032466f84b7ad63144ebf038d86e5b7b26455dd6
+  metadata.gz: 62de0759332c7a6b7f6875564132d5a57d279ec7
+  data.tar.gz: 7ddb756b1a9f1fb8ce38dfa1809e78d64cade852
 SHA512:
-  metadata.gz: 522188c952f6be108b512e9b606472227e91ccaa9766c223116592d52ba18f30b91ba201cf657ba77da35575914bf16b47c25af1ddf154f72bbe6ff7b3427353
-  data.tar.gz: 4e13aa18990e381d7e8a7d5316975daac70dc2525d7ebdbe24d47bd64786a4f6a4d2151b1e84f2144492bb8a26850bd3318e45eeef4566d49301f0f313f12a73
+  metadata.gz: b432b1c02ea96468df966153142aee54cef52da51b184f1dab3dc019e54d6022a3e3f9ee184d70a36e2a4c928dcc41f78df7515f7d9b748b9fc1e09196aacfea
+  data.tar.gz: 2377c8e052114ac59e5b9b85d67a3e93d15b64a1bcbeb6109c694a6b81a9a0ffb31b3d341bcf640b70116aa8d5bcda9a2938de4e57c85b2c8d6405f20f92a67e

data/config/default.yml

@@ -24,6 +24,9 @@ linters:
   DuplicateProperty:
     enabled: true
 
+  EmptyLineBetweenBlocks:
+    enabled: true
+
   EmptyRule:
     enabled: true
 
@@ -45,6 +48,7 @@ linters:
 
   PropertySpelling:
     enabled: true
+    extra_properties: []
 
   SelectorDepth:
     enabled: true

data/lib/scss_lint/constants.rb

@@ -1,6 +1,7 @@
 # Global application constants.
 module SCSSLint
   SCSS_LINT_HOME = File.realpath(File.join(File.dirname(__FILE__), '..', '..'))
+  SCSS_LINT_DATA = File.join(SCSS_LINT_HOME, 'data')
 
   REPO_URL = 'https://github.com/causes/scss-lint'
   BUG_REPORT_URL = "#{REPO_URL}/issues"

data/lib/scss_lint/linter/empty_line_between_blocks.rb

@@ -0,0 +1,83 @@
+module SCSSLint
+  # Reports the lack of empty lines between block defintions.
+  class Linter::EmptyLineBetweenBlocks < Linter
+    include LinterRegistry
+
+    def visit_function(node)
+      check(node, '@function')
+      yield
+    end
+
+    def visit_mixin(node)
+      # Ignore @includes which don't have any block content
+      check(node, '@include') if node.children
+                                     .any? { |child| child.is_a?(Sass::Tree::Node) }
+      yield
+    end
+
+    def visit_mixindef(node)
+      check(node, '@mixin')
+      yield
+    end
+
+    def visit_rule(node)
+      check(node, 'Rule')
+      yield
+    end
+
+  private
+
+    MESSAGE_FORMAT = '%s declaration should be %s by an empty line'
+
+    def check(node, type)
+      check_preceding_node(node, type)
+      check_following_node(node, type)
+    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
+    end
+
+    # In cases where the previous node is not a block declaration, we won't
+    # have run any checks against it, so we need to check here if the previous
+    # line is an empty line
+    def check_preceding_node(node, type)
+      case prev_node(node)
+      when
+        nil,
+        Sass::Tree::FunctionNode,
+        Sass::Tree::MixinNode,
+        Sass::Tree::MixinDefNode,
+        Sass::Tree::RuleNode,
+        Sass::Tree::CommentNode
+        # Ignore
+      else
+        unless engine.lines[node.line - 2].strip.empty?
+          add_lint(node.line, MESSAGE_FORMAT % [type, 'preceded'])
+        end
+      end
+    end
+
+    def next_node(node)
+      return unless siblings = node_siblings(node)
+      siblings[siblings.index(node) + 1] if siblings.count > 1
+    end
+
+    def prev_node(node)
+      return unless siblings = node_siblings(node)
+      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/property_spelling.rb

@@ -3,6 +3,11 @@ module SCSSLint
   class Linter::PropertySpelling < Linter
     include LinterRegistry
 
+    def visit_root(node)
+      @extra_properties = config['extra_properties'].to_set
+      yield # Continue linting children
+    end
+
     def visit_prop(node)
       # Ignore properties with interpolation
       return if node.name.count > 1 || !node.name.first.is_a?(String)
@@ -12,269 +17,16 @@ module SCSSLint
       # Ignore vendor-prefixed properties
       return if name.start_with?('-')
 
-      unless KNOWN_PROPERTIES.include?(name)
+      unless KNOWN_PROPERTIES.include?(name) || @extra_properties.include?(name)
         add_lint(node, "Unknown property #{name}")
       end
     end
 
   private
 
-    KNOWN_PROPERTIES = %w[
-      @keyframes
-      alignment-adjust
-      alignment-baseline
-      animation
-      animation-delay
-      animation-direction
-      animation-duration
-      animation-fill-mode
-      animation-iteration-count
-      animation-name
-      animation-play-state
-      animation-timing-function
-      appearance
-      backface-visibility
-      background
-      background-attachment
-      background-clip
-      background-color
-      background-image
-      background-origin
-      background-position
-      background-repeat
-      background-size
-      baseline-shift
-      bookmark-label
-      bookmark-level
-      bookmark-target
-      border
-      border-bottom
-      border-bottom-color
-      border-bottom-left-radius
-      border-bottom-right-radius
-      border-bottom-style
-      border-bottom-width
-      border-collapse
-      border-color
-      border-image
-      border-image-outset
-      border-image-repeat
-      border-image-slice
-      border-image-source
-      border-image-width
-      border-left
-      border-left-color
-      border-left-style
-      border-left-width
-      border-radius
-      border-right
-      border-right-color
-      border-right-style
-      border-right-width
-      border-spacing
-      border-style
-      border-top
-      border-top-color
-      border-top-left-radius
-      border-top-right-radius
-      border-top-style
-      border-top-width
-      border-width
-      bottom
-      box-align
-      box-decoration-break
-      box-direction
-      box-flex
-      box-flex-group
-      box-lines
-      box-ordinal-group
-      box-orient
-      box-pack
-      box-shadow
-      box-sizing
-      caption-side
-      clear
-      clip
-      color
-      color-profile
-      column-count
-      column-fill
-      column-gap
-      column-rule
-      column-rule-color
-      column-rule-style
-      column-rule-width
-      column-span
-      column-width
-      columns
-      content
-      counter-increment
-      counter-reset
-      crop
-      cursor
-      direction
-      display
-      dominant-baseline
-      drop-initial-after-adjust
-      drop-initial-after-align
-      drop-initial-before-adjust
-      drop-initial-before-align
-      drop-initial-size
-      drop-initial-value
-      empty-cells
-      fill
-      filter
-      fit
-      fit-position
-      float
-      float-offset
-      font
-      font-family
-      font-size
-      font-size-adjust
-      font-stretch
-      font-style
-      font-variant
-      font-weight
-      grid-columns
-      grid-rows
-      hanging-punctuation
-      height
-      hyphenate-after
-      hyphenate-before
-      hyphenate-character
-      hyphenate-lines
-      hyphenate-resource
-      hyphens
-      icon
-      image-orientation
-      image-resolution
-      inline-box-align
-      left
-      letter-spacing
-      line-height
-      line-stacking
-      line-stacking-ruby
-      line-stacking-shift
-      line-stacking-strategy
-      list-style
-      list-style-image
-      list-style-position
-      list-style-type
-      margin
-      margin-bottom
-      margin-left
-      margin-right
-      margin-top
-      mark
-      mark-after
-      mark-before
-      marks
-      marquee-direction
-      marquee-play-count
-      marquee-speed
-      marquee-style
-      max-height
-      max-width
-      min-height
-      min-width
-      move-to
-      nav-down
-      nav-index
-      nav-left
-      nav-right
-      nav-up
-      opacity
-      orphans
-      outline
-      outline-color
-      outline-offset
-      outline-style
-      outline-width
-      overflow
-      overflow-style
-      overflow-x
-      overflow-y
-      padding
-      padding-bottom
-      padding-left
-      padding-right
-      padding-top
-      page
-      page-break-after
-      page-break-before
-      page-break-inside
-      page-policy
-      perspective
-      perspective-origin
-      phonemes
-      pointer-events
-      position
-      punctuation-trim
-      quotes
-      rendering-intent
-      resize
-      rest
-      rest-after
-      rest-before
-      right
-      rotation
-      rotation-point
-      ruby-align
-      ruby-overhang
-      ruby-position
-      ruby-span
-      shape-rendering
-      size
-      speak
-      src
-      stroke
-      stroke-width
-      string-set
-      table-layout
-      target
-      target-name
-      target-new
-      target-position
-      text-align
-      text-align-last
-      text-decoration
-      text-height
-      text-indent
-      text-justify
-      text-outline
-      text-overflow
-      text-rendering
-      text-shadow
-      text-transform
-      text-wrap
-      top
-      transform
-      transform-origin
-      transform-style
-      transition
-      transition-delay
-      transition-duration
-      transition-property
-      transition-timing-function
-      unicode-bidi
-      vertical-align
-      visibility
-      voice-balance
-      voice-duration
-      voice-pitch
-      voice-pitch-range
-      voice-rate
-      voice-stress
-      voice-volume
-      white-space
-      widows
-      width
-      word-break
-      word-spacing
-      word-wrap
-      z-index
-      zoom
-    ]
+    KNOWN_PROPERTIES = File.open(File.join(SCSS_LINT_DATA, 'properties.txt'))
+                           .read
+                           .split
+                           .to_set
   end
 end

data/lib/scss_lint/linter/space_between_parens.rb

@@ -6,8 +6,15 @@ module SCSSLint
     def visit_root(node)
       @spaces = config['spaces']
       engine.lines.each_with_index do |line, index|
-        line.scan /(\( *[^ ]|[^\s] *\))/ do |match|
-          match.each { |str| check(str, index, engine) }
+        line.scan(/
+          (^(\t|\s)*\))?  # Capture leading spaces and tabs followed by a `)`
+          (
+            \([ ]*(?!$)   # Find `( ` as long as its not EOL )
+            |
+            [ ]*\)
+          )?
+        /x) do |match|
+          check(match[2], index, engine) if match[2]
         end
       end
     end

data/lib/scss_lint/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-01 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -100,6 +100,7 @@ files:
 - lib/scss_lint/linter/trailing_semicolon_after_property_value.rb
 - lib/scss_lint/linter/shorthand.rb
 - lib/scss_lint/linter/id_with_extraneous_selector.rb
+- lib/scss_lint/linter/empty_line_between_blocks.rb
 - lib/scss_lint/linter/declaration_order.rb
 - lib/scss_lint/linter/zero_unit.rb
 - lib/scss_lint/linter/placeholder_in_extend.rb