scss_lint 0.42.0 → 0.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84412ffcfbcad02e1d135dae52e56c33c0f42c19
-  data.tar.gz: af6e1f97f4755ab0b69cf7b4162412571aa42704
+  metadata.gz: 1f22ef7a1e5735cdd001ff93b7fe1dff595dc609
+  data.tar.gz: 1af1a879ec132f70a04fc3b9cc794e0f8dd9a94b
 SHA512:
-  metadata.gz: 1fe04a0e8578d96cb59af5ea52bb4ca274d386153bbe9cb47541bb6f04905ff5e47062237bb7956dfcbdf860fde3c3814344321a62e1d3d3f21cb92a99939ebf
-  data.tar.gz: cefba0a8a5a0ab3b7c19e706efaaac38fbde69fabcd2ae813f4fc363ce2e42babd5fbca2261cf5db9c964a05d35dc2a262d756db45e88c5ced577a5b76b8a4c5
+  metadata.gz: 23cb255d2401258655eb94a88c41a7c639ec1d45bc3dae0a413e3fdd68fe2f7bc8d900066673a60c35e4a862c5e3499354328b1547f2a445b0abdbb6acfe8c00
+  data.tar.gz: 0ccd62fd3f715cf3ce291e240e22be5bdbfb4ef5d483cf52c4339ff3baa0296cb625182d48abefbef557e37f2a13e7381cdb6f6e17aab591469cbd7865e9994b

data/lib/scss_lint/linter/bang_format.rb

@@ -5,9 +5,28 @@ module SCSSLint
 
     STOPPING_CHARACTERS = ['!', "'", '"', nil]
 
+    def visit_extend(node)
+      check_bang(node)
+    end
+
     def visit_prop(node)
-      return unless source_from_range(node.source_range).include?('!')
-      return unless check_spacing(node)
+      check_bang(node)
+    end
+
+    def visit_variable(node)
+      check_bang(node)
+    end
+
+  private
+
+    def check_bang(node)
+      range = if node.respond_to?(:value_source_range)
+                node.value_source_range
+              else
+                node.source_range
+              end
+      return unless source_from_range(range).include?('!')
+      return unless check_spacing(range)
 
       before_qualifier = config['space_before_bang'] ? '' : 'not '
       after_qualifier = config['space_after_bang'] ? '' : 'not '
@@ -16,8 +35,6 @@ module SCSSLint
                      "and should #{after_qualifier}be followed by a space")
     end
 
-  private
-
     # Start from the back and move towards the front so that any !important or
     # !default !'s will be found *before* quotation marks. Then we can
     # stop at quotation marks to protect against linting !'s within strings
@@ -40,8 +57,7 @@ module SCSSLint
       (after_actual =~ after_expected).nil?
     end
 
-    def check_spacing(node)
-      range = node.value_source_range
+    def check_spacing(range)
       offset = find_bang_offset(range)
 
       return if character_at(range.end_pos, offset) != '!'

data/lib/scss_lint/linter/trailing_semicolon.rb

@@ -8,6 +8,13 @@ module SCSSLint
     end
 
     def visit_variable(node)
+      # If the variable is using `!default` or `!global` (e.g. `$foo: bar
+      # !default;`) then `node.expr` will give us the source range just for the
+      # value (e.g. `bar`). In these cases, we want to use the source range of
+      # `node`, which will give us most of the entire line (e.g. `foo: bar
+      # !default`.
+      return check_semicolon(node) if node.global || node.guarded
+
       check_semicolon(node.expr)
     end
 

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/bang_format_spec.rb

@@ -77,6 +77,64 @@ describe SCSSLint::Linter::BangFormat do
     it { should_not report_lint }
   end
 
+  context 'with a !default variable declaration' do
+    context 'and !default is used correctly' do
+      let(:scss) { <<-SCSS }
+        $foo: bar !default;
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'and there is no space before' do
+      let(:scss) { <<-SCSS }
+        $foo: bar!default;
+      SCSS
+
+      it { should report_lint line: 1 }
+    end
+  end
+
+  context 'with a !global variable declaration' do
+    context 'and !global is used correctly' do
+      let(:scss) { <<-SCSS }
+        $foo: bar !global;
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'and there is no space before' do
+      let(:scss) { <<-SCSS }
+        $foo: bar!global;
+      SCSS
+
+      it { should report_lint line: 1 }
+    end
+  end
+
+  context 'with an !optional @extend directive' do
+    context 'and !optional is used correctly' do
+      let(:scss) { <<-SCSS }
+        .foo {
+          @extend .bar !optional;
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'and there is no space before' do
+      let(:scss) { <<-SCSS }
+        .foo {
+          @extend .bar!optional;
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+  end
+
   context 'when ! appears within a string' do
     let(:scss) { <<-SCSS }
       p:before { content: "!important"; }

data/spec/scss_lint/linter/trailing_semicolon_spec.rb

@@ -23,6 +23,48 @@ describe SCSSLint::Linter::TrailingSemicolon do
     it { should_not report_lint }
   end
 
+  context 'when an !important property' do
+    context 'ends with a semicolon' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin: 0 !important;
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'ends with two semicolons' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin: 0 !important;;
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+
+    context 'has a space before the semicolon' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin: 0 !important ;
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+
+    context 'is missing a semicolon' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin: 0 !important
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+  end
+
   context 'when a property ends with a space followed by a semicolon' do
     let(:scss) { <<-SCSS }
       p {
@@ -302,6 +344,84 @@ describe SCSSLint::Linter::TrailingSemicolon do
     it { should_not report_lint }
   end
 
+  context 'when a !default variable declaration' do
+    context 'ends with a semicolon' do
+      let(:scss) { '$foo: bar !default;' }
+
+      it { should_not report_lint }
+    end
+
+    context 'ends with two semicolons' do
+      let(:scss) { '$foo: bar !default;;' }
+
+      it { should report_lint }
+    end
+
+    context 'has a space before the semicolon' do
+      let(:scss) { '$foo: bar !default ;' }
+
+      it { should report_lint }
+    end
+
+    context 'is missing a semicolon' do
+      let(:scss) { '$foo: bar !default' }
+
+      it { should report_lint }
+    end
+  end
+
+  context 'when a !global variable declaration' do
+    context 'ends with a semicolon' do
+      let(:scss) { '$foo: bar !global;' }
+
+      it { should_not report_lint }
+    end
+
+    context 'ends with two semicolons' do
+      let(:scss) { '$foo: bar !global;;' }
+
+      it { should report_lint }
+    end
+
+    context 'has a space before the semicolon' do
+      let(:scss) { '$foo: bar !global ;' }
+
+      it { should report_lint }
+    end
+
+    context 'is missing a semicolon' do
+      let(:scss) { '$foo: bar !global' }
+
+      it { should report_lint }
+    end
+  end
+
+  context 'when the value of the variable is !important' do
+    context 'ends with a semicolon' do
+      let(:scss) { '$foo: bar !important;' }
+
+      it { should_not report_lint }
+    end
+
+    context 'ends with two semicolons' do
+      let(:scss) { '$foo: bar !important;;' }
+
+      it { should report_lint }
+    end
+
+    context 'has a space before the semicolon' do
+      let(:scss) { '$foo: bar !important ;' }
+
+      it { should report_lint }
+    end
+
+    context 'is missing a semicolon' do
+      let(:scss) { '$foo: bar !important' }
+
+      it { should report_lint }
+    end
+  end
+
   context 'when variable declaration is followed by a comment and semicolon' do
     let(:scss) { '$foo: bar // comment;' }
 
@@ -351,4 +471,88 @@ describe SCSSLint::Linter::TrailingSemicolon do
       end
     end
   end
+
+  context 'with an @extend directive' do
+    context 'that ends with a semicolon' do
+      let(:scss) { <<-SCSS }
+        .foo {
+          @extend .bar;
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'with two semicolons' do
+      let(:scss) { <<-SCSS }
+        .foo {
+          @extend .bar;;
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+
+    context 'with a space before the semicolon' do
+      let(:scss) { <<-SCSS }
+        .foo {
+          @extend .bar ;
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+
+    context 'that does not have a semicolon' do
+      let(:scss) { <<-SCSS }
+        .foo {
+          @extend .bar
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+
+    context 'with the !optional flag' do
+      context 'that ends with a semicolon' do
+        let(:scss) { <<-SCSS }
+          .foo {
+            @extend .bar !optional;
+          }
+        SCSS
+
+        it { should_not report_lint }
+      end
+
+      context 'with two semicolons' do
+        let(:scss) { <<-SCSS }
+          .foo {
+            @extend .bar !optional;;
+          }
+        SCSS
+
+        it { should report_lint line: 2 }
+      end
+
+      context 'with a space before the semicolon' do
+        let(:scss) { <<-SCSS }
+          .foo {
+            @extend .bar !optional ;
+          }
+        SCSS
+
+        it { should report_lint line: 2 }
+      end
+
+      context 'that does not have a semicolon' do
+        let(:scss) { <<-SCSS }
+          .foo {
+            @extend .bar !optional
+          }
+        SCSS
+
+        it { should report_lint line: 2 }
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_lint
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.42.1
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow