sass 3.5.0.pre.rc.1 → 3.5.0

data/lib/sass/script.rb

@@ -16,12 +16,12 @@ module Sass
     # Parses a string of SassScript
     #
     # @param value [String] The SassScript
-    # @param line [Fixnum] The number of the line on which the SassScript appeared.
+    # @param line [Integer] The number of the line on which the SassScript appeared.
     #   Used for error reporting
-    # @param offset [Fixnum] The number of characters in on `line` that the SassScript started.
+    # @param offset [Integer] The number of characters in on `line` that the SassScript started.
     #   Used for error reporting
     # @param options [{Symbol => Object}] An options hash;
-    #   see {file:SASS_REFERENCE.md#options the Sass options documentation}
+    #   see {file:SASS_REFERENCE.md#Options the Sass options documentation}
     # @return [Script::Tree::Node] The root node of the parse tree
     def self.parse(value, line, offset, options = {})
       Parser.parse(value, line, offset, options)

data/lib/sass/script/functions.rb

@@ -300,7 +300,7 @@ module Sass::Script
   # \{#call call($function, $args...)}
   # : Dynamically calls a Sass function reference returned by `get-function`.
   #
-  # \{#get_function get-function($name)}
+  # \{#get_function get-function($name, $css: false)}
   # : Looks up a function with the given name in the current lexical scope
   #   and returns a reference to it.
   #
@@ -441,8 +441,8 @@ module Sass::Script
     # If no signatures match, the first signature is returned for error messaging.
     #
     # @param method_name [Symbol] The name of the Ruby function to be called.
-    # @param arg_arity [Fixnum] The number of unnamed arguments the function was passed.
-    # @param kwarg_arity [Fixnum] The number of keyword arguments the function was passed.
+    # @param arg_arity [Integer] The number of unnamed arguments the function was passed.
+    # @param kwarg_arity [Integer] The number of keyword arguments the function was passed.
     #
     # @return [{Symbol => Object}, nil]
     #   The signature options for the matching signature,
@@ -654,7 +654,7 @@ module Sass::Script
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if any parameter is the wrong type or out of bounds
     def rgb(red, green, blue)
-      if calc?(red) || calc?(green) || calc?(blue)
+      if special_number?(red) || special_number?(green) || special_number?(blue)
         return unquoted_string("rgb(#{red}, #{green}, #{blue})")
       end
       assert_type red, :Number, :red
@@ -715,7 +715,7 @@ module Sass::Script
         color, alpha = args
 
         assert_type color, :Color, :color
-        if calc?(alpha)
+        if special_number?(alpha)
           unquoted_string("rgba(#{color.red}, #{color.green}, #{color.blue}, #{alpha})")
         else
           assert_type alpha, :Number, :alpha
@@ -724,7 +724,8 @@ module Sass::Script
         end
       when 4
         red, green, blue, alpha = args
-        if calc?(red) || calc?(green) || calc?(blue) || calc?(alpha)
+        if special_number?(red) || special_number?(green) ||
+           special_number?(blue) || special_number?(alpha)
           unquoted_string("rgba(#{red}, #{green}, #{blue}, #{alpha})")
         else
           rgba(rgb(red, green, blue), alpha)
@@ -753,7 +754,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$saturation` or `$lightness` are out of bounds
     #   or any parameter is the wrong type
     def hsl(hue, saturation, lightness)
-      if calc?(hue) || calc?(saturation) || calc?(lightness)
+      if special_number?(hue) || special_number?(saturation) || special_number?(lightness)
         unquoted_string("hsl(#{hue}, #{saturation}, #{lightness})")
       else
         hsla(hue, saturation, lightness, number(1))
@@ -781,7 +782,8 @@ module Sass::Script
     # @raise [ArgumentError] if `$saturation`, `$lightness`, or `$alpha` are out
     #   of bounds or any parameter is the wrong type
     def hsla(hue, saturation, lightness, alpha)
-      if calc?(hue) || calc?(saturation) || calc?(lightness) || calc?(alpha)
+      if special_number?(hue) || special_number?(saturation) ||
+         special_number?(lightness) || special_number?(alpha)
         return unquoted_string("hsla(#{hue}, #{saturation}, #{lightness}, #{alpha})")
       end
       assert_type hue, :Number, :hue
@@ -1324,7 +1326,7 @@ module Sass::Script
     #   @param $color1 [Sass::Script::Value::Color]
     #   @param $color2 [Sass::Script::Value::Color]
     #   @param $weight [Sass::Script::Value::Number] The relative weight of each
-    #     color. Closer to `0%` gives more weight to `$color1`, closer to `100%`
+    #     color. Closer to `100%` gives more weight to `$color1`, closer to `0%`
     #     gives more weight to `$color2`
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$weight` is out of bounds or any parameter is
@@ -1573,7 +1575,7 @@ MESSAGE
     #   @param $start-at [Sass::Script::Value::Number] The index of the first
     #     character of the substring. If this is negative, it counts from the end
     #     of `$string`
-    #   @param $end-before [Sass::Script::Value::Number] The index of the last
+    #   @param $end-at [Sass::Script::Value::Number] The index of the last
     #     character of the substring. If this is negative, it counts from the end
     #     of `$string`. Defaults to -1
     #   @return [Sass::Script::Value::String] The substring. This will be quoted
@@ -1592,7 +1594,7 @@ MESSAGE
       s = string.value.length + s if s < 0
       s = 0 if s < 0
       e = string.value.length + e if e < 0
-      e = 0 if s < 0
+      return Sass::Script::Value::String.new("", string.type) if e < 0
       extracted = string.value.slice(s..e)
       Sass::Script::Value::String.new(extracted || "", string.type)
     end
@@ -1610,7 +1612,7 @@ MESSAGE
     # @raise [ArgumentError] if `$string` isn't a string
     def to_upper_case(string)
       assert_type string, :String, :string
-      Sass::Script::Value::String.new(string.value.upcase, string.type)
+      Sass::Script::Value::String.new(Sass::Util.upcase(string.value), string.type)
     end
     declare :to_upper_case, [:string]
 
@@ -1625,7 +1627,7 @@ MESSAGE
     # @raise [ArgumentError] if `$string` isn't a string
     def to_lower_case(string)
       assert_type string, :String, :string
-      Sass::Script::Value::String.new(string.value.downcase, string.type)
+      Sass::Script::Value::String.new(Sass::Util.downcase(string.value), string.type)
     end
     declare :to_lower_case, [:string]
 
@@ -1690,13 +1692,11 @@ MESSAGE
     end
     declare :feature_exists, [:feature]
 
-    # Returns a reference to a function for later invocation with the `call` function.
+    # Returns a reference to a function for later invocation with the `call()` function.
     #
-    # The function reference created may refer to a function defined in
-    # your stylesheet, built-in to the host environment, or a CSS native
-    # function. As such, this function never returns an error, but the
-    # you can use `function-exists()` to check if the function reference
-    # created points at a Sass function.
+    # If `$css` is `false`, the function reference may refer to a function
+    # defined in your stylesheet or built-in to the host environment. If it's
+    # `true` it will refer to a plain-CSS function.
     #
     # @example
     #   get-function("rgb")
@@ -1704,8 +1704,9 @@ MESSAGE
     #   @function myfunc { @return "something"; }
     #   get-function("myfunc")
     #
-    # @overload get_function($name)
+    # @overload get_function($name, $css: false)
     #   @param name [Sass::Script::Value::String] The name of the function being referenced.
+    #   @param css [Sass::Script::Value::Bool] Whether to get a plain CSS function.
     #
     # @return [Sass::Script::Value::Function] A function reference.
     def get_function(name, kwargs = {})
@@ -2701,7 +2702,7 @@ WARNING
 
       extends = Sass::Util::SubsetMap.new
       begin
-        extender.populate_extends(extends, extendee)
+        extender.populate_extends(extends, extendee, nil, [], true)
         selector.do_extend(extends).to_sass_script
       rescue Sass::SyntaxError => e
         raise ArgumentError.new(e.to_s)
@@ -2744,7 +2745,7 @@ WARNING
 
       extends = Sass::Util::SubsetMap.new
       begin
-        replacement.populate_extends(extends, original)
+        replacement.populate_extends(extends, original, nil, [], true)
         selector.do_extend(extends, [], true).to_sass_script
       rescue Sass::SyntaxError => e
         raise ArgumentError.new(e.to_s)

data/lib/sass/script/lexer.rb

@@ -19,13 +19,13 @@ module Sass
       # `source_range`: \[`Sass::Source::Range`\]
       # : The range in the source file in which the token appeared.
       #
-      # `pos`: \[`Fixnum`\]
+      # `pos`: \[`Integer`\]
       # : The scanner position at which the SassScript token appeared.
       Token = Struct.new(:type, :value, :source_range, :pos)
 
       # The line number of the lexer's current position.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def line
         return @line unless @tok
         @tok.source_range.start_pos.line
@@ -34,7 +34,7 @@ module Sass
       # The number of bytes into the current line
       # of the lexer's current position (1-based).
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def offset
         return @offset unless @tok
         @tok.source_range.start_pos.offset
@@ -144,12 +144,12 @@ module Sass
       }
 
       # @param str [String, StringScanner] The source text to lex
-      # @param line [Fixnum] The 1-based line on which the SassScript appears.
+      # @param line [Integer] The 1-based line on which the SassScript appears.
       #   Used for error reporting and sourcemap building
-      # @param offset [Fixnum] The 1-based character (not byte) offset in the line in the source.
+      # @param offset [Integer] The 1-based character (not byte) offset in the line in the source.
       #   Used for error reporting and sourcemap building
       # @param options [{Symbol => Object}] An options hash;
-      #   see {file:SASS_REFERENCE.md#options the Sass options documentation}
+      #   see {file:SASS_REFERENCE.md#Options the Sass options documentation}
       def initialize(str, line, offset, options)
         @scanner = str.is_a?(StringScanner) ? str : Sass::Util::MultibyteStringScanner.new(str)
         @line = line
@@ -368,8 +368,17 @@ MESSAGE
         # IDs in properties are used in the Basic User Interface Module
         # (http://www.w3.org/TR/css3-ui/).
         return unless scan(REGULAR_EXPRESSIONS[:id])
-        if @scanner[0] =~ /^\#[0-9a-fA-F]+$/ && (@scanner[0].length == 4 || @scanner[0].length == 7)
-          return [:color, Script::Value::Color.from_hex(@scanner[0])]
+        if @scanner[0] =~ /^\#[0-9a-fA-F]+$/
+          if @scanner[0].length == 4 || @scanner[0].length == 7
+            return [:color, Script::Value::Color.from_hex(@scanner[0])]
+          elsif @scanner[0].length == 5 || @scanner[0].length == 9
+            filename = @options[:filename]
+            Sass::Util.sass_warn <<MESSAGE
+DEPRECATION WARNING on line #{line}, column #{offset}#{" of #{filename}" if filename}:
+The value "#{@scanner[0]}" is currently parsed as a string, but it will be parsed as a color in
+future versions of Sass. Use "unquote('#{@scanner[0]}')" to continue parsing it as a string.
+MESSAGE
+          end
         end
         [:ident, @scanner[0]]
       end

data/lib/sass/script/parser.rb

@@ -7,25 +7,25 @@ module Sass
     class Parser
       # The line number of the parser's current position.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def line
         @lexer.line
       end
 
       # The column number of the parser's current position.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def offset
         @lexer.offset
       end
 
       # @param str [String, StringScanner] The source text to parse
-      # @param line [Fixnum] The line on which the SassScript appears.
+      # @param line [Integer] The line on which the SassScript appears.
       #   Used for error reporting and sourcemap building
-      # @param offset [Fixnum] The character (not byte) offset where the script starts in the line.
+      # @param offset [Integer] The character (not byte) offset where the script starts in the line.
       #   Used for error reporting and sourcemap building
       # @param options [{Symbol => Object}] An options hash; see
-      #   {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+      #   {file:SASS_REFERENCE.md#Options the Sass options documentation}.
       #   This supports an additional `:allow_extra_text` option that controls
       #   whether the parser throws an error when extra text is encountered
       #   after the parsed construct.
@@ -820,8 +820,9 @@ RUBY
         location = "on line #{interpolation.line}"
         location << " of #{interpolation.filename}" if interpolation.filename
         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:
+DEPRECATION WARNING #{location}:
+\#{} interpolation near operators will be simplified in a future version of Sass.
+To preserve the current behavior, use quotes:
 
   #{interpolation.to_quoted_equivalent.to_sass}
 

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 [Fixnum]
+    # @return [Integer]
     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)

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

@@ -2,6 +2,9 @@ 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
@@ -85,28 +88,52 @@ module Sass::Script::Tree
         raise Sass::SyntaxError.new("Undefined operation: \"#{value1} #{@operator} #{value2}\".")
       end
 
-      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
+      warn_for_color_arithmetic(value1, value2)
+      warn_for_unitless_equals(value1, value2, result)
 
       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/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 [Fixnum] The hash code.
+    # @return [Integer for Ruby 2.4.0+, Fixnum for earlier Ruby versions] The hash code.
     def hash
       value.hash
     end
@@ -176,7 +176,7 @@ MSG
       eq(other).to_bool
     end
 
-    # @return [Fixnum] The integer value of this value
+    # @return [Integer] 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.")

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 [Fixnum]
-    # @return [Array<Fixnum>] Array of 4 numbers representing r,g,b and alpha
+    # @param color [Integer]
+    # @return [Array<Integer>] 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 [Fixnum]
+    # @return [Integer]
     def red
       hsl_to_rgb!
       @attrs[:red]
@@ -301,7 +301,7 @@ module Sass::Script::Value
 
     # The green component of the color.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def green
       hsl_to_rgb!
       @attrs[:green]
@@ -309,7 +309,7 @@ module Sass::Script::Value
 
     # The blue component of the color.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     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 [Fixnum]
+    # @return [Integer]
     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<Fixnum>] A frozen three-element array of the red, green, and blue
+    # @return [Array<Integer>] 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<Fixnum>] A frozen four-element array of the red, green,
+    # @return [Array<Integer>] 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<Fixnum>] A frozen three-element array of the
+    # @return [Array<Integer>] 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<Fixnum>] A frozen four-element array of the hue,
+    # @return [Array<Integer>] A frozen four-element array of the hue,
     #   saturation, lightness, and alpha values (respectively) of the color
     def hsla
       [hue, saturation, lightness, alpha].freeze
@@ -563,6 +563,11 @@ 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