scss-lint 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c60cb7b446fd21b69324b554345c0d2fbb63af
-  data.tar.gz: c12498e673473f6305b6216fa0151ef755121b5a
+  metadata.gz: 69f5645967ac2ed4c054af95508d25ffb88328f7
+  data.tar.gz: b8d83cdd575da8e42307dedfdeb32d2bb264a210
 SHA512:
-  metadata.gz: ba86ab4dc998719d5f11e26cb6d842c3bf9aec9535f3742a93fd8cbb975b4ff300f0aaefc8f127b99ab9ff642b5ee15a4aa0320c82b003805ba3edca5cb84408
-  data.tar.gz: b1e5c3b72ab4300347138727dc13963fefbde3be4c9adb88c9bc8c3791c43a695f070268b2ca20f4b9a921a662aec822df1983587bc50341e6c22eecba700bd7
+  metadata.gz: 4cd037b4f7b02d0b011e2fc0db246cdfafa8f69a78dc2ad49e66d81df3e470f07731b4d23c115fc700426fc2c5f4dd41578be8b937a8449e4a977ef308944a40
+  data.tar.gz: dffa479078fac884d6ead1759882a9d23b1f1212618418b89a78b9fce1b2e0cf061817a26f9b523ae246bb7bb16a6b2ec7da52107b1487cc560822f38e2ac778

data/lib/sass/script.rb

@@ -17,10 +17,12 @@ module Sass::Script
   class Color
     attr_accessor :original
 
-    def self.from_string(string)
-      rgb = string.scan(/^#(..?)(..?)(..?)$/).
-                   first.
-                   map { |hex| hex.ljust(2, hex).to_i(16) }
+    def self.from_string(string, rgb = nil)
+      unless rgb
+        rgb = string.scan(/^#(..?)(..?)(..?)$/).
+                     first.
+                     map { |hex| hex.ljust(2, hex).to_i(16) }
+      end
 
       color = Color.new(rgb, false)
       color.original = string
@@ -45,4 +47,18 @@ module Sass::Script
       [:color, Color.from_string(color_string)]
     end
   end
+
+  class Parser
+    # We redefine the ident parser to specially handle color keywords.
+    def ident
+      return funcall unless @lexer.peek && @lexer.peek.type == :ident
+      return if @stop_at && @stop_at.include?(@lexer.peek.value)
+
+      name = @lexer.next
+      if color = Color::COLOR_NAMES[name.value.downcase]
+        return node(Color.from_string(name.value, color))
+      end
+      node(Sass::Script::String.new(name.value, :identifier))
+    end
+  end
 end

data/lib/scss_lint/linter/color_keyword.rb

@@ -2,18 +2,43 @@ module SCSSLint
   class Linter::ColorKeyword < Linter
     include LinterRegistry
 
-    def visit_script_string(node)
-      add_lint(node) if color_keyword?(node.value)
+    def visit_script_color(node)
+      add_color_lint(node, node.original) if color_keyword?(node.original)
     end
 
-    def description
-      'Colors should be specified as hexadecimal values, not names'
+    def visit_script_string(node)
+      return unless node.type == :identifier
+
+      remove_quoted_strings(node.value).scan(/[a-z]+/i) do |word|
+        add_color_lint(node, word) if color_keyword?(word)
+      end
     end
 
   private
 
+    def add_color_lint(node, original)
+      hex_form = Sass::Script::Color.new(color_rgb(original)).inspect
+      add_lint(node,
+               "Color `#{original}` should be written in hexadecimal form " <<
+               "as `#{shortest_hex_form(hex_form)}`")
+    end
+
     def color_keyword?(string)
-      !!Sass::Script::Color::COLOR_NAMES[string]
+      !!color_rgb(string)
+    end
+
+    def color_rgb(string)
+      Sass::Script::Color::COLOR_NAMES[string]
+    end
+
+    # Takes a string like `hello "world" 'how are' you` and turns it into:
+    # `hello   you`.
+    # This is useful for scanning for keywords in shorthand properties or lists
+    # which can contain quoted strings but for which you don't want to inspect
+    # quoted strings (e.g. you care about the actual color keyword `red`, not
+    # the string "red").
+    def remove_quoted_strings(string)
+      string.gsub(/"[^"]*"|'[^']*'/, '')
     end
   end
 end

data/lib/scss_lint/linter/hex_format.rb

@@ -2,21 +2,19 @@ module SCSSLint
   class Linter::HexFormat < Linter
     include LinterRegistry
 
-    def visit_prop(node)
-      if node.value.is_a?(Sass::Script::String) &&
-         node.value.type == :identifier
+    def visit_script_color(node)
+      return unless node.original && node.original.match(HEX_REGEX)
 
-        node.value.value.scan(HEX_REGEX) do |match|
-          add_hex_lint(node, match.first) unless valid_hex_format?(match.first)
-        end
+      unless valid_hex_format?(node.original[HEX_REGEX, 1])
+        add_hex_lint(node, node.original)
       end
-
-      yield # Continue visiting children
     end
 
-    def visit_script_color(node)
-      unless valid_hex_format?(node.original[HEX_REGEX, 1])
-        add_hex_lint(node, node.original)
+    def visit_script_string(node)
+      return unless node.type == :identifier
+
+      node.value.scan(HEX_REGEX) do |match|
+        add_hex_lint(node, match.first) unless valid_hex_format?(match.first)
       end
     end
 
@@ -25,22 +23,11 @@ module SCSSLint
     HEX_REGEX = /(#\h{3,6})/
 
     def add_hex_lint(node, hex)
-      add_lint(node, "Color `#{hex}` should be written as `#{shortest_form(hex)}`")
+      add_lint(node, "Color `#{hex}` should be written as `#{shortest_hex_form(hex)}`")
     end
 
     def valid_hex_format?(hex)
-      hex == shortest_form(hex)
-    end
-
-    def shortest_form(hex)
-      (can_be_condensed?(hex) ? (hex[0..1] + hex[3] + hex[5]) : hex).downcase
-    end
-
-    def can_be_condensed?(hex)
-      hex.length == 7 &&
-        hex[1] == hex[2] &&
-        hex[3] == hex[4] &&
-        hex[5] == hex[6]
+      hex == shortest_hex_form(hex)
     end
   end
 end

data/lib/scss_lint/utils.rb

@@ -23,6 +23,17 @@ module SCSSLint
       node.name =~ /#{INVALID_NAME_CHARS}/
     end
 
+    def shortest_hex_form(hex)
+      (can_be_condensed?(hex) ? (hex[0..1] + hex[3] + hex[5]) : hex).downcase
+    end
+
+    def can_be_condensed?(hex)
+      hex.length == 7 &&
+        hex[1] == hex[2] &&
+        hex[3] == hex[4] &&
+        hex[5] == hex[6]
+    end
+
   private
 
     INVALID_NAME_CHARS = '[_A-Z]'

data/lib/scss_lint/version.rb

@@ -1,3 +1,3 @@
 module SCSSLint
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

metadata

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