sass 3.5.2 → 3.7.4

data/lib/sass/script/tree/funcall.rb

@@ -68,13 +68,11 @@ module Sass::Script::Tree
     def inspect
       args = @args.map {|a| a.inspect}.join(', ')
       keywords = @keywords.as_stored.to_a.map {|k, v| "$#{k}: #{v.inspect}"}.join(', ')
-      # rubocop:disable RedundantSelf
       if self.splat
         splat = args.empty? && keywords.empty? ? "" : ", "
         splat = "#{splat}#{self.splat.inspect}..."
         splat = "#{splat}, #{kwarg_splat.inspect}..." if kwarg_splat
       end
-      # rubocop:enable RedundantSelf
       "#{name}(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords}#{splat})"
     end
 
@@ -89,12 +87,10 @@ module Sass::Script::Tree
       args = @args.map(&arg_to_sass)
       keywords = @keywords.as_stored.to_a.map {|k, v| "$#{dasherize(k, opts)}: #{arg_to_sass[v]}"}
 
-      # rubocop:disable RedundantSelf
       if self.splat
         splat = "#{arg_to_sass[self.splat]}..."
         kwarg_splat = "#{arg_to_sass[self.kwarg_splat]}..." if self.kwarg_splat
       end
-      # rubocop:enable RedundantSelf
 
       arglist = [args, splat, keywords, kwarg_splat].flatten.compact.join(', ')
       "#{dasherize(name, opts)}(#{arglist})"

data/lib/sass/script/tree/interpolation.rb

@@ -47,10 +47,7 @@ module Sass::Script::Tree
     # @param wa [Boolean] See {Interpolation#whitespace_after}
     # @param originally_text [Boolean] See {Interpolation#originally_text}
     # @param warn_for_color [Boolean] See {Interpolation#warn_for_color}
-    # @comment
-    #   rubocop:disable ParameterLists
     def initialize(before, mid, after, wb, wa, opts = {})
-      # rubocop:enable ParameterLists
       @before = before
       @mid = mid
       @after = after

data/lib/sass/script/tree/operation.rb

@@ -111,7 +111,7 @@ module Sass::Script::Tree
       @@color_arithmetic_deprecation.warn(filename, line, <<WARNING)
 The operation `#{value1} #{@operator} #{value2}` is deprecated and will be an error in future versions.
 Consider using Sass's color functions instead.
-http://sass-lang.com/documentation/Sass/Script/Functions.html#other_color_functions
+https://sass-lang.com/documentation/Sass/Script/Functions.html#other_color_functions
 WARNING
     end
 

data/lib/sass/script/value/color.rb

@@ -277,13 +277,14 @@ module Sass::Script::Value
     #
     # @return [Color]
     def self.from_hex(hex_string, alpha = nil)
-      unless hex_string =~ /^#?([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i ||
-             hex_string =~ /^#?([0-9a-f])([0-9a-f])([0-9a-f])$/i
+      unless hex_string =~ /^#?([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})?$/i ||
+             hex_string =~ /^#?([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])?$/i
         raise ArgumentError.new("#{hex_string.inspect} is not a valid hex color.")
       end
       red   = $1.ljust(2, $1).to_i(16)
       green = $2.ljust(2, $2).to_i(16)
       blue  = $3.ljust(2, $3).to_i(16)
+      alpha = $4.ljust(2, $4).to_i(16).to_f / 0xff if $4
 
       hex_string = "##{hex_string}" unless hex_string[0] == ?#
       attrs = {:red => red, :green => green, :blue => blue, :representation => hex_string}

data/lib/sass/script/value/helpers.rb

@@ -1,8 +1,6 @@
 module Sass::Script::Value
   # Provides helper functions for creating sass values from within ruby methods.
   # @since `3.3.0`
-  # @comment
-  #   rubocop:disable ModuleLength
   module Helpers
     # Construct a Sass Boolean.
     #
@@ -215,6 +213,14 @@ module Sass::Script::Value
       literal.is_a?(Sass::Script::Value::String) && literal.value =~ /calc\(/
     end
 
+    # Returns true when the literal is a string containing a var().
+    #
+    # @param literal [Sass::Script::Value::Base] The value to check
+    # @return Boolean
+    def var?(literal)
+      literal.is_a?(Sass::Script::Value::String) && literal.value =~ /var\(/
+    end
+
     # Returns whether the literal is a special CSS value that may evaluate to a
     # number, such as `calc()` or `var()`.
     #

data/lib/sass/script/value/number.rb

@@ -189,6 +189,7 @@ module Sass::Script::Value
     # @raise [Sass::UnitConversionError] if `other` has incompatible units
     def mod(other)
       if other.is_a?(Number)
+        return Number.new(Float::NAN) if other.value == 0
         operate(other, :%)
       else
         raise NoMethodError.new(nil, :mod)
@@ -472,7 +473,7 @@ module Sass::Script::Value
         sans_common_units(@numerator_units, @denominator_units)
 
       @denominator_units.each_with_index do |d, i|
-        next unless convertable?(d) && (u = @numerator_units.find(&method(:convertable?)))
+        next unless convertable?(d) && (u = @numerator_units.find {|n| convertable?([n, d])})
         @value /= conversion_factor(d, u)
         @denominator_units.delete_at(i)
         @numerator_units.delete_at(@numerator_units.index(u))

data/lib/sass/scss/css_parser.rb

@@ -47,7 +47,12 @@ module Sass
       def keyframes_ruleset
         start_pos = source_position
         return unless (selector = keyframes_selector)
-        block(node(Sass::Tree::KeyframeRuleNode.new(selector.strip), start_pos), :ruleset)
+        block(
+          node(
+            Sass::Tree::KeyframeRuleNode.new(
+              Sass::Util.strip_except_escapes(selector)),
+            start_pos),
+          :ruleset)
       end
 
       @sass_script_parser = Sass::Script::CssParser

data/lib/sass/scss/parser.rb

@@ -203,7 +203,7 @@ module Sass
       def directive
         start_pos = source_position
         return unless tok(/@/)
-        name = tok!(IDENT)
+        name = ident!
         ss
 
         if (dir = special_directive(name, start_pos))
@@ -240,14 +240,14 @@ module Sass
       end
 
       def mixin_directive(start_pos)
-        name = tok! IDENT
+        name = ident!
         args, splat = sass_script(:parse_mixin_definition_arglist)
         ss
         block(node(Sass::Tree::MixinDefNode.new(name, args, splat), start_pos), :directive)
       end
 
       def include_directive(start_pos)
-        name = tok! IDENT
+        name = ident!
         args, keywords, splat, kwarg_splat = sass_script(:parse_mixin_include_arglist)
         ss
         include_node = node(
@@ -266,7 +266,7 @@ module Sass
       end
 
       def function_directive(start_pos)
-        name = tok! IDENT
+        name = ident!
         args, splat = sass_script(:parse_function_definition_arglist)
         ss
         block(node(Sass::Tree::FunctionNode.new(name, args, splat), start_pos), :function)
@@ -286,7 +286,7 @@ module Sass
 
       def for_directive(start_pos)
         tok!(/\$/)
-        var = tok! IDENT
+        var = ident!
         ss
 
         tok!(/from/)
@@ -303,12 +303,12 @@ module Sass
 
       def each_directive(start_pos)
         tok!(/\$/)
-        vars = [tok!(IDENT)]
+        vars = [ident!]
         ss
         while tok(/,/)
           ss
           tok!(/\$/)
-          vars << tok!(IDENT)
+          vars << ident!
           ss
         end
 
@@ -477,12 +477,23 @@ module Sass
         return unless tok(/\(/)
         res = ['(']
         ss
-        res << sass_script(:parse)
+        stop_at = Set[:single_eq, :lt, :lte, :gt, :gte]
+        res << sass_script(:parse_until, stop_at)
 
         if tok(/:/)
           res << ': '
           ss
           res << sass_script(:parse)
+        elsif comparison1 = tok(/=|[<>]=?/)
+          res << ' ' << comparison1 << ' '
+          ss
+          res << sass_script(:parse_until, stop_at)
+          if ((comparison1 == ">" || comparison1 == ">=") && comparison2 = tok(/>=?/)) ||
+             ((comparison1 == "<" || comparison1 == "<=") && comparison2 = tok(/<=?/))
+            res << ' ' << comparison2 << ' '
+            ss
+            res << sass_script(:parse_until, stop_at)
+          end
         end
         res << tok!(/\)/)
         ss
@@ -542,10 +553,10 @@ module Sass
       end
 
       def at_root_directive_list
-        return unless (first = tok(IDENT))
+        return unless (first = ident)
         arr = [first]
         ss
-        while (e = tok(IDENT))
+        while (e = ident)
           arr << e
           ss
         end
@@ -636,12 +647,12 @@ module Sass
       def variable
         return unless tok(/\$/)
         start_pos = source_position
-        name = tok!(IDENT)
+        name = ident!
         ss; tok!(/:/); ss
 
         expr = sass_script(:parse)
         while tok(/!/)
-          flag_name = tok!(IDENT)
+          flag_name = ident!
           if flag_name == 'default'
             guarded ||= true
           elsif flag_name == 'global'
@@ -898,7 +909,7 @@ module Sass
             (?!
               url\(
             )
-            [^()\[\]{}"'#/ \t\r\n\f#{top_level ? ";!" : ""}]
+            [^()\[\]{}"'#/ \t\r\n\f#{top_level ? ";" : ""}]
           |
             \#(?!\{)
           |
@@ -980,7 +991,10 @@ module Sass
         # containing the value.
         # This results in a dramatic speed increase.
         if (val = tok(STATIC_VALUE))
-          str = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(val.strip))
+          # If val ends with escaped whitespace, leave it be.
+          str = Sass::Script::Tree::Literal.new(
+            Sass::Script::Value::String.new(
+              Sass::Util.strip_except_escapes(val)))
           str.line = start_pos.line
           str.source_range = range(start_pos)
           return str
@@ -1037,7 +1051,7 @@ module Sass
       def var_expr
         return unless tok(/\$/)
         line = @line
-        var = Sass::Script::Tree::Variable.new(tok!(IDENT))
+        var = Sass::Script::Tree::Variable.new(ident!)
         var.line = line
         var
       end
@@ -1075,11 +1089,27 @@ module Sass
         res
       end
 
-      def interp_ident(start = IDENT)
-        val = tok(start) || interpolation(:warn_for_color) || tok(IDENT_HYPHEN_INTERP)
+      def ident
+        (ident = tok(IDENT)) && Sass::Util.normalize_ident_escapes(ident)
+      end
+
+      def ident!
+        Sass::Util.normalize_ident_escapes(tok!(IDENT))
+      end
+
+      def name
+        (name = tok(NAME)) && Sass::Util.normalize_ident_escapes(name)
+      end
+
+      def name!
+        Sass::Util.normalize_ident_escapes(tok!(NAME))
+      end
+
+      def interp_ident
+        val = ident || interpolation(:warn_for_color) || tok(IDENT_HYPHEN_INTERP)
         return unless val
         res = [val]
-        while (val = tok(NAME) || interpolation(:warn_for_color))
+        while (val = name || interpolation(:warn_for_color))
           res << val
         end
         res

data/lib/sass/scss/rx.rb

@@ -52,7 +52,7 @@ module Sass
       UNICODE  = /\\#{H}{1,6}[ \t\r\n\f]?/
       s = '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
       NONASCII = /[#{s}]/
-      ESCAPE   = /#{UNICODE}|\\[ -~#{s}]/
+      ESCAPE   = /#{UNICODE}|\\[^0-9a-fA-F\r\n\f]/
       NMSTART  = /[_a-zA-Z]|#{NONASCII}|#{ESCAPE}/
       NMCHAR   = /[a-zA-Z0-9_-]|#{NONASCII}|#{ESCAPE}/
       STRING1  = /\"((?:[^\n\r\f\\"]|\\#{NL}|#{ESCAPE})*)\"/

data/lib/sass/scss/static_parser.rb

@@ -51,10 +51,7 @@ module Sass
       # @see Parser#initialize
       # @param allow_parent_ref [Boolean] Whether to allow the
       #   parent-reference selector, `&`, when parsing the document.
-      # @comment
-      #   rubocop:disable ParameterLists
       def initialize(str, filename, importer, line = 1, offset = 1, allow_parent_ref = true)
-        # rubocop:enable ParameterLists
         super(str, filename, importer, line, offset)
         @allow_parent_ref = allow_parent_ref
       end
@@ -74,7 +71,7 @@ module Sass
       def var_expr; nil; end
       def interp_string; (s = tok(STRING)) && [s]; end
       def interp_uri; (s = tok(URI)) && [s]; end
-      def interp_ident(ident = IDENT); (s = tok(ident)) && [s]; end
+      def interp_ident; (s = ident) && [s]; end
       def use_css_import?; true; end
 
       def special_directive(name, start_pos)
@@ -188,25 +185,25 @@ MESSAGE
 
       def parent_selector
         return unless @allow_parent_ref && tok(/&/)
-        Selector::Parent.new(tok(NAME))
+        Selector::Parent.new(name)
       end
 
       def class_selector
         return unless tok(/\./)
         @expected = "class name"
-        Selector::Class.new(tok!(IDENT))
+        Selector::Class.new(ident!)
       end
 
       def id_selector
         return unless tok(/#(?!\{)/)
         @expected = "id name"
-        Selector::Id.new(tok!(NAME))
+        Selector::Id.new(name!)
       end
 
       def placeholder_selector
         return unless tok(/%/)
         @expected = "placeholder name"
-        Selector::Placeholder.new(tok!(IDENT))
+        Selector::Placeholder.new(ident!)
       end
 
       def element_name
@@ -221,13 +218,13 @@ MESSAGE
       end
 
       def qualified_name(allow_star_name = false)
-        name = tok(IDENT) || tok(/\*/) || (tok?(/\|/) && "")
+        name = ident || tok(/\*/) || (tok?(/\|/) && "")
         return unless name
         return nil, name unless tok(/\|/)
 
-        return name, tok!(IDENT) unless allow_star_name
+        return name, ident! unless allow_star_name
         @expected = "identifier or *"
-        return name, tok(IDENT) || tok!(/\*/)
+        return name, ident || tok!(/\*/)
       end
 
       def attrib
@@ -245,21 +242,21 @@ MESSAGE
         if op
           @expected = "identifier or string"
           ss
-          val = tok(IDENT) || tok!(STRING)
+          val = ident || tok!(STRING)
           ss
         end
-        flags = tok(IDENT) || tok(STRING)
+        flags = ident || tok(STRING)
         tok!(/\]/)
 
         Selector::Attribute.new(name, ns, op, val, flags)
       end
 
       def attrib_name!
-        if (name_or_ns = tok(IDENT))
+        if (name_or_ns = ident)
           # E, E|E
           if tok(/\|(?!=)/)
             ns = name_or_ns
-            name = tok(IDENT)
+            name = ident
           else
             name = name_or_ns
           end
@@ -267,7 +264,7 @@ MESSAGE
           # *|E or |E
           ns = tok(/\*/) || ""
           tok!(/\|/)
-          name = tok!(IDENT)
+          name = ident!
         end
         return ns, name
       end
@@ -282,7 +279,7 @@ MESSAGE
         s = tok(/::?/)
         return unless s
         @expected = "pseudoclass or pseudoelement"
-        name = tok!(IDENT)
+        name = ident!
         if tok(/\(/)
           ss
           deprefixed = deprefix(name)
@@ -345,7 +342,7 @@ MESSAGE
       end
 
       def keyframes_selector_component
-        tok(IDENT) || tok(PERCENTAGE)
+        ident || tok(PERCENTAGE)
       end
 
       @sass_script_parser = Class.new(Sass::Script::CssParser)

data/lib/sass/selector/comma_sequence.rb

@@ -119,7 +119,8 @@ module Sass
           if !allow_compound_target && sel.length > 1
             @@compound_extend_deprecation.warn(sseq.filename, sseq.line, <<WARNING)
 Extending a compound selector, #{sseq}, is deprecated and will not be supported in a future release.
-See https://github.com/sass/sass/issues/1599 for details.
+Consider "@extend #{sseq.members.join(', ')}" instead.
+See http://bit.ly/ExtendCompound for details.
 WARNING
           end
 

data/lib/sass/selector/pseudo.rb

@@ -134,7 +134,7 @@ module Sass
         res = (syntactic_type == :class ? ":" : "::") + @name
         if @arg || @selector
           res << "("
-          res << @arg.strip if @arg
+          res << Sass::Util.strip_except_escapes(@arg) if @arg
           res << " " if @arg && @selector
           res << @selector.to_s(opts) if @selector
           res << ")"

data/lib/sass/selector/sequence.rb

@@ -344,8 +344,6 @@ module Sass
       #   be nil. Otherwise, this will contained the merged selector. Array
       #   elements are [Sass::Util#paths]-style options; conceptually, an "or"
       #   of multiple selectors.
-      # @comment
-      #   rubocop:disable MethodLength
       def merge_final_ops(seq1, seq2, res = [])
         ops1, ops2 = [], []
         ops1 << seq1.pop while seq1.last.is_a?(String)
@@ -427,8 +425,6 @@ module Sass
           return merge_final_ops(seq1, seq2, res)
         end
       end
-      # @comment
-      #   rubocop:enable MethodLength
 
       # Takes initial subsequences of `seq1` and `seq2` and returns all
       # orderings of those subsequences. The initial subsequences are determined