sass 3.4.25 → 3.5.0.pre.rc.1

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=
@@ -42,15 +49,21 @@ module Sass::Script::Value
 
     # @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

@@ -306,7 +306,7 @@ module Sass::Script::Value
     end
     alias_method :to_sass, :inspect
 
-    # @return [Integer] The integer value of the number
+    # @return [Fixnum] The integer value of the number
     # @raise [Sass::SyntaxError] if the number isn't an integer
     def to_i
       super unless int?
@@ -510,8 +510,8 @@ module Sass::Script::Value
       },
       {
         'dpi'  => Rational(1),
-        'dpcm' => Rational(254, 100),
-        'dppx' => Rational(96)
+        'dpcm' => Rational(1, 2.54),
+        'dppx' => Rational(1, 96)
       }
     ]
 

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

@@ -2,8 +2,6 @@
 module Sass::Script::Value
   # A SassScript object representing a CSS string *or* a CSS identifier.
   class String < Base
-    @@interpolation_deprecation = Sass::Deprecation.new
-
     # The Ruby value of the string.
     #
     # @return [String]
@@ -123,9 +121,18 @@ module Sass::Script::Value
     def check_deprecated_interp
       return unless @deprecated_interp_equivalent
 
-      @@interpolation_deprecation.warn(source_range.file, source_range.start_pos.line, <<WARNING)
-\#{} interpolation near operators will be simplified in a future version of Sass.
-To preserve the current behavior, use quotes:
+      # rubocop:disable GlobalVars
+      $_sass_deprecated_interp_warnings ||= Set.new
+      key = [source_range.start_pos.line, source_range.file, @deprecated_interp_equivalent]
+      return if $_sass_deprecated_interp_warnings.include?(key)
+      $_sass_deprecated_interp_warnings << key
+      # rubocop:enable GlobalVars
+
+      location = "on line #{source_range.start_pos.line}"
+      location << " of #{source_range.file}" if source_range.file
+      Sass::Util.sass_warn <<WARNING
+DEPRECATION WARNING #{location}: \#{} interpolation near operators will be simplified
+in a future version of Sass. To preserve the current behavior, use quotes:
 
   #{@deprecated_interp_equivalent}
 WARNING

data/lib/sass/scss/parser.rb

@@ -16,9 +16,9 @@ module Sass
       #   warnings and source maps.
       # @param importer [Sass::Importers::Base] The importer used to import the
       #   file being parsed. Used for source maps.
-      # @param line [Integer] The 1-based line on which the source string appeared,
+      # @param line [Fixnum] The 1-based line on which the source string appeared,
       #   if it's part of another document.
-      # @param offset [Integer] The 1-based character (not byte) offset in the line on
+      # @param offset [Fixnum] The 1-based character (not byte) offset in the line on
       #   which the source string starts. Used for error reporting and sourcemap
       #   building.
       def initialize(str, filename, importer, line = 1, offset = 1)
@@ -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
@@ -767,6 +779,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 +793,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 +820,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 +829,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.
@@ -837,9 +863,6 @@ module Sass
           |
             (?!url\()
             [^"'/\#!;\{\}] # "
-          |
-            # interp_uri will handle most url() calls, but not ones that take strings
-            url\(#{W}(?=")
           |
             /(?![/*])
           |
@@ -851,6 +874,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 +948,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 +962,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 +976,16 @@ 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))
+        if (val = tok(STATIC_VALUE))
           str = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(val.strip))
           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
@@ -1005,7 +1073,7 @@ WARNING
       end
 
       def interp_ident(start = IDENT)
-        val = tok(start) || interpolation(:warn_for_color) || tok(IDENT_HYPHEN_INTERP, true)
+        val = tok(start) || interpolation(:warn_for_color) || tok(IDENT_HYPHEN_INTERP)
         return unless val
         res = [val]
         while (val = tok(NAME) || interpolation(:warn_for_color))
@@ -1022,7 +1090,7 @@ WARNING
       end
 
       def str
-        @strs.push String.new("")
+        @strs.push ""
         yield
         @strs.last
       ensure
@@ -1099,9 +1167,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 +1281,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

data/lib/sass/scss/rx.rb

@@ -32,7 +32,7 @@ module Sass
       # @return [String] The escaped character
       # @private
       def self.escape_char(c)
-        return "\\%06x" % (Sass::Util.ord(c)) unless c =~ %r{[ -/:-~]}
+        return "\\%06x" % c.ord unless c =~ %r{[ -/:-~]}
         "\\#{c}"
       end
 
@@ -40,7 +40,7 @@ module Sass
       # escaping all significant characters.
       #
       # @param str [String] The text of the regexp
-      # @param flags [Integer] Flags for the created regular expression
+      # @param flags [Fixnum] Flags for the created regular expression
       # @return [Regexp]
       # @private
       def self.quote(str, flags = 0)
@@ -50,13 +50,7 @@ module Sass
       H        = /[0-9a-fA-F]/
       NL       = /\n|\r\n|\r|\f/
       UNICODE  = /\\#{H}{1,6}[ \t\r\n\f]?/
-      s = if Sass::Util.ruby1_8?
-            '\200-\377'
-          elsif Sass::Util.macruby?
-            '\u0080-\uD7FF\uE000-\uFFFD\U00010000-\U0010FFFF'
-          else
-            '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
-          end
+      s = '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
       NONASCII = /[#{s}]/
       ESCAPE   = /#{UNICODE}|\\[ -~#{s}]/
       NMSTART  = /[_a-zA-Z]|#{NONASCII}|#{ESCAPE}/
@@ -127,13 +121,13 @@ module Sass
       OPTIONAL = /!#{W}optional/i
       IDENT_START = /-|#{NMSTART}/
 
-      IDENT_HYPHEN_INTERP = /-(#\{)/
+      IDENT_HYPHEN_INTERP = /-(?=#\{)/
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|#{ESCAPE})*)\'/
       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
 
       STATIC_COMPONENT = /#{IDENT}|#{STRING_NOINTERP}|#{HEXCOLOR}|[+-]?#{NUMBER}|\!important/i
-      STATIC_VALUE = %r(#{STATIC_COMPONENT}(\s*[\s,/]\s*#{STATIC_COMPONENT})*([;}]))i
+      STATIC_VALUE = %r(#{STATIC_COMPONENT}(\s*[\s,\/]\s*#{STATIC_COMPONENT})*(?=[;}]))i
       STATIC_SELECTOR = /(#{NMCHAR}|[ \t]|[,>+*]|[:#.]#{NMSTART}){1,50}([{])/i
     end
   end