scss-lint 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e07cf784e2e32fc05bf8294608db2d3bcf2951b2
-  data.tar.gz: d1577b62811661ad24efa01dfeeffc6ca19a573b
+  metadata.gz: 35968261ce332fb768bb4718428cae2dbc1ac092
+  data.tar.gz: 4ca8c381e68d044cc215c7a282c0cf638d5b7549
 SHA512:
-  metadata.gz: a3179febbb5fce02dee1044be6ea7b05f312e833e8bb61d4c8cb23f9ab84eb07c9458f9492f6918a2766a8c42e10ae89debd3a20959ca7778bc38787eccc96e2
-  data.tar.gz: e50715f6dbbf827a29b1f079d520ec6011e8318f3b89ea9d7d31afb09c8bf68a32f3cea66ab7a8da926ab2556c4a34fb3023a8393ae10aea89ef3889e5a34f19
+  metadata.gz: 026eb4b4c81ba0a753f5f804dd276f85f98e6d5b2c5ddc39c7979cfcecc55ac4470fae3e5d2c9bd8a78411743b64f8c07b71cb1999256337b488254bafaa779d
+  data.tar.gz: 45aa1649bae847377374ad44634bde37cee9ad3f4724359238cff14de0f634de29f42e783d3b45347838ca5a29fdd6828fc4a953e00408a447892f89609cff93

data/data/property-sort-orders/concentric.txt

@@ -13,6 +13,7 @@ clear
 
 visibility
 opacity
+transform
 z-index
 
 margin
@@ -40,17 +41,26 @@ border-right-style
 border-bottom-style
 border-left-style
 
+border-radius
+border-top-left-radius
+border-top-right-radius
+border-bottom-left-radius
+border-bottom-right-radius
+
 border-color
 border-top-color
 border-right-color
 border-bottom-color
 border-left-color
 
+box-shadow
+
 background
 background-color
 background-image
 background-repeat
 background-position
+background-size
 cursor
 
 padding
@@ -83,6 +93,7 @@ text-align
 text-indent
 text-transform
 text-decoration
+text-rendering
 
 line-height
 word-spacing

data/lib/scss_lint/linter/leading_zero.rb

@@ -14,7 +14,10 @@ module SCSSLint
     end
 
     def visit_script_number(node)
-      return unless number = source_from_range(node.source_range)[FRACTIONAL_DIGIT_REGEX, 1]
+      # TODO: Remove once https://github.com/sass/sass/issues/1343 is fixed
+      return unless source = source_from_range(node.source_range)
+
+      return unless number = source[FRACTIONAL_DIGIT_REGEX, 1]
 
       check_number(node, number)
     end

data/lib/scss_lint/linter/single_line_per_selector.rb

@@ -17,7 +17,7 @@ module SCSSLint
       # We must ignore selectors with interpolation, since there's no way to
       # tell if the overall selector is valid since the interpolation could
       # insert commas incorrectly. Thus we simply ignore.
-      return if node.rule.any? { |item| item.is_a?(Sass::Script::Variable) }
+      return unless node.rule.all? { |item| item.is_a?(String) }
 
       normalize_spacing(condense_to_string(node.rule)) =~ /\n,|,[^\n]/
     end
@@ -31,7 +31,7 @@ module SCSSLint
 
     # Removes extra spacing between lines in a comma-separated sequence due to
     # comments being removed in the parse phase. This makes it easy to check if
-    # a comma is where belongs.
+    # a comma is where it belongs.
     def normalize_spacing(string_sequence)
       string_sequence.gsub(/,[^\S\n]*\n\s*/, ",\n")
     end

data/lib/scss_lint/linter/trailing_semicolon.rb

@@ -3,30 +3,31 @@ module SCSSLint
   class Linter::TrailingSemicolon < Linter
     include LinterRegistry
 
-    def visit_prop(node)
-      if has_nested_properties?(node)
-        yield # Continue checking children
-      else
-        check_semicolon(node)
-      end
-    end
-
     def visit_extend(node)
       check_semicolon(node)
     end
 
-    def visit_mixin(node)
+    def visit_variable(node)
       check_semicolon(node)
     end
 
-    def visit_variable(node)
-      check_semicolon(node)
+    def visit_possible_parent(node)
+      if has_nested_properties?(node)
+        yield # Continue checking children
+      else
+        check_semicolon(node)
+      end
     end
 
+    alias_method :visit_mixin, :visit_possible_parent
+    alias_method :visit_prop,  :visit_possible_parent
+
   private
 
     def has_nested_properties?(node)
-      node.children.any? { |n| n.is_a?(Sass::Tree::PropNode) }
+      node.children.any? do |n|
+        n.is_a?(Sass::Tree::PropNode) || n.is_a?(Sass::Tree::RuleNode)
+      end
     end
 
     def check_semicolon(node)

data/lib/scss_lint/linter/unnecessary_parent_reference.rb

@@ -3,7 +3,7 @@ module SCSSLint
   class Linter::UnnecessaryParentReference < Linter
     include LinterRegistry
 
-    MESSAGE = 'Unnecessary parent selector'
+    MESSAGE = 'Unnecessary parent selector (&)'
 
     def visit_comma_sequence(comma_sequence)
       @multiple_sequences = comma_sequence.members.size > 1
@@ -29,8 +29,10 @@ module SCSSLint
 
     def sequence_starts_with_parent?(simple_sequence)
       return unless simple_sequence.is_a?(Sass::Selector::SimpleSequence)
+      first = simple_sequence.members.first
       simple_sequence.members.size == 1 &&
-        simple_sequence.members.first.is_a?(Sass::Selector::Parent)
+        first.is_a?(Sass::Selector::Parent) &&
+        first.suffix.empty? # Ignore concatenated selectors, like `&-something`
     end
   end
 end

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/single_line_per_selector_spec.rb

@@ -81,12 +81,12 @@ describe SCSSLint::Linter::SingleLinePerSelector do
   context 'when rule contains an interpolated selector not on its own line' do
     let(:css) { <<-CSS }
       .first,
-      .second, \#{interpolated-selector}.thing,
+      .second, \#{$interpolated-selector}.thing,
       .fourth {
       }
     CSS
 
-    it { should report_lint line: 1 }
+    it { should_not report_lint }
   end
 
   context 'when rule contains an inline comment' do
@@ -118,4 +118,13 @@ describe SCSSLint::Linter::SingleLinePerSelector do
 
     it { should_not report_lint }
   end
+
+  context 'when a function is used in the selector' do
+    let(:css) { <<-CSS }
+      \#{function()} {
+      }
+    CSS
+
+    it { should_not report_lint }
+  end
 end

data/spec/scss_lint/linter/trailing_semicolon_spec.rb

@@ -156,6 +156,32 @@ describe SCSSLint::Linter::TrailingSemicolon do
     it { should report_lint line: 2 }
   end
 
+  context 'when @include takes a block' do
+    let(:css) { <<-CSS }
+      .foo {
+        @include bar {
+          border: 0;
+        }
+      }
+    CSS
+
+    it { should_not report_lint }
+  end
+
+  context 'when @include takes a block with nested props' do
+    let(:css) { <<-CSS }
+      .foo {
+        @include bar {
+          .bar {
+            border: 0;
+          }
+        }
+      }
+    CSS
+
+    it { should_not report_lint }
+  end
+
   context 'when @extend ends with a semicolon' do
     let(:css) { <<-CSS }
       .foo {

data/spec/scss_lint/linter/unnecessary_parent_reference_spec.rb

@@ -64,4 +64,14 @@ describe SCSSLint::Linter::UnnecessaryParentReference do
 
     it { should report_lint line: 2 }
   end
+
+  context 'when an ampersand is used in concatentation' do
+    let(:css) { <<-CSS }
+      .icon {
+        &-small {}
+      }
+    CSS
+
+    it { should_not report_lint }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Causes Engineering