scss_lint 0.43.0 → 0.43.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26102783a3fa8f2e4ade260a8a483aa2d2a315f6
-  data.tar.gz: ce8673ca36772ff3505bb6ce3eec4861f78ebed4
+  metadata.gz: 13e3b02dea61e5e42cc983459ef0269a92fd4852
+  data.tar.gz: 6c8b99c3ed5d6987e62fbfa386ba865a88fd3a6c
 SHA512:
-  metadata.gz: d5558f7bbe06908b1901d949215856aad7c0318a4fb10305ff89e3dbea00b08a73c1dcd5edece21898b37cf331585e37c02429ec66337a3a5a887365fa151a18
-  data.tar.gz: 08b6257a9482c94ee656debfc1b141a0c557dccdb970bec4df3588f6ec69dab8888e9a282ab8f74a580f783c81844136f2c729c034a32703dd756873a2a4d0a7
+  metadata.gz: 4fc569e9526be141eddbdaec286d960501c8717b82f09c944cf07721d3681144332706c4236fbbd280e9ea43a402ab66d1b34add10bbf8bfa9f23ad580da7ffb
+  data.tar.gz: 9d900a09921c023a4460dcf37428b5db617858bb35701df3f71aca9267c7e4fddfcb5cf03b3c89dc1f68e304cb533ef74daa25d593dc33830a5b7792c363c857

data/data/pseudo-elements.txt

@@ -0,0 +1,92 @@
+-moz-anonymous-block
+-moz-anonymous-positioned-block
+-moz-canvas
+-moz-cell-content
+-moz-focus-inner
+-moz-focus-outer
+-moz-inline-table
+-moz-page
+-moz-page-sequence
+-moz-pagebreak
+-moz-pagecontent
+-moz-placeholder
+-moz-progress-bar
+-moz-progress-bar
+-moz-range-thumb
+-moz-range-track
+-moz-scrolled-canvas
+-moz-scrolled-content
+-moz-scrolled-page-sequence
+-moz-selection
+-moz-svg-foreign-content
+-moz-table
+-moz-table-cell
+-moz-table-column
+-moz-table-column-group
+-moz-table-outer
+-moz-table-row
+-moz-table-row-group
+-moz-viewport
+-moz-viewport-scroll
+-moz-xul-anonymous-block
+-ms-browse
+-ms-check
+-ms-clear
+-ms-expand
+-ms-expand
+-ms-fill
+-ms-fill-lower
+-ms-fill-upper
+-ms-reveal
+-ms-thumb
+-ms-ticks-after
+-ms-ticks-before
+-ms-tooltip
+-ms-track
+-ms-value
+-webkit-calendar-picker-indicator
+-webkit-color-swatch
+-webkit-color-swatch-wrapper
+-webkit-datetime-edit
+-webkit-datetime-edit-day-field
+-webkit-datetime-edit-fields-wrapper
+-webkit-datetime-edit-month-field
+-webkit-datetime-edit-text
+-webkit-datetime-edit-year-field
+-webkit-file-upload-button
+-webkit-inner-spin-button
+-webkit-input-placeholder
+-webkit-keygen-select
+-webkit-meter-bar
+-webkit-meter-even-less-good-value
+-webkit-meter-optimum-value
+-webkit-meter-suboptimum-value
+-webkit-outer-spin-button
+-webkit-progress-bar
+-webkit-progress-inner-element
+-webkit-progress-value
+-webkit-resizer
+-webkit-scrollbar
+-webkit-scrollbar-button
+-webkit-scrollbar-corner
+-webkit-scrollbar-thumb
+-webkit-scrollbar-track
+-webkit-scrollbar-track-piece
+-webkit-search-cancel-button
+-webkit-search-results-button
+-webkit-slider-runnable-track
+-webkit-slider-thumb
+-webkit-textfield-decoration-container
+-webkit-validation-bubble
+-webkit-validation-bubble-arrow
+-webkit-validation-bubble-arrow-clipper
+-webkit-validation-bubble-heading
+-webkit-validation-bubble-message
+-webkit-validation-bubble-text-block
+after
+backdrop
+before
+first-letter
+first-line
+placeholder
+selection

data/lib/scss_lint/linter.rb

@@ -181,6 +181,8 @@ module SCSSLint
       actual_line   = source_position.line - 1
       actual_offset = source_position.offset + offset - 1
 
+      return nil if actual_offset < 0
+
       engine.lines.size > actual_line && engine.lines[actual_line][actual_offset]
     end
 

data/lib/scss_lint/linter/pseudo_element.rb

@@ -3,7 +3,13 @@ module SCSSLint
   class Linter::PseudoElement < Linter
     include LinterRegistry
 
-    PSEUDO_ELEMENTS = %w[after backdrop before first-letter first-line selection]
+    # https://msdn.microsoft.com/en-us/library/windows/apps/hh767361.aspx
+    # https://developer.mozilla.org/en-US/docs/Web/CSS/Mozilla_Extensions
+    # http://tjvantoll.com/2013/04/15/list-of-pseudo-elements-to-style-form-controls/
+    PSEUDO_ELEMENTS = File.open(File.join(SCSS_LINT_DATA, 'pseudo-elements.txt'))
+                          .read
+                          .split
+                          .to_set
 
     def visit_pseudo(pseudo)
       if PSEUDO_ELEMENTS.include?(pseudo.name)

data/lib/scss_lint/linter/space_after_comma.rb

@@ -78,19 +78,18 @@ module SCSSLint
         # Sometimes the line we're looking at doesn't even contain a comma!
         next unless engine.lines[arg.line - 1].include?(',')
 
-        offset = find_comma_offset(arg)
+        comma_position = find_comma_position(arg)
 
         # Check for space or newline after comma (we allow arguments to be split
         # up over multiple lines).
         spaces = 0
-        while (char = character_at(arg.source_range.end_pos, offset + 1)) == ' '
+        while (char = character_at(comma_position, spaces + 1)) == ' '
           spaces += 1
-          offset += 1
         end
         next if char == "\n" || # Ignore trailing spaces
                 valid_spaces_after_comma?(spaces)
 
-        add_lint arg, "Commas in #{arg_type} should be followed by a single space"
+        add_lint comma_position, "Commas in #{arg_type} should be followed by a single space"
       end
     end
 
@@ -100,20 +99,26 @@ module SCSSLint
     # source range. Thus we need to start at the indicated range, and check
     # left and right of that range, gradually moving further outward until
     # we find the comma.
-    def find_comma_offset(arg)
+    def find_comma_position(arg) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
       offset = 0
+      pos = arg.source_range.end_pos
 
-      if character_at(arg.source_range.end_pos, offset) != ','
+      if character_at(pos, offset) != ','
         loop do
           offset += 1
-          break if character_at(arg.source_range.end_pos, offset) == ','
+          break if (right_char = character_at(pos, offset)) == ','
           offset = -offset
-          break if character_at(arg.source_range.end_pos, offset) == ','
+          break if (left_char = character_at(pos, offset)) == ','
           offset = -offset
+
+          next unless right_char.nil? && left_char.nil?
+          offset = 0
+          pos = Sass::Source::Position.new(pos.line + 1, 1)
+          break if character_at(pos, offset) == ','
         end
       end
 
-      offset
+      Sass::Source::Position.new(pos.line, pos.offset + offset)
     end
   end
 end

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/space_after_comma_spec.rb

@@ -334,6 +334,18 @@ describe SCSSLint::Linter::SpaceAfterComma do
         it { should_not report_lint }
       end
     end
+
+    context 'when map literal spans multiple lines' do
+      let(:scss) { <<-SCSS }
+      @include mixin('arg1', (
+          key1: 'arg2-key1-value',
+          key2: 'arg2-key2-value'
+        ),$arg3: 'arg3-value', $arg4: 'arg4-value'
+      );
+      SCSS
+
+      it { should report_lint line: 4 }
+    end
   end
 
   context 'when more than one space is preferred' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_lint
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.43.1
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -71,6 +71,7 @@ files:
 - data/property-sort-orders/concentric.txt
 - data/property-sort-orders/recess.txt
 - data/property-sort-orders/smacss.txt
+- data/pseudo-elements.txt
 - lib/scss_lint.rb
 - lib/scss_lint/cli.rb
 - lib/scss_lint/config.rb