sass 3.4.25 → 3.5.0.pre.rc.1

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

@@ -13,13 +13,20 @@ module Sass::Script::Tree
     # @return [Symbol]
     attr_reader :separator
 
+    # Whether the list is surrounded by square brackets.
+    #
+    # @return [Boolean]
+    attr_reader :bracketed
+
     # Creates a new list literal.
     #
     # @param elements [Array<Node>] See \{#elements}
     # @param separator [Symbol] See \{#separator}
-    def initialize(elements, separator)
+    # @param bracketed [Boolean] See \{#bracketed}
+    def initialize(elements, separator: nil, bracketed: false)
       @elements = elements
       @separator = separator
+      @bracketed = bracketed
     end
 
     # @see Node#children
@@ -27,7 +34,7 @@ module Sass::Script::Tree
 
     # @see Value#to_sass
     def to_sass(opts = {})
-      return "()" if elements.empty?
+      return bracketed ? "[]" : "()" if elements.empty?
       members = elements.map do |v|
         if element_needs_parens?(v)
           "(#{v.to_sass(opts)})"
@@ -36,9 +43,12 @@ module Sass::Script::Tree
         end
       end
 
-      return "(#{members.first},)" if separator == :comma && members.length == 1
+      if separator == :comma && members.length == 1
+        return "#{bracketed ? '[' : '('}#{members.first},#{bracketed ? ']' : ')'}"
+      end
 
-      members.join(sep_str(nil))
+      contents = members.join(sep_str(nil))
+      bracketed ? "[#{contents}]" : contents
     end
 
     # @see Node#deep_copy
@@ -49,7 +59,9 @@ module Sass::Script::Tree
     end
 
     def inspect
-      "(#{elements.map {|e| e.inspect}.join(separator == :space ? ' ' : ', ')})"
+      (bracketed ? '[' : '(') +
+        elements.map {|e| e.inspect}.join(separator == :space ? ' ' : ', ') +
+        (bracketed ? ']' : ')')
     end
 
     def force_division!
@@ -61,7 +73,8 @@ module Sass::Script::Tree
     def _perform(environment)
       list = Sass::Script::Value::List.new(
         elements.map {|e| e.perform(environment)},
-        separator)
+        separator: separator,
+        bracketed: bracketed)
       list.source_range = source_range
       list.options = options
       list
@@ -73,8 +86,10 @@ module Sass::Script::Tree
     # when serialized to Sass.
     def element_needs_parens?(element)
       if element.is_a?(ListLiteral)
-        return Sass::Script::Parser.precedence_of(element.separator) <=
-               Sass::Script::Parser.precedence_of(separator)
+        return false if element.elements.length < 2
+        return false if element.bracketed
+        return Sass::Script::Parser.precedence_of(element.separator || :space) <=
+               Sass::Script::Parser.precedence_of(separator || :space)
       end
 
       return false unless separator == :space

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(Sass::Util.to_hash(pairs.map do |(k, v)|
+      map = Sass::Script::Value::Map.new(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.
@@ -23,17 +23,9 @@ module Sass::Script::Tree
     # @return [String]
     attr_accessor :filename
 
-    # The warning that this node should emit if it executes in a way that's not
-    # safe for a CSS variable value.
-    #
-    # This is `nil` if this is not in a CSS variable value.
-    #
-    # @return [Sass::Script::CssVariableWarning]
-    attr_accessor :css_variable_warning
-
     # 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)

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
@@ -81,13 +78,6 @@ module Sass::Script::Tree
           "Invalid null operation: \"#{value1.inspect} #{@operator} #{value2.inspect}\".")
       end
 
-      if css_variable_warning && @operator == :div &&
-         !(value1.is_a?(Sass::Script::Value::Number) && value1.original &&
-           value2.is_a?(Sass::Script::Value::Number) && value2.original) &&
-         !(value1.is_a?(Sass::Script::Value::String) && value2.is_a?(Sass::Script::Value::String))
-        css_variable_warning.warn!
-      end
-
       begin
         result = opts(value1.send(@operator, value2))
       rescue NoMethodError => e
@@ -95,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.to_sass} #{@operator == :eq ? '==' : '!='} #{value2.to_sass}"
+        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.
-http://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/value.rb

@@ -9,3 +9,5 @@ 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)
+      super(value, separator: separator)
       if keywords.is_a?(Sass::Util::NormalizedMap)
         @keywords = keywords
       else

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

@@ -27,7 +27,7 @@ module Sass::Script::Value
 
     # 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
@@ -149,7 +149,7 @@ MSG
     # 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 +176,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,6 +192,12 @@ 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.
     #
@@ -228,6 +234,17 @@ 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/callable.rb

@@ -0,0 +1,25 @@
+module Sass::Script::Value
+  # A SassScript object representing a null value.
+  class Callable < Base
+    # Constructs a Callable value for use in SassScript.
+    #
+    # @param callable [Sass::Callable] The callable to be used when the
+    # callable is called.
+    def initialize(callable)
+      super(callable)
+    end
+
+    def to_s(opts = {})
+      raise Sass::SyntaxError.new("#{to_sass} isn't a valid CSS value.")
+    end
+
+    def inspect
+      to_sass
+    end
+
+    # @abstract
+    def to_sass
+      Sass::Util.abstract(self)
+    end
+  end
+end

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

@@ -17,8 +17,8 @@ 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
@@ -293,7 +293,7 @@ module Sass::Script::Value
 
     # The red component of the color.
     #
-    # @return [Integer]
+    # @return [Fixnum]
     def red
       hsl_to_rgb!
       @attrs[:red]
@@ -301,7 +301,7 @@ module Sass::Script::Value
 
     # The green component of the color.
     #
-    # @return [Integer]
+    # @return [Fixnum]
     def green
       hsl_to_rgb!
       @attrs[:green]
@@ -309,7 +309,7 @@ module Sass::Script::Value
 
     # The blue component of the color.
     #
-    # @return [Integer]
+    # @return [Fixnum]
     def blue
       hsl_to_rgb!
       @attrs[:blue]
@@ -342,7 +342,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
@@ -357,7 +357,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
@@ -365,7 +365,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
@@ -373,7 +373,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
@@ -381,7 +381,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

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

@@ -0,0 +1,19 @@
+module Sass::Script::Value
+  # A SassScript object representing a function.
+  class Function < Callable
+    # Constructs a Function value for use in SassScript.
+    #
+    # @param function [Sass::Callable] The callable to be used when the
+    # function is invoked.
+    def initialize(function)
+      unless function.type == "function"
+        raise ArgumentError.new("A callable of type function was expected.")
+      end
+      super
+    end
+
+    def to_sass
+      %{get-function("#{value.name}")}
+    end
+  end
+end

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

@@ -68,26 +68,35 @@ module Sass::Script::Value
       Number.new(number, *parse_unit_string(unit_string))
     end
 
-    # @overload list(*elements, separator)
+    # @overload list(*elements, separator:, bracketed: false)
     #   Create a space-separated list from the arguments given.
     #   @param elements [Array<Sass::Script::Value::Base>] Each argument will be a list element.
     #   @param separator [Symbol] Either :space or :comma.
+    #   @param bracketed [Boolean] Whether the list uses square brackets.
     #   @return [Sass::Script::Value::List] The space separated list.
     #
-    # @overload list(array, separator)
+    # @overload list(array, separator:, bracketed: false)
     #   Create a space-separated list from the array given.
     #   @param array [Array<Sass::Script::Value::Base>] A ruby array of Sass values
     #     to make into a list.
+    #   @param separator [Symbol] Either :space or :comma.
+    #   @param bracketed [Boolean] Whether the list uses square brackets.
     #   @return [Sass::Script::Value::List] The space separated list.
-    def list(*elements)
-      unless elements.last.is_a?(Symbol)
-        raise ArgumentError.new("A list type of :space or :comma must be specified.")
+    def list(*elements, separator: nil, bracketed: false)
+      # Support passing separator as the last value in elements for
+      # backwards-compatibility.
+      if separator.nil?
+        if elements.last.is_a?(Symbol)
+          separator = elements.pop
+        else
+          raise ArgumentError.new("A separator of :space or :comma must be specified.")
+        end
       end
-      separator = elements.pop
+
       if elements.size == 1 && elements.first.is_a?(Array)
         elements = elements.first
       end
-      Sass::Script::Value::List.new(elements, separator)
+      Sass::Script::Value::List.new(elements, separator: separator, bracketed: bracketed)
     end
 
     # Construct a Sass map.