sass 3.4.25 → 3.7.4

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

@@ -14,13 +14,20 @@ module Sass::Script::Value
     # @return [Symbol]
     attr_reader :separator
 
+    # Whether the list is surrounded by square brackets.
+    #
+    # @return [Boolean]
+    attr_reader :bracketed
+
     # Creates a new list.
     #
     # @param value [Array<Value>] See \{#value}
     # @param separator [Symbol] See \{#separator}
-    def initialize(value, separator)
+    # @param bracketed [Boolean] See \{#bracketed}
+    def initialize(value, separator: nil, bracketed: false)
       super(value)
       @separator = separator
+      @bracketed = bracketed
     end
 
     # @see Value#options=
@@ -33,24 +40,30 @@ module Sass::Script::Value
     def eq(other)
       Sass::Script::Value::Bool.new(
         other.is_a?(List) && value == other.value &&
-        separator == other.separator)
+        separator == other.separator && bracketed == other.bracketed)
     end
 
     def hash
-      @hash ||= [value, separator].hash
+      @hash ||= [value, separator, bracketed].hash
     end
 
     # @see Value#to_s
     def to_s(opts = {})
-      raise Sass::SyntaxError.new("() isn't a valid CSS value.") if value.empty?
-      value.
+      if !bracketed && value.empty?
+        raise Sass::SyntaxError.new("#{inspect} isn't a valid CSS value.")
+      end
+
+      members = value.
         reject {|e| e.is_a?(Null) || e.is_a?(List) && e.value.empty?}.
-        map {|e| e.to_s(opts)}.join(sep_str)
+        map {|e| e.to_s(opts)}
+
+      contents = members.join(sep_str)
+      bracketed ? "[#{contents}]" : contents
     end
 
     # @see Value#to_sass
     def to_sass(opts = {})
-      return "()" if value.empty?
+      return bracketed ? "[]" : "()" if value.empty?
       members = value.map do |v|
         if element_needs_parens?(v)
           "(#{v.to_sass(opts)})"
@@ -58,19 +71,26 @@ module Sass::Script::Value
           v.to_sass(opts)
         end
       end
-      return "(#{members.first},)" if members.length == 1 && separator == :comma
-      members.join(sep_str(nil))
+
+      if separator == :comma && members.length == 1
+        return "#{bracketed ? '[' : '('}#{members.first},#{bracketed ? ']' : ')'}"
+      end
+
+      contents = members.join(sep_str(nil))
+      bracketed ? "[#{contents}]" : contents
     end
 
     # @see Value#to_h
     def to_h
-      return Sass::Util.ordered_hash if value.empty?
+      return {} if value.empty?
       super
     end
 
     # @see Value#inspect
     def inspect
-      "(#{value.map {|e| e.inspect}.join(sep_str(nil))})"
+      (bracketed ? '[' : '(') +
+        value.map {|e| e.inspect}.join(sep_str(nil)) +
+        (bracketed ? ']' : ')')
     end
 
     # Asserts an index is within the list.
@@ -94,9 +114,10 @@ module Sass::Script::Value
 
     def element_needs_parens?(element)
       if element.is_a?(List)
-        return false if element.value.empty?
-        precedence = Sass::Script::Parser.precedence_of(separator)
-        return Sass::Script::Parser.precedence_of(element.separator) <= precedence
+        return false if element.value.length < 2
+        return false if element.bracketed
+        precedence = Sass::Script::Parser.precedence_of(separator || :space)
+        return Sass::Script::Parser.precedence_of(element.separator || :space) <= precedence
       end
 
       return false unless separator == :space

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

@@ -12,7 +12,7 @@ module Sass::Script::Value
     #
     # @param hash [Hash<Node, Node>]
     def initialize(hash)
-      super(Sass::Util.ordered_hash(hash))
+      super(hash)
     end
 
     # @see Value#options=
@@ -32,7 +32,7 @@ module Sass::Script::Value
     # @see Value#to_a
     def to_a
       value.map do |k, v|
-        list = List.new([k, v], :space)
+        list = List.new([k, v], separator: :space)
         list.options = options
         list
       end

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

@@ -34,7 +34,7 @@ module Sass::Script::Value
     attr_accessor :original
 
     def self.precision
-      Thread.current[:sass_numeric_precision] || Thread.main[:sass_numeric_precision] || 5
+      Thread.current[:sass_numeric_precision] || Thread.main[:sass_numeric_precision] || 10
     end
 
     # Sets the number of digits of precision
@@ -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

@@ -99,6 +99,18 @@ module Sass
         condition
       end
 
+      # Parses a custom property value.
+      #
+      # @return [Array<String, Sass::Script;:Tree::Node>] The interpolated value.
+      # @raise [Sass::SyntaxError] if there's a syntax error in the value,
+      #   or if it doesn't take up the entire input string.
+      def parse_declaration_value
+        init_scanner!
+        value = declaration_value
+        expected('"}"') unless value && @scanner.eos?
+        value
+      end
+
       private
 
       include Sass::SCSS::RX
@@ -191,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))
@@ -228,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(
@@ -254,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)
@@ -274,7 +286,7 @@ module Sass
 
       def for_directive(start_pos)
         tok!(/\$/)
-        var = tok! IDENT
+        var = ident!
         ss
 
         tok!(/from/)
@@ -291,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
 
@@ -465,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
@@ -530,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
@@ -624,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'
@@ -767,6 +790,12 @@ module Sass
         mid = [str {ss}]
         return name + mid unless tok(/:/)
         mid << ':'
+
+        # If this is a CSS variable, parse it as a property no matter what.
+        if name.first.is_a?(String) && name.first.start_with?("--")
+          return css_variable_declaration(name, name_start_pos, name_end_pos)
+        end
+
         return name + mid + [':'] if tok(/:/)
         mid << str {ss}
         post_colon_whitespace = !mid.last.empty?
@@ -775,7 +804,7 @@ module Sass
         value_start_pos = source_position
         value = nil
         error = catch_error do
-          value = value!(name.first.is_a?(String) && name.first.start_with?("--"))
+          value = value!
           if tok?(/\{/)
             # Properties that are ambiguous with selectors can't have additional
             # properties nested beneath them.
@@ -802,7 +831,7 @@ module Sass
         ss
         require_block = tok?(/\{/)
 
-        node = node(Sass::Tree::PropNode.new(name.flatten.compact, value, :new),
+        node = node(Sass::Tree::PropNode.new(name.flatten.compact, [value], :new),
                     name_start_pos, value_end_pos)
         node.name_source_range = range(name_start_pos, name_end_pos)
         node.value_source_range = range(value_start_pos, value_end_pos)
@@ -811,13 +840,21 @@ module Sass
         nested_properties! node
       end
 
-      # This production is similar to the CSS [`<any-value>`][any-value]
-      # production, but as the name implies, not quite the same. It's meant to
-      # consume values that could be a selector, an expression, or a combination
-      # of both. It respects strings and comments and supports interpolation. It
-      # will consume up to "{", "}", ";", or "!".
-      #
-      # [any-value]: http://dev.w3.org/csswg/css-variables/#typedef-any-value
+      def css_variable_declaration(name, name_start_pos, name_end_pos)
+        value_start_pos = source_position
+        value = declaration_value
+        value_end_pos = source_position
+
+        node = node(Sass::Tree::PropNode.new(name.flatten.compact, value, :new),
+                    name_start_pos, value_end_pos)
+        node.name_source_range = range(name_start_pos, name_end_pos)
+        node.value_source_range = range(value_start_pos, value_end_pos)
+        node
+      end
+
+      # This production consumes values that could be a selector, an expression,
+      # or a combination of both. It respects strings and comments and supports
+      # interpolation. It will consume up to "{", "}", ";", or "!".
       #
       # Values consumed by this production will usually be parsed more
       # thoroughly once interpolation has been resolved.
@@ -851,6 +888,60 @@ module Sass
                 interpolation(:warn_for_color)
       end
 
+      def declaration_value(top_level: true)
+        return unless (tok = declaration_value_token(top_level))
+        value = [tok]
+        while (tok = declaration_value_token(top_level))
+          value << tok
+        end
+        merge(value)
+      end
+
+      def declaration_value_token(top_level)
+        # This comes, more or less, from the [token consumption algorithm][].
+        # However, since we don't have to worry about the token semantics, we
+        # just consume everything until we come across a token with special
+        # semantics.
+        #
+        # [token consumption algorithm]: https://drafts.csswg.org/css-syntax-3/#consume-token.
+        result = tok(%r{
+          (
+            (?!
+              url\(
+            )
+            [^()\[\]{}"'#/ \t\r\n\f#{top_level ? ";" : ""}]
+          |
+            \#(?!\{)
+          |
+            /(?!\*)
+          )+
+        }xi) || interp_string || interp_uri || interpolation || tok(COMMENT)
+        return result if result
+
+        # Fold together multiple characters of whitespace that don't include
+        # newlines. The value only cares about the tokenization, so this is safe
+        # as long as we don't delete whitespace entirely. It's important that we
+        # fold here rather than post-processing, since we aren't allowed to fold
+        # whitespace within strings and we lose that context later on.
+        if (ws = tok(S))
+          return ws.include?("\n") ? ws.gsub(/\A[^\n]*/, '') : ' '
+        end
+
+        if tok(/\(/)
+          value = declaration_value(top_level: false)
+          tok!(/\)/)
+          ['(', *value, ')']
+        elsif tok(/\[/)
+          value = declaration_value(top_level: false)
+          tok!(/\]/)
+          ['[', *value, ']']
+        elsif tok(/\{/)
+          value = declaration_value(top_level: false)
+          tok!(/\}/)
+          ['{', *value, '}']
+        end
+      end
+
       def declaration
         # This allows the "*prop: val", ":prop: val", "#prop: val", and ".prop:
         # val" hacks.
@@ -871,12 +962,12 @@ module Sass
         tok!(/:/)
         ss
         value_start_pos = source_position
-        value = value!(name.first.is_a?(String) && name.first.start_with?("--"))
+        value = value!
         value_end_pos = source_position
         ss
         require_block = tok?(/\{/)
 
-        node = node(Sass::Tree::PropNode.new(name.flatten.compact, value, :new),
+        node = node(Sass::Tree::PropNode.new(name.flatten.compact, [value], :new),
                     name_start_pos, value_end_pos)
         node.name_source_range = range(name_start_pos, name_end_pos)
         node.value_source_range = range(value_start_pos, value_end_pos)
@@ -885,7 +976,7 @@ module Sass
         nested_properties! node
       end
 
-      def value!(css_variable = false)
+      def value!
         if tok?(/\{/)
           str = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))
           str.line = source_position.line
@@ -899,25 +990,19 @@ module Sass
         # we don't parse it at all, and instead return a plain old string
         # containing the value.
         # This results in a dramatic speed increase.
-        if (val = tok(STATIC_VALUE, true))
-          str = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(val.strip))
+        if (val = tok(STATIC_VALUE))
+          # 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
         end
-
-        sass_script(:parse, css_variable)
+        sass_script(:parse)
       end
 
       def nested_properties!(node)
-        if node.name.first.is_a?(String) && node.name.first.start_with?("--")
-          Sass::Util.sass_warn(<<WARNING)
-DEPRECATION WARNING on line #{@line}#{" of #{@filename}" if @filename}:
-Sass 3.6 will change the way CSS variables are parsed. Instead of being parsed as
-normal properties, they will not allow any Sass-specific behavior other than \#{}.
-WARNING
-        end
-
         @expected = 'expression (e.g. 1px, bold) or "{"'
         block(node, :property)
       end
@@ -966,7 +1051,7 @@ WARNING
       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
@@ -1004,11 +1089,27 @@ WARNING
         res
       end
 
-      def interp_ident(start = IDENT)
-        val = tok(start) || interpolation(:warn_for_color) || tok(IDENT_HYPHEN_INTERP, true)
+      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
@@ -1084,7 +1185,7 @@ WARNING
         :media_expr => "media expression (e.g. (min-device-width: 800px))",
         :at_root_query => "@at-root query (e.g. (without: media))",
         :at_root_directive_list => '* or identifier',
-        :pseudo_args => "expression (e.g. fr, 2n+1)",
+        :declaration_value => "expression (e.g. fr, 2n+1)",
         :interp_ident => "identifier",
         :qualified_name => "identifier",
         :expr => "expression (e.g. 1px, bold)",
@@ -1099,9 +1200,9 @@ WARNING
         :keyframes_selector => "keyframes selector (e.g. 10%)"
       }
 
-      TOK_NAMES = Sass::Util.to_hash(Sass::SCSS::RX.constants.map do |c|
+      TOK_NAMES = Hash[Sass::SCSS::RX.constants.map do |c|
         [Sass::SCSS::RX.const_get(c), c.downcase]
-      end).merge(
+      end].merge(
         IDENT => "identifier",
         /[;{}]/ => '";"',
         /\b(without|with)\b/ => '"with" or "without"'
@@ -1213,23 +1314,11 @@ WARNING
       # This is important because `#tok` is called all the time.
       NEWLINE = "\n"
 
-      def tok(rx, last_group_lookahead = false)
+      def tok(rx)
         res = @scanner.scan(rx)
 
         return unless res
 
-        # This fixes https://github.com/nex3/sass/issues/104, which affects
-        # Ruby 1.8.7 and REE. This fix is to replace the ?= zero-width
-        # positive lookahead operator in the Regexp (which matches without
-        # consuming the matched group), with a match that does consume the
-        # group, but then rewinds the scanner and removes the group from the
-        # end of the matched string. This fix makes the assumption that the
-        # matched group will always occur at the end of the match.
-        if last_group_lookahead && @scanner[-1]
-          @scanner.pos -= @scanner[-1].length
-          res.slice!(-@scanner[-1].length..-1)
-        end
-
         newline_count = res.count(NEWLINE)
         if newline_count > 0
           @line += newline_count