sass 3.7.4 → 4.0.0.alpha.1

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

@@ -49,14 +49,14 @@ module Sass::Script::Tree
     # @see Node#_perform
     def _perform(environment)
       keys = Set.new
-      map = Sass::Script::Value::Map.new(Hash[pairs.map do |(k, v)|
+      map = Sass::Script::Value::Map.new(Sass::Util.to_hash(pairs.map do |(k, v)|
         k, v = k.perform(environment), v.perform(environment)
         if keys.include?(k)
           raise Sass::SyntaxError.new("Duplicate key #{k.inspect} in map #{to_sass}.")
         end
         keys << k
         [k, v]
-      end])
+      end))
       map.options = options
       map
     end

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

@@ -10,7 +10,7 @@ module Sass::Script::Tree
 
     # The line of the document on which this node appeared.
     #
-    # @return [Integer]
+    # @return [Fixnum]
     attr_accessor :line
 
     # The source range in the document on which this node appeared.
@@ -25,7 +25,7 @@ module Sass::Script::Tree
 
     # Sets the options hash for this node,
     # as well as for all child nodes.
-    # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
+    # See {file:SASS_REFERENCE.md#options the Sass options documentation}.
     #
     # @param options [{Symbol => Object}] The options
     def options=(options)
@@ -90,7 +90,7 @@ module Sass::Script::Tree
     # Converts underscores to dashes if the :dasherize option is set.
     def dasherize(s, opts)
       if opts[:dasherize]
-        s.tr('_', '-')
+        s.gsub(/_/, '-')
       else
         s
       end

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

@@ -2,9 +2,6 @@ module Sass::Script::Tree
   # A SassScript parse node representing a binary operation,
   # such as `$a + $b` or `"foo" + 1`.
   class Operation < Node
-    @@color_arithmetic_deprecation = Sass::Deprecation.new
-    @@unitless_equals_deprecation = Sass::Deprecation.new
-
     attr_reader :operand1
     attr_reader :operand2
     attr_reader :operator
@@ -88,52 +85,28 @@ module Sass::Script::Tree
         raise Sass::SyntaxError.new("Undefined operation: \"#{value1} #{@operator} #{value2}\".")
       end
 
-      warn_for_color_arithmetic(value1, value2)
-      warn_for_unitless_equals(value1, value2, result)
+      if (@operator == :eq || @operator == :neq) && value1.is_a?(Sass::Script::Value::Number) &&
+         value2.is_a?(Sass::Script::Value::Number) && value1.unitless? != value2.unitless? &&
+         result == (if @operator == :eq
+                      Sass::Script::Value::Bool::TRUE
+                    else
+                      Sass::Script::Value::Bool::FALSE
+                    end)
+
+        operation = "#{value1} #{@operator == :eq ? '==' : '!='} #{value2}"
+        future_value = @operator == :neq
+        Sass::Util.sass_warn <<WARNING
+DEPRECATION WARNING on line #{line}#{" of #{filename}" if filename}:
+The result of `#{operation}` will be `#{future_value}` in future releases of Sass.
+Unitless numbers will no longer be equal to the same numbers with units.
+WARNING
+      end
 
       result
     end
 
     private
 
-    def warn_for_color_arithmetic(value1, value2)
-      return unless @operator == :plus || @operator == :times || @operator == :minus ||
-                    @operator == :div || @operator == :mod
-
-      if value1.is_a?(Sass::Script::Value::Number)
-        return unless value2.is_a?(Sass::Script::Value::Color)
-      elsif value1.is_a?(Sass::Script::Value::Color)
-        return unless value2.is_a?(Sass::Script::Value::Color) || value2.is_a?(Sass::Script::Value::Number)
-      else
-        return
-      end
-
-      @@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.
-https://sass-lang.com/documentation/Sass/Script/Functions.html#other_color_functions
-WARNING
-    end
-
-    def warn_for_unitless_equals(value1, value2, result)
-      return unless @operator == :eq || @operator == :neq
-      return unless value1.is_a?(Sass::Script::Value::Number)
-      return unless value2.is_a?(Sass::Script::Value::Number)
-      return unless value1.unitless? != value2.unitless?
-      return unless result == (if @operator == :eq
-                                 Sass::Script::Value::Bool::TRUE
-                               else
-                                 Sass::Script::Value::Bool::FALSE
-                               end)
-
-      operation = "#{value1.to_sass} #{@operator == :eq ? '==' : '!='} #{value2.to_sass}"
-      future_value = @operator == :neq
-      @@unitless_equals_deprecation.warn(filename, line, <<WARNING)
-The result of `#{operation}` will be `#{future_value}` in future releases of Sass.
-Unitless numbers will no longer be equal to the same numbers with units.
-WARNING
-    end
-
     def operand_to_sass(op, side, opts)
       return "(#{op.to_sass(opts)})" if op.is_a?(Sass::Script::Tree::ListLiteral)
       return op.to_sass(opts) unless op.is_a?(Operation)

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

@@ -3,15 +3,9 @@ module Sass::Script::Tree
   #
   # @see Interpolation
   class StringInterpolation < Node
-    # @return [Literal] The string literal before this interpolation.
-    attr_reader :before
-
-    # @return [Node] The SassScript within the interpolation
-    attr_reader :mid
-
-    # @return [StringInterpolation, Literal]
-    #     The string literal or string interpolation before this interpolation.
-    attr_reader :after
+    # @return [[Node, String]] The contents of the interpolation. Strings are
+    #   literal text, nodes are interpolated segments.
+    attr_reader :contents
 
     # Whether this is a CSS string or a CSS identifier. The difference is that
     # strings are written with double-quotes, while identifiers aren't.
@@ -20,62 +14,56 @@ module Sass::Script::Tree
     # functions such as `url()`.
     #
     # @return [Symbol] `:string` or `:identifier`
-    def type
-      @before.value.type
-    end
+    attr_reader :type
 
-    # Returns the quote character that should be used to wrap a Sass
-    # representation of this interpolation.
-    def quote
-      quote_for(self) || '"'
-    end
-
-    # Interpolation in a string is of the form `"before #{mid} after"`,
-    # where `before` and `after` may include more interpolation.
+    # Interpolation in a string.
     #
-    # @param before [StringInterpolation, Literal] See {StringInterpolation#before}
-    # @param mid [Node] See {StringInterpolation#mid}
-    # @param after [Literal] See {StringInterpolation#after}
-    def initialize(before, mid, after)
-      @before = before
-      @mid = mid
-      @after = after
+    # @param contents [[Node, String]] See {StringInterpolation#contents}
+    # @param type [Symbol] See {StringInterpolation#type}
+    def initialize(contents, type = :string)
+      @contents = Sass::Util.merge_adjacent_strings(contents)
+      @type = type
     end
 
     # @return [String] A human-readable s-expression representation of the interpolation
     def inspect
-      "(string_interpolation #{@before.inspect} #{@mid.inspect} #{@after.inspect})"
+      "(string_interpolation #{@type.inspect} #{contents.map {|c| c.inspect}.join(', ')})"
     end
 
     # @see Node#to_sass
     def to_sass(opts = {})
-      quote = type == :string ? opts[:quote] || quote_for(self) || '"' : :none
+      quote = type == :string ? opts[:quote] || detected_quote : :none
       opts = opts.merge(:quote => quote)
 
       res = ""
       res << quote if quote != :none
-      res << _to_sass(before, opts)
-      res << '#{' << @mid.to_sass(opts.merge(:quote => nil)) << '}'
-      res << _to_sass(after, opts)
+      contents.each do |c|
+        if c.is_a?(String)
+          c = Sass::Script::Value::String.quote(c, opts).slice(1...-1) if quote != :none
+          res << c
+        else
+          res << '#{' << c.to_sass(opts.merge(:quote => nil)) << '}'
+        end
+      end
       res << quote if quote != :none
       res
     end
 
-    # Returns the three components of the interpolation, `before`, `mid`, and `after`.
+    # Returns the node contents of this interpolation.
     #
     # @return [Array<Node>]
     # @see #initialize
     # @see Node#children
     def children
-      [@before, @mid, @after].compact
+      contents.select {|c| c.is_a?(Sass::Script::Tree::Node)}
     end
 
     # @see Node#deep_copy
     def deep_copy
       node = dup
-      node.instance_variable_set('@before', @before.deep_copy) if @before
-      node.instance_variable_set('@mid', @mid.deep_copy)
-      node.instance_variable_set('@after', @after.deep_copy) if @after
+      node.instance_variable_set('@contents', contents.map do |c|
+        c.is_a?(String) ? c : c.deep_copy
+      end)
       node
     end
 
@@ -87,39 +75,30 @@ module Sass::Script::Tree
     # @return [Sass::Script::Value::String]
     #   The SassScript string that is the value of the interpolation
     def _perform(environment)
-      res = ""
-      before = @before.perform(environment)
-      res << before.value
-      mid = @mid.perform(environment)
-      res << (mid.is_a?(Sass::Script::Value::String) ? mid.value : mid.to_s(:quote => :none))
-      res << @after.perform(environment).value
-      opts(Sass::Script::Value::String.new(res, before.type))
+      opts(Sass::Script::Value::String.new(contents.map do |c|
+        next c if c.is_a?(String)
+        value = c.perform(environment)
+        value.is_a?(Sass::Script::Value::String) ? value.value : value.to_s(:quote => :none)
+      end.join, type))
     end
 
     private
 
-    def _to_sass(string_or_interp, opts)
-      result = string_or_interp.to_sass(opts)
-      opts[:quote] == :none ? result : result.slice(1...-1)
-    end
-
-    def quote_for(string_or_interp)
-      if string_or_interp.is_a?(Sass::Script::Tree::Literal)
-        return nil if string_or_interp.value.value.empty?
-        return '"' if string_or_interp.value.value.include?("'")
-        return "'" if string_or_interp.value.value.include?('"')
-        return nil
+    # Returns the best quote to use for this interpolation.
+    #
+    # @return [String]
+    def detected_quote
+      has_double_quote = false
+      contents.each do |c|
+        next if c.is_a?(Sass::Script::Tree::Node)
+
+        # Double-quotes take precedence over single quotes, so if any string contains
+        # a single quote we'll definitely end up using double quotes.
+        return '"' if c.include?("'")
+        has_double_quote ||= c.include?('"')
       end
 
-      # Double-quotes take precedence over single quotes.
-      before_quote = quote_for(string_or_interp.before)
-      return '"' if before_quote == '"'
-      after_quote = quote_for(string_or_interp.after)
-      return '"' if after_quote == '"'
-
-      # Returns "'" if either or both insist on single quotes, and nil
-      # otherwise.
-      before_quote || after_quote
+      has_double_quote ? "'" : '"'
     end
   end
 end

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

@@ -14,7 +14,7 @@ module Sass::Script::Tree
     # @param name [String] See \{#name}
     def initialize(name)
       @name = name
-      @underscored_name = name.tr("-", "_")
+      @underscored_name = name.gsub(/-/, "_")
       super()
     end
 

data/lib/sass/script/value.rb

@@ -9,5 +9,3 @@ require 'sass/script/value/null'
 require 'sass/script/value/list'
 require 'sass/script/value/arg_list'
 require 'sass/script/value/map'
-require 'sass/script/value/callable'
-require 'sass/script/value/function'

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

@@ -17,7 +17,7 @@ module Sass::Script::Value
     # @param keywords [Hash<String, Value>, NormalizedMap<Value>] See \{#keywords}
     # @param separator [String] See \{List#separator}.
     def initialize(value, keywords, separator)
-      super(value, separator: separator)
+      super(value, separator)
       if keywords.is_a?(Sass::Util::NormalizedMap)
         @keywords = keywords
       else

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

@@ -22,12 +22,11 @@ module Sass::Script::Value
     def initialize(value = nil)
       value.freeze unless value.nil? || value == true || value == false
       @value = value
-      @options = nil
     end
 
     # Sets the options hash for this node,
     # as well as for all child nodes.
-    # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
+    # See {file:SASS_REFERENCE.md#options the Sass options documentation}.
     #
     # @param options [{Symbol => Object}] The options
     attr_writer :options
@@ -88,7 +87,7 @@ MSG
     # @return [Script::Value::String] A string containing both values
     #   separated by `"="`
     def single_eq(other)
-      Sass::Script::Value::String.new("#{self}=#{other}")
+      Sass::Script::Value::String.new("#{to_s}=#{other.to_s}")
     end
 
     # The SassScript `+` operation.
@@ -107,7 +106,7 @@ MSG
     # @return [Script::Value::String] A string containing both values
     #   separated by `"-"`
     def minus(other)
-      Sass::Script::Value::String.new("#{self}-#{other}")
+      Sass::Script::Value::String.new("#{to_s}-#{other.to_s}")
     end
 
     # The SassScript `/` operation.
@@ -116,7 +115,7 @@ MSG
     # @return [Script::Value::String] A string containing both values
     #   separated by `"/"`
     def div(other)
-      Sass::Script::Value::String.new("#{self}/#{other}")
+      Sass::Script::Value::String.new("#{to_s}/#{other.to_s}")
     end
 
     # The SassScript unary `+` operation (e.g. `+$a`).
@@ -125,7 +124,7 @@ MSG
     # @return [Script::Value::String] A string containing the value
     #   preceded by `"+"`
     def unary_plus
-      Sass::Script::Value::String.new("+#{self}")
+      Sass::Script::Value::String.new("+#{to_s}")
     end
 
     # The SassScript unary `-` operation (e.g. `-$a`).
@@ -134,7 +133,7 @@ MSG
     # @return [Script::Value::String] A string containing the value
     #   preceded by `"-"`
     def unary_minus
-      Sass::Script::Value::String.new("-#{self}")
+      Sass::Script::Value::String.new("-#{to_s}")
     end
 
     # The SassScript unary `/` operation (e.g. `/$a`).
@@ -143,13 +142,13 @@ MSG
     # @return [Script::Value::String] A string containing the value
     #   preceded by `"/"`
     def unary_div
-      Sass::Script::Value::String.new("/#{self}")
+      Sass::Script::Value::String.new("/#{to_s}")
     end
 
     # Returns the hash code of this value. Two objects' hash codes should be
     # equal if the objects are equal.
     #
-    # @return [Integer for Ruby 2.4.0+, Fixnum for earlier Ruby versions] The hash code.
+    # @return [Fixnum] The hash code.
     def hash
       value.hash
     end
@@ -176,7 +175,7 @@ MSG
       eq(other).to_bool
     end
 
-    # @return [Integer] The integer value of this value
+    # @return [Fixnum] The integer value of this value
     # @raise [Sass::SyntaxError] if this value isn't an integer
     def to_i
       raise Sass::SyntaxError.new("#{inspect} is not an integer.")
@@ -192,12 +191,6 @@ MSG
     # @return [Symbol]
     def separator; nil; end
 
-    # Whether the value is surrounded by square brackets. For non-list values,
-    # this will be `false`.
-    #
-    # @return [Boolean]
-    def bracketed; false; end
-
     # Returns the value of this value as a list.
     # Single values are considered the same as single-element lists.
     #
@@ -234,17 +227,6 @@ MSG
       false
     end
 
-    # Creates a new list containing `contents` but with the same brackets and
-    # separators as this object, when interpreted as a list.
-    #
-    # @param contents [Array<Value>] The contents of the new list.
-    # @param separator [Symbol] The separator of the new list. Defaults to \{#separator}.
-    # @param bracketed [Boolean] Whether the new list is bracketed. Defaults to \{#bracketed}.
-    # @return [Sass::Script::Value::List]
-    def with_contents(contents, separator: self.separator, bracketed: self.bracketed)
-      Sass::Script::Value::List.new(contents, separator: separator, bracketed: bracketed)
-    end
-
     protected
 
     # Evaluates the value.

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

@@ -17,16 +17,15 @@ module Sass::Script::Value
     # @private
     #
     # Convert a ruby integer to a rgba components
-    # @param color [Integer]
-    # @return [Array<Integer>] Array of 4 numbers representing r,g,b and alpha
+    # @param color [Fixnum]
+    # @return [Array<Fixnum>] Array of 4 numbers representing r,g,b and alpha
     def self.int_to_rgba(color)
       rgba = (0..3).map {|n| color >> (n << 3) & 0xff}.reverse
       rgba[-1] = rgba[-1] / 255.0
       rgba
     end
 
-    ALTERNATE_COLOR_NAMES = Sass::Util.map_vals(
-      {
+    ALTERNATE_COLOR_NAMES = Sass::Util.map_vals({
         'aqua'                 => 0x00FFFFFF,
         'darkgrey'             => 0xA9A9A9FF,
         'darkslategrey'        => 0x2F4F4FFF,
@@ -36,11 +35,10 @@ module Sass::Script::Value
         'lightgrey'            => 0xD3D3D3FF,
         'lightslategrey'       => 0x778899FF,
         'slategrey'            => 0x708090FF,
-      }, &method(:int_to_rgba))
+    }, &method(:int_to_rgba))
 
     # A hash from color names to `[red, green, blue]` value arrays.
-    COLOR_NAMES = Sass::Util.map_vals(
-      {
+    COLOR_NAMES = Sass::Util.map_vals({
         'aliceblue'            => 0xF0F8FFFF,
         'antiquewhite'         => 0xFAEBD7FF,
         'aquamarine'           => 0x7FFFD4FF,
@@ -181,7 +179,7 @@ module Sass::Script::Value
         'whitesmoke'           => 0xF5F5F5FF,
         'yellow'               => 0xFFFF00FF,
         'yellowgreen'          => 0x9ACD32FF
-      }, &method(:int_to_rgba))
+     }, &method(:int_to_rgba))
 
     # A hash from `[red, green, blue, alpha]` value arrays to color names.
     COLOR_NAMES_REVERSE = COLOR_NAMES.invert.freeze
@@ -239,7 +237,7 @@ module Sass::Script::Value
         @attrs[:alpha] = attrs[3] ? attrs[3].to_f : 1
         @representation = representation
       else
-        attrs = attrs.reject {|_k, v| v.nil?}
+        attrs = attrs.reject {|k, v| v.nil?}
         hsl = [:hue, :saturation, :lightness] & attrs.keys
         rgb = [:red, :green, :blue] & attrs.keys
         if !allow_both_rgb_and_hsl && !hsl.empty? && !rgb.empty?
@@ -277,14 +275,13 @@ 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})([0-9a-f]{2})?$/i ||
-             hex_string =~ /^#?([0-9a-f])([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})$/i ||
+             hex_string =~ /^#?([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}
@@ -294,7 +291,7 @@ module Sass::Script::Value
 
     # The red component of the color.
     #
-    # @return [Integer]
+    # @return [Fixnum]
     def red
       hsl_to_rgb!
       @attrs[:red]
@@ -302,7 +299,7 @@ module Sass::Script::Value
 
     # The green component of the color.
     #
-    # @return [Integer]
+    # @return [Fixnum]
     def green
       hsl_to_rgb!
       @attrs[:green]
@@ -310,7 +307,7 @@ module Sass::Script::Value
 
     # The blue component of the color.
     #
-    # @return [Integer]
+    # @return [Fixnum]
     def blue
       hsl_to_rgb!
       @attrs[:blue]
@@ -343,7 +340,7 @@ module Sass::Script::Value
     # The alpha channel (opacity) of the color.
     # This is 1 unless otherwise defined.
     #
-    # @return [Integer]
+    # @return [Fixnum]
     def alpha
       @attrs[:alpha].to_f
     end
@@ -358,7 +355,7 @@ module Sass::Script::Value
 
     # Returns the red, green, and blue components of the color.
     #
-    # @return [Array<Integer>] A frozen three-element array of the red, green, and blue
+    # @return [Array<Fixnum>] A frozen three-element array of the red, green, and blue
     #   values (respectively) of the color
     def rgb
       [red, green, blue].freeze
@@ -366,7 +363,7 @@ module Sass::Script::Value
 
     # Returns the red, green, blue, and alpha components of the color.
     #
-    # @return [Array<Integer>] A frozen four-element array of the red, green,
+    # @return [Array<Fixnum>] A frozen four-element array of the red, green,
     #   blue, and alpha values (respectively) of the color
     def rgba
       [red, green, blue, alpha].freeze
@@ -374,7 +371,7 @@ module Sass::Script::Value
 
     # Returns the hue, saturation, and lightness components of the color.
     #
-    # @return [Array<Integer>] A frozen three-element array of the
+    # @return [Array<Fixnum>] A frozen three-element array of the
     #   hue, saturation, and lightness values (respectively) of the color
     def hsl
       [hue, saturation, lightness].freeze
@@ -382,7 +379,7 @@ module Sass::Script::Value
 
     # Returns the hue, saturation, lightness, and alpha components of the color.
     #
-    # @return [Array<Integer>] A frozen four-element array of the hue,
+    # @return [Array<Fixnum>] A frozen four-element array of the hue,
     #   saturation, lightness, and alpha values (respectively) of the color
     def hsla
       [hue, saturation, lightness, alpha].freeze
@@ -424,7 +421,7 @@ module Sass::Script::Value
     # @return [Color] The new Color object
     # @raise [ArgumentError] if both RGB and HSL keys are specified
     def with(attrs)
-      attrs = attrs.reject {|_k, v| v.nil?}
+      attrs = attrs.reject {|k, v| v.nil?}
       hsl = !([:hue, :saturation, :lightness] & attrs.keys).empty?
       rgb = !([:red, :green, :blue] & attrs.keys).empty?
       if hsl && rgb
@@ -564,11 +561,6 @@ module Sass::Script::Value
     def to_s(opts = {})
       return smallest if options[:style] == :compressed
       return representation if representation
-
-      # IE10 doesn't properly support the color name "transparent", so we emit
-      # generated transparent colors as rgba(0, 0, 0, 0) in favor of that. See
-      # #1782.
-      return rgba_str if Number.basically_equal?(alpha, 0)
       return name if name
       alpha? ? rgba_str : hex_str
     end