scss-lint 0.36.0 → 0.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f923a4288fb1d256d16d482a77e3c73a8aff84d
-  data.tar.gz: 2da5da450f72c3947f454bafe1c33d5244dfc304
+  metadata.gz: c3a2b1ee0f782f66cb555280a0b7be06a2a4ff5f
+  data.tar.gz: 9b92adbf68a21311695432d0357ea6805b632be1
 SHA512:
-  metadata.gz: 868fe445178e21cd235460029c6ab6ab914bc271a1e66c6fd462df517fd0deca3b08b2a974ddb3f362056da510d928f0e64c7aac33dbd6e932dc4752b2db042c
-  data.tar.gz: b7086af86736d1470bf627c7cd65cafeead516855e2431417eb1b6d4a4fd6283fff34157b59bea8eb19ccaddfe95c20722cce80565354fcda134859f911a51de
+  metadata.gz: 01b85e9caee70645b1cc8da766b24cf0a5db2bca10c0d5fe1fd004492c27605a8cf08b194298dc20e5f0e1d6f56376fc68f4a4889df62e90295f7be36e88e1ec
+  data.tar.gz: 96aafd6d3d5a8fb34d99aebbf0f15ffe8216f482e785ff157266f9d1fa3dcff4014b53ef43aee95c11881d21a93cd047c6e3f767206c64e1ef62150c5b751fe5

data/config/default.yml

@@ -100,7 +100,16 @@ linters:
 
   PropertyUnits:
     enabled: true
-    global: ['em', 'ex', '%', 'px', 'ch', 'cm', 'mm', 'in', 'pt', 'pc', 'rem', 'vh', 'vw', 'vmin', 'vmax']
+    global: [
+      'ch', 'em', 'ex', 'rem',                 # Font-relative lengths
+      'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q', # Absolute lengths
+      'vh', 'vw', 'vmin', 'vmax',              # Viewport-percentage lengths
+      'deg', 'grad', 'rad', 'turn',            # Angle
+      'ms', 's',                               # Duration
+      'Hz', 'kHz',                             # Frequency
+      'dpi', 'dpcm', 'dppx',                   # Resolution
+      '%',                                     # Other
+    ]
     properties: {}
 
   PropertySortOrder:

data/lib/scss_lint/linter/declaration_order.rb

@@ -34,11 +34,12 @@ module SCSSLint
     end
 
     def check_node(node)
-      children = node.children.select { |n| important_node?(n) }
-                              .map { |n| [n, node_declaration_type(n)] }
+      children = node.children.each_with_index
+                              .select { |n, _| important_node?(n) }
+                              .map { |n, i| [n, node_declaration_type(n), i] }
 
-      sorted_children = children.sort do |(_, a_type), (_, b_type)|
-        DECLARATION_ORDER.index(a_type) <=> DECLARATION_ORDER.index(b_type)
+      sorted_children = children.sort do |(_, a_type, i), (_, b_type, j)|
+        [DECLARATION_ORDER.index(a_type), i] <=> [DECLARATION_ORDER.index(b_type), j]
       end
 
       check_children_order(sorted_children, children)

data/lib/scss_lint/linter/property_units.rb

@@ -18,7 +18,8 @@ module SCSSLint
         property = "#{@nested_under}-#{property}"
       end
 
-      if units = node.value.value.to_s[/(?:\d+|\d*\.?\d+)([a-z%]+)/i, 1]
+      if node.value.respond_to?(:value) &&
+         units = node.value.value.to_s[/(?:^|\s)(?:\d+|\d*\.?\d+)([a-z%]+)/i, 1]
         check_units(node, property, units)
       end
 

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/property_units_spec.rb

@@ -196,4 +196,34 @@ describe SCSSLint::Linter::PropertyUnits do
       it { should report_lint line: 3 }
     end
   end
+
+  context 'when property contains a function call' do
+    let(:scss) { <<-SCSS }
+      p {
+        color: my-special-color(5);
+      }
+    SCSS
+
+    it { should_not report_lint }
+  end
+
+  context 'when property contains a unicode sequence' do
+    let(:scss) { <<-SCSS }
+      p {
+        content: "\\25be";
+      }
+    SCSS
+
+    it { should_not report_lint }
+  end
+
+  context 'when property contains a string in quotes that looks like a value' do
+    let(:scss) { <<-SCSS }
+      p {
+        content: "This is 12px";
+      }
+    SCSS
+
+    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.36.0
+  version: 0.36.1
 platform: ruby
 authors:
 - Brigade Engineering
@@ -306,8 +306,8 @@ test_files:
 - spec/scss_lint/linter/vendor_prefix_spec.rb
 - spec/scss_lint/linter/zero_unit_spec.rb
 - spec/scss_lint/linter/color_variable_spec.rb
-- spec/scss_lint/linter/property_units_spec.rb
 - spec/scss_lint/linter/declaration_order_spec.rb
+- spec/scss_lint/linter/property_units_spec.rb
 - spec/scss_lint/linter_registry_spec.rb
 - spec/scss_lint/linter_spec.rb
 - spec/scss_lint/location_spec.rb