sass 3.7.4 → 4.0.0.alpha.1

data/lib/sass/plugin/configuration.rb

@@ -26,8 +26,8 @@ module Sass
         clear_callbacks!
       end
 
-      # An options hash. See {file:SASS_REFERENCE.md#Options the Sass options
-      # documentation}.
+      # An options hash.
+      # See {file:SASS_REFERENCE.md#options the Sass options documentation}.
       #
       # @return [{Symbol => Object}]
       def options
@@ -127,7 +127,7 @@ module Sass
 
       def normalize_template_location!
         options[:template_location] = convert_template_location(
-          options[:template_location], options[:css_location])
+            options[:template_location], options[:css_location])
       end
     end
   end

data/lib/sass/plugin/merb.rb

@@ -15,7 +15,7 @@ unless defined?(Sass::MERB_LOADED)
         end
 
         {
-          :always_update     => false,
+          :always_update      => false,
           :template_location => root + '/public/stylesheets/sass',
           :css_location      => root + '/public/stylesheets',
           :cache_location    => root + '/tmp/sass-cache',

data/lib/sass/plugin/rack.rb

@@ -9,19 +9,19 @@ module Sass
     #
     # ## Customize
     #
-    #     Sass::Plugin.options.merge!(
+    #     Sass::Plugin.options.merge(
     #       :cache_location => './tmp/sass-cache',
     #       :never_update => environment != :production,
     #       :full_exception => environment != :production)
     #
-    # {file:SASS_REFERENCE.md#Options See the Reference for more options}.
+    # {file:SASS_REFERENCE.md#options See the Reference for more options}.
     #
     # ## Use
     #
     # Put your Sass files in `public/stylesheets/sass`.
     # Your CSS will be generated in `public/stylesheets`,
     # and regenerated every request if necessary.
-    # The locations and frequency {file:SASS_REFERENCE.md#Options can be customized}.
+    # The locations and frequency {file:SASS_REFERENCE.md#options can be customized}.
     # That's all there is to it!
     class Rack
       # The delay, in seconds, between update checks.

data/lib/sass/plugin/staleness_checker.rb

@@ -39,7 +39,7 @@ module Sass
       # for checking the staleness of several stylesheets at once.
       #
       # @param options [{Symbol => Object}]
-      #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
+      #   See {file:SASS_REFERENCE.md#options the Sass options documentation}.
       def initialize(options)
         # URIs that are being actively checked for staleness. Protects against
         # import loops.
@@ -72,7 +72,7 @@ module Sass
       # Returns whether a Sass or SCSS stylesheet has been modified since a given time.
       #
       # @param template_file [String] The location of the Sass or SCSS template.
-      # @param mtime [Time] The modification time to check against.
+      # @param mtime [Fixnum] The modification time to check against.
       # @param importer [Sass::Importers::Base] The importer used to locate the stylesheet.
       #   Defaults to the filesystem importer.
       # @return [Boolean] Whether the stylesheet has been modified.
@@ -103,7 +103,7 @@ module Sass
       # so it's better to use when checking multiple stylesheets at once.
       #
       # @param template_file [String] The location of the Sass or SCSS template.
-      # @param mtime [Time] The modification time to check against.
+      # @param mtime [Fixnum] The modification time to check against.
       # @param importer [Sass::Importers::Base] The importer used to locate the stylesheet.
       #   Defaults to the filesystem importer.
       # @return [Boolean] Whether the stylesheet has been modified.

data/lib/sass/railtie.rb

@@ -1,5 +1,5 @@
 # Rails 3.0.0.beta.2+, < 3.1
-if defined?(ActiveSupport) && ActiveSupport.public_methods.include?(:on_load) &&
+if defined?(ActiveSupport) && Sass::Util.has?(:public_method, ActiveSupport, :on_load) &&
     !Sass::Util.ap_geq?('3.1.0.beta')
   require 'sass/plugin/configuration'
   ActiveSupport.on_load(:before_configuration) do

data/lib/sass/script.rb

@@ -16,12 +16,12 @@ module Sass
     # Parses a string of SassScript
     #
     # @param value [String] The SassScript
-    # @param line [Integer] The number of the line on which the SassScript appeared.
+    # @param line [Fixnum] The number of the line on which the SassScript appeared.
     #   Used for error reporting
-    # @param offset [Integer] The number of characters in on `line` that the SassScript started.
+    # @param offset [Fixnum] 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/css_parser.rb

@@ -19,15 +19,25 @@ module Sass
       def string
         tok = try_tok(:string)
         return number unless tok
-        return if @lexer.peek && @lexer.peek.type == :begin_interpolation
-        literal_node(tok.value, tok.source_range)
+        unless @lexer.peek && @lexer.peek.type == :begin_interpolation
+          return literal_node(tok.value, tok.source_range)
+        end
       end
 
-      # Short-circuit all the SassScript-only productions
-      def interpolation(first: nil, inner: :space)
-        first || send(inner)
+      def ident
+        return funcall unless @lexer.peek && @lexer.peek.type == :ident
+        return if @stop_at && @stop_at.include?(@lexer.peek.value)
+
+        name = @lexer.next
+        if (color = Sass::Script::Value::Color::COLOR_NAMES[name.value.downcase])
+          literal_node(Sass::Script::Value::Color.new(color, name.value), name.source_range)
+        else
+          literal_node(Sass::Script::Value::String.new(name.value, :identifier), name.source_range)
+        end
       end
 
+      # Short-circuit all the SassScript-only productions
+      alias_method :interpolation, :space
       alias_method :or_expr, :div
       alias_method :unary_div, :ident
       alias_method :paren, :string

data/lib/sass/script/functions.rb

@@ -1,7 +1,9 @@
 require 'sass/script/value/helpers'
 
 module Sass::Script
+  # @comment
   #   YARD can't handle some multiline tags, and we need really long tags for function declarations.
+  #   rubocop:disable LineLength
   # Methods in this module are accessible from the SassScript context.
   # For example, you can write
   #
@@ -174,7 +176,7 @@ module Sass::Script
   # \{#set-nth set-nth($list, $n, $value)}
   # : Replaces the nth item in a list.
   #
-  # \{#join join($list1, $list2, \[$separator, $bracketed\])}
+  # \{#join join($list1, $list2, \[$separator\])}
   # : Joins together two lists into one.
   #
   # \{#append append($list1, $val, \[$separator\])}
@@ -189,9 +191,6 @@ module Sass::Script
   # \{#list_separator list-separator($list)}
   # : Returns the separator of a list.
   #
-  # \{#is_bracketed is-bracketed($list)}
-  # : Returns whether a list has square brackets.
-  #
   # ## Map Functions {#map-functions}
   #
   # Maps in Sass are immutable; all map functions return a new map rather than
@@ -277,9 +276,6 @@ module Sass::Script
   # \{#mixin_exists mixin-exists($name)}
   # : Returns whether a mixin with the given name exists.
   #
-  # \{#content_exists content-exists()}
-  # : Returns whether the current mixin was passed a content block.
-  #
   # \{#inspect inspect($value)}
   # : Returns the string representation of a value as it would be represented in Sass.
   #
@@ -295,12 +291,8 @@ module Sass::Script
   # \{#comparable comparable($number1, $number2)}
   # : Returns whether two numbers can be added, subtracted, or compared.
   #
-  # \{#call call($function, $args...)}
-  # : Dynamically calls a Sass function reference returned by `get-function`.
-  #
-  # \{#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.
+  # \{#call call($name, $args...)}
+  # : Dynamically calls a Sass function.
   #
   # ## Miscellaneous Functions
   #
@@ -362,6 +354,8 @@ module Sass::Script
   # representation) on those objects without first setting {Tree::Node#options=
   # the #options attribute}.
   #
+  # @comment
+  #   rubocop:enable LineLength
   module Functions
     @signatures = {}
 
@@ -436,8 +430,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 [Integer] The number of unnamed arguments the function was passed.
-    # @param kwarg_arity [Integer] The number of keyword arguments the function was passed.
+    # @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.
     #
     # @return [{Symbol => Object}, nil]
     #   The signature options for the matching signature,
@@ -460,8 +454,8 @@ module Sass::Script
           t_arg_arity = sig_arity
         end
 
-        if (t_arg_arity == sig_arity || t_arg_arity > sig_arity && signature.var_args) &&
-           (t_kwarg_arity == 0 || t_kwarg_arity > 0 && signature.var_kwargs)
+        if   (t_arg_arity == sig_arity ||   t_arg_arity > sig_arity && signature.var_args) &&
+           (t_kwarg_arity == 0         || t_kwarg_arity > 0         && signature.var_kwargs)
           return signature
         end
       end
@@ -476,14 +470,14 @@ module Sass::Script
     # @param seed [Integer]
     # @return [Integer] The same seed.
     def self.random_seed=(seed)
-      @random_number_generator = Random.new(seed)
+      @random_number_generator = Sass::Util::CrossPlatformRandom.new(seed)
     end
 
     # Get Sass's internal random number generator.
     #
     # @return [Random]
     def self.random_number_generator
-      @random_number_generator ||= Random.new
+      @random_number_generator ||= Sass::Util::CrossPlatformRandom.new
     end
 
     # The context in which methods in {Script::Functions} are evaluated.
@@ -527,28 +521,15 @@ module Sass::Script
       #   assert_type value, :String
       #   assert_type value, :Number
       # @param value [Sass::Script::Value::Base] A SassScript value
-      # @param type [Symbol, Array<Symbol>] The name(s) of the type the value is expected to be
+      # @param type [Symbol] The name of the type the value is expected to be
       # @param name [String, Symbol, nil] The name of the argument.
       # @raise [ArgumentError] if value is not of the correct type.
       def assert_type(value, type, name = nil)
-        valid_types = Array(type)
-        found_type = valid_types.find do |t|
-          value.is_a?(Sass::Script::Value.const_get(t)) ||
-            t == :Map && value.is_a?(Sass::Script::Value::List) && value.value.empty?
-        end
-
-        if found_type
-          value.check_deprecated_interp if found_type == :String
-          return
-        end
-
-        err = if valid_types.size == 1
-                "#{value.inspect} is not a #{TYPE_NAMES[type] || type.to_s.downcase}"
-              else
-                type_names = valid_types.map {|t| TYPE_NAMES[t] || t.to_s.downcase}
-                "#{value.inspect} is not any of #{type_names.join(', ')}"
-              end
-        err = "$#{name.to_s.tr('_', '-')}: " + err if name
+        klass = Sass::Script::Value.const_get(type)
+        return if value.is_a?(klass)
+        return if value.is_a?(Sass::Script::Value::List) && type == :Map && value.value.empty?
+        err = "#{value.inspect} is not a #{TYPE_NAMES[type] || type.to_s.downcase}"
+        err = "$#{name.to_s.gsub('_', '-')}: " + err if name
         raise ArgumentError.new(err)
       end
 
@@ -648,27 +629,23 @@ module Sass::Script
     #     inclusive
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if any parameter is the wrong type or out of bounds
-    def rgb(red, green = nil, blue = nil)
-      if green.nil?
-        return unquoted_string("rgb(#{red})") if var?(red)
-        raise ArgumentError.new("wrong number of arguments (1 for 3)")
-      elsif blue.nil?
-        return unquoted_string("rgb(#{red}, #{green})") if var?(red) || var?(green)
-        raise ArgumentError.new("wrong number of arguments (2 for 3)")
-      end
-
-      if special_number?(red) || special_number?(green) || special_number?(blue)
+    def rgb(red, green, blue)
+      if calc?(red) || calc?(green) || calc?(blue)
         return unquoted_string("rgb(#{red}, #{green}, #{blue})")
       end
       assert_type red, :Number, :red
       assert_type green, :Number, :green
       assert_type blue, :Number, :blue
 
-      color_attrs = [
-        percentage_or_unitless(red, 255, "red"),
-        percentage_or_unitless(green, 255, "green"),
-        percentage_or_unitless(blue, 255, "blue")
-      ]
+      color_attrs = [[red, :red], [green, :green], [blue, :blue]].map do |(c, name)|
+        if c.is_unit?("%")
+          c.value * 255 / 100.0
+        elsif c.unitless?
+          c.value
+        else
+          raise ArgumentError.new("Expected #{c} to be unitless or have a unit of % but got #{c}")
+        end
+      end
 
       # Don't store the string representation for function-created colors, both
       # because it's not very useful and because some functions aren't supported
@@ -676,8 +653,6 @@ module Sass::Script
       Sass::Script::Value::Color.new(color_attrs)
     end
     declare :rgb, [:red, :green, :blue]
-    declare :rgb, [:red, :green]
-    declare :rgb, [:red]
 
     # Creates a {Sass::Script::Value::Color Color} from red, green, blue, and
     # alpha values.
@@ -712,39 +687,20 @@ module Sass::Script
     #     is the wrong type
     def rgba(*args)
       case args.size
-      when 1
-        return unquoted_string("rgba(#{args.first})") if var?(args.first)
-        raise ArgumentError.new("wrong number of arguments (1 for 4)")
       when 2
         color, alpha = args
 
-        if var?(color)
-          return unquoted_string("rgba(#{color}, #{alpha})")
-        elsif var?(alpha)
-          if color.is_a?(Sass::Script::Value::Color)
-            return unquoted_string("rgba(#{color.red}, #{color.green}, #{color.blue}, #{alpha})")
-          else
-            return unquoted_string("rgba(#{color}, #{alpha})")
-          end
-        end
-
         assert_type color, :Color, :color
-        if special_number?(alpha)
+        if calc?(alpha)
           unquoted_string("rgba(#{color.red}, #{color.green}, #{color.blue}, #{alpha})")
         else
           assert_type alpha, :Number, :alpha
-          color.with(:alpha => percentage_or_unitless(alpha, 1, "alpha"))
-        end
-      when 3
-        if var?(args[0]) || var?(args[1]) || var?(args[2])
-          unquoted_string("rgba(#{args.join(', ')})")
-        else
-          raise ArgumentError.new("wrong number of arguments (3 for 4)")
+          check_alpha_unit alpha, 'rgba'
+          color.with(:alpha => alpha.value)
         end
       when 4
         red, green, blue, alpha = args
-        if special_number?(red) || special_number?(green) ||
-           special_number?(blue) || special_number?(alpha)
+        if calc?(red) || calc?(green) || calc?(blue) || calc?(alpha)
           unquoted_string("rgba(#{red}, #{green}, #{blue}, #{alpha})")
         else
           rgba(rgb(red, green, blue), alpha)
@@ -754,9 +710,7 @@ module Sass::Script
       end
     end
     declare :rgba, [:red, :green, :blue, :alpha]
-    declare :rgba, [:red, :green, :blue]
     declare :rgba, [:color, :alpha]
-    declare :rgba, [:red]
 
     # Creates a {Sass::Script::Value::Color Color} from hue, saturation, and
     # lightness values. Uses the algorithm from the [CSS3 spec][].
@@ -774,24 +728,14 @@ module Sass::Script
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$saturation` or `$lightness` are out of bounds
     #   or any parameter is the wrong type
-    def hsl(hue, saturation = nil, lightness = nil)
-      if saturation.nil?
-        return unquoted_string("hsl(#{hue})") if var?(hue)
-        raise ArgumentError.new("wrong number of arguments (1 for 3)")
-      elsif lightness.nil?
-        return unquoted_string("hsl(#{hue}, #{saturation})") if var?(hue) || var?(saturation)
-        raise ArgumentError.new("wrong number of arguments (2 for 3)")
-      end
-
-      if special_number?(hue) || special_number?(saturation) || special_number?(lightness)
+    def hsl(hue, saturation, lightness)
+      if calc?(hue) || calc?(saturation) || calc?(lightness)
         unquoted_string("hsl(#{hue}, #{saturation}, #{lightness})")
       else
         hsla(hue, saturation, lightness, number(1))
       end
     end
     declare :hsl, [:hue, :saturation, :lightness]
-    declare :hsl, [:hue, :saturation]
-    declare :hsl, [:hue]
 
     # Creates a {Sass::Script::Value::Color Color} from hue,
     # saturation, lightness, and alpha values. Uses the algorithm from
@@ -812,29 +756,15 @@ module Sass::Script
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$saturation`, `$lightness`, or `$alpha` are out
     #   of bounds or any parameter is the wrong type
-    def hsla(hue, saturation = nil, lightness = nil, alpha = nil)
-      if saturation.nil?
-        return unquoted_string("hsla(#{hue})") if var?(hue)
-        raise ArgumentError.new("wrong number of arguments (1 for 4)")
-      elsif lightness.nil?
-        return unquoted_string("hsla(#{hue}, #{saturation})") if var?(hue) || var?(saturation)
-        raise ArgumentError.new("wrong number of arguments (2 for 4)")
-      elsif alpha.nil?
-        if var?(hue) || var?(saturation) || var?(lightness)
-          return unquoted_string("hsla(#{hue}, #{saturation}, #{lightness})")
-        else
-          raise ArgumentError.new("wrong number of arguments (2 for 4)")
-        end
-      end
-
-      if special_number?(hue) || special_number?(saturation) ||
-         special_number?(lightness) || special_number?(alpha)
+    def hsla(hue, saturation, lightness, alpha)
+      if calc?(hue) || calc?(saturation) || calc?(lightness) || calc?(alpha)
         return unquoted_string("hsla(#{hue}, #{saturation}, #{lightness}, #{alpha})")
       end
       assert_type hue, :Number, :hue
       assert_type saturation, :Number, :saturation
       assert_type lightness, :Number, :lightness
       assert_type alpha, :Number, :alpha
+      check_alpha_unit alpha, 'hsla'
 
       h = hue.value
       s = saturation.value
@@ -844,13 +774,9 @@ module Sass::Script
       # because it's not very useful and because some functions aren't supported
       # on older browsers.
       Sass::Script::Value::Color.new(
-        :hue => h, :saturation => s, :lightness => l,
-        :alpha => percentage_or_unitless(alpha, 1, "alpha"))
+        :hue => h, :saturation => s, :lightness => l, :alpha => alpha.value)
     end
     declare :hsla, [:hue, :saturation, :lightness, :alpha]
-    declare :hsla, [:hue, :saturation, :lightness]
-    declare :hsla, [:hue, :saturation]
-    declare :hsla, [:hue]
 
     # Gets the red component of a color. Calculated from HSL where necessary via
     # [this algorithm][hsl-to-rgb].
@@ -970,7 +896,7 @@ module Sass::Script
              a.value =~ /^[a-zA-Z]+\s*=/
          end
         # Support the proprietary MS alpha() function
-        return identifier("alpha(#{args.map {|a| a.to_s}.join(', ')})")
+        return identifier("alpha(#{args.map {|a| a.to_s}.join(", ")})")
       end
 
       raise ArgumentError.new("wrong number of arguments (#{args.size} for 1)") if args.size != 1
@@ -1172,7 +1098,11 @@ module Sass::Script
     #   adjust-color(#102030, $blue: 5) => #102035
     #   adjust-color(#102030, $red: -5, $blue: 5) => #0b2035
     #   adjust-color(hsl(25, 100%, 80%), $lightness: -30%, $alpha: -0.4) => hsla(25, 100%, 50%, 0.6)
+    # @comment
+    #   rubocop:disable LineLength
     # @overload adjust_color($color, [$red], [$green], [$blue], [$hue], [$saturation], [$lightness], [$alpha])
+    #   @comment
+    #     rubocop:disable LineLength
     #   @param $color [Sass::Script::Value::Color]
     #   @param $red [Sass::Script::Value::Number] The adjustment to make on the
     #     red component, between -255 and 255 inclusive
@@ -1195,14 +1125,15 @@ module Sass::Script
     def adjust_color(color, kwargs)
       assert_type color, :Color, :color
       with = Sass::Util.map_hash(
-        "red" => [-255..255, ""],
-        "green" => [-255..255, ""],
-        "blue" => [-255..255, ""],
-        "hue" => nil,
-        "saturation" => [-100..100, "%"],
-        "lightness" => [-100..100, "%"],
-        "alpha" => [-1..1, ""]
-      ) do |name, (range, units)|
+          "red" => [-255..255, ""],
+          "green" => [-255..255, ""],
+          "blue" => [-255..255, ""],
+          "hue" => nil,
+          "saturation" => [-100..100, "%"],
+          "lightness" => [-100..100, "%"],
+          "alpha" => [-1..1, ""]
+        ) do |name, (range, units)|
+
         val = kwargs.delete(name)
         next unless val
         assert_type val, :Number, name
@@ -1248,7 +1179,11 @@ module Sass::Script
     #   scale-color(hsl(120, 70%, 80%), $lightness: 50%) => hsl(120, 70%, 90%)
     #   scale-color(rgb(200, 150%, 170%), $green: -40%, $blue: 70%) => rgb(200, 90, 229)
     #   scale-color(hsl(200, 70%, 80%), $saturation: -90%, $alpha: -30%) => hsla(200, 7%, 80%, 0.7)
+    # @comment
+    #   rubocop:disable LineLength
     # @overload scale_color($color, [$red], [$green], [$blue], [$saturation], [$lightness], [$alpha])
+    #   @comment
+    #     rubocop:disable LineLength
     #   @param $color [Sass::Script::Value::Color]
     #   @param $red [Sass::Script::Value::Number]
     #   @param $green [Sass::Script::Value::Number]
@@ -1263,13 +1198,14 @@ module Sass::Script
     def scale_color(color, kwargs)
       assert_type color, :Color, :color
       with = Sass::Util.map_hash(
-        "red" => 255,
-        "green" => 255,
-        "blue" => 255,
-        "saturation" => 100,
-        "lightness" => 100,
-        "alpha" => 1
-      ) do |name, max|
+          "red" => 255,
+          "green" => 255,
+          "blue" => 255,
+          "saturation" => 100,
+          "lightness" => 100,
+          "alpha" => 1
+        ) do |name, max|
+
         val = kwargs.delete(name)
         next unless val
         assert_type val, :Number, name
@@ -1304,7 +1240,11 @@ module Sass::Script
     #   change-color(#102030, $blue: 5) => #102005
     #   change-color(#102030, $red: 120, $blue: 5) => #782005
     #   change-color(hsl(25, 100%, 80%), $lightness: 40%, $alpha: 0.8) => hsla(25, 100%, 40%, 0.8)
+    # @comment
+    #   rubocop:disable LineLength
     # @overload change_color($color, [$red], [$green], [$blue], [$hue], [$saturation], [$lightness], [$alpha])
+    #   @comment
+    #     rubocop:disable LineLength
     #   @param $color [Sass::Script::Value::Color]
     #   @param $red [Sass::Script::Value::Number] The new red component for the
     #     color, within 0 and 255 inclusive
@@ -1374,7 +1314,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 `100%` gives more weight to `$color1`, closer to `0%`
+    #     color. Closer to `0%` gives more weight to `$color1`, closer to `100%`
     #     gives more weight to `$color2`
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$weight` is out of bounds or any parameter is
@@ -1490,11 +1430,13 @@ module Sass::Script
     def unquote(string)
       unless string.is_a?(Sass::Script::Value::String)
         # Don't warn multiple times for the same source line.
+        # rubocop:disable GlobalVars
         $_sass_warned_for_unquote ||= Set.new
         frame = environment.stack.frames.last
         key = [frame.filename, frame.line] if frame
         return string if frame && $_sass_warned_for_unquote.include?(key)
         $_sass_warned_for_unquote << key if frame
+        # rubocop:enable GlobalVars
 
         Sass::Util.sass_warn(<<MESSAGE.strip)
 DEPRECATION WARNING: Passing #{string.to_sass}, a non-string value, to unquote()
@@ -1504,7 +1446,6 @@ MESSAGE
         return string
       end
 
-      string.check_deprecated_interp
       return string if string.type == :identifier
       identifier(string.value)
     end
@@ -1621,7 +1562,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-at [Sass::Script::Value::Number] The index of the last
+    #   @param $end-before [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
@@ -1640,7 +1581,7 @@ MESSAGE
       s = string.value.length + s if s < 0
       s = 0 if s < 0
       e = string.value.length + e if e < 0
-      return Sass::Script::Value::String.new("", string.type) if e < 0
+      e = 0 if s < 0
       extracted = string.value.slice(s..e)
       Sass::Script::Value::String.new(extracted || "", string.type)
     end
@@ -1658,7 +1599,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(Sass::Util.upcase(string.value), string.type)
+      Sass::Script::Value::String.new(string.value.upcase, string.type)
     end
     declare :to_upper_case, [:string]
 
@@ -1673,7 +1614,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(Sass::Util.downcase(string.value), string.type)
+      Sass::Script::Value::String.new(string.value.downcase, string.type)
     end
     declare :to_lower_case, [:string]
 
@@ -1686,17 +1627,11 @@ MESSAGE
     #   type-of(true)   => bool
     #   type-of(#fff)   => color
     #   type-of(blue)   => color
-    #   type-of(null)   => null
-    #   type-of(a b c)  => list
-    #   type-of((a: 1, b: 2)) => map
-    #   type-of(get-function("foo")) => function
-    #
     # @overload type_of($value)
     #   @param $value [Sass::Script::Value::Base] The value to inspect
     # @return [Sass::Script::Value::String] The unquoted string name of the
     #   value's type
     def type_of(value)
-      value.check_deprecated_interp if value.is_a?(Sass::Script::Value::String)
       identifier(value.class.name.gsub(/Sass::Script::Value::/, '').downcase)
     end
     declare :type_of, [:value]
@@ -1718,12 +1653,6 @@ MESSAGE
     #
     # * `at-error` indicates that the Sass `@error` directive is supported.
     #
-    # * `custom-property` indicates that the [Custom Properties Level 1][] spec
-    #   is supported. This means that custom properties are parsed statically,
-    #   with only interpolation treated as SassScript.
-    #
-    # [Custom Properties Level 1]: https://www.w3.org/TR/css-variables-1/
-    #
     # @example
     #   feature-exists(some-feature-that-exists) => true
     #   feature-exists(what-is-this-i-dont-know) => false
@@ -1738,55 +1667,6 @@ MESSAGE
     end
     declare :feature_exists, [:feature]
 
-    # Returns a reference to a function for later invocation with the `call()` 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")
-    #
-    #   @function myfunc { @return "something"; }
-    #   get-function("myfunc")
-    #
-    # @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 = {})
-      assert_type name, :String, :name
-
-      css = if kwargs.has_key?("css")
-              v = kwargs.delete("css")
-              assert_type v, :Bool, :css
-              v.value
-            else
-              false
-            end
-
-      if kwargs.any?
-        raise ArgumentError.new("Illegal keyword argument '#{kwargs.keys.first}'")
-      end
-
-      if css
-        return Sass::Script::Value::Function.new(
-          Sass::Callable.new(name.value, nil, nil, nil, nil, nil, "function", :css))
-      end
-
-      callable = environment.caller.function(name.value) ||
-        (Sass::Script::Functions.callable?(name.value.tr("-", "_")) &&
-         Sass::Callable.new(name.value, nil, nil, nil, nil, nil, "function", :builtin))
-
-      if callable
-        Sass::Script::Value::Function.new(callable)
-      else
-        raise Sass::SyntaxError.new("Function not found: #{name}")
-      end
-    end
-    declare :get_function, [:name], :var_kwargs => true
-
     # Returns the unit(s) associated with a number. Complex units are sorted in
     # alphabetical order by numerator and denominator.
     #
@@ -1989,7 +1869,7 @@ MESSAGE
       index = n.to_i > 0 ? n.to_i - 1 : n.to_i
       new_list = list.to_a.dup
       new_list[index] = value
-      list.with_contents(new_list)
+      Sass::Script::Value::List.new(new_list, list.separator)
     end
     declare :set_nth, [:list, :n, :value]
 
@@ -2030,9 +1910,6 @@ MESSAGE
     # list. If both lists have fewer than two items, spaces are used for the
     # resulting list.
     #
-    # Unless `$bracketed` is passed, the resulting list is bracketed if the
-    # first parameter is.
-    #
     # Like all list functions, `join()` returns a new list rather than modifying
     # its arguments in place.
     #
@@ -2042,70 +1919,27 @@ MESSAGE
     #   join(10px, 20px) => 10px 20px
     #   join(10px, 20px, comma) => 10px, 20px
     #   join((blue, red), (#abc, #def), space) => blue red #abc #def
-    #   join([10px], 20px) => [10px 20px]
-    # @overload join($list1, $list2, $separator: auto, $bracketed: auto)
+    # @overload join($list1, $list2, $separator: auto)
     #   @param $list1 [Sass::Script::Value::Base]
     #   @param $list2 [Sass::Script::Value::Base]
     #   @param $separator [Sass::Script::Value::String] The list separator to use.
     #     If this is `comma` or `space`, that separator will be used. If this is
     #     `auto` (the default), the separator is determined as explained above.
-    #   @param $bracketed [Sass::Script::Value::Base] Whether the resulting list
-    #     will be bracketed. If this is `auto` (the default), the separator is
-    #     determined as explained above.
     # @return [Sass::Script::Value::List]
-    def join(list1, list2,
-             separator = identifier("auto"), bracketed = identifier("auto"),
-             kwargs = nil, *rest)
-      if separator.is_a?(Hash)
-        kwargs = separator
-        separator = identifier("auto")
-      elsif bracketed.is_a?(Hash)
-        kwargs = bracketed
-        bracketed = identifier("auto")
-      elsif rest.last.is_a?(Hash)
-        rest.unshift kwargs
-        kwargs = rest.pop
-      end
-
-      unless rest.empty?
-        # Add 4 to rest.length because we don't want to count the kwargs hash,
-        # which is always passed.
-        raise ArgumentError.new("wrong number of arguments (#{rest.length + 4} for 2..4)")
-      end
-
-      if kwargs
-        separator = kwargs.delete("separator") || separator
-        bracketed = kwargs.delete("bracketed") || bracketed
-
-        unless kwargs.empty?
-          name, val = kwargs.to_a.first
-          raise ArgumentError.new("Unknown argument $#{name} (#{val})")
-        end
-      end
-
+    def join(list1, list2, separator = identifier("auto"))
       assert_type separator, :String, :separator
-      unless %w(auto space comma).include?(separator.value)
+      unless %w[auto space comma].include?(separator.value)
         raise ArgumentError.new("Separator name must be space, comma, or auto")
       end
-
-      list(list1.to_a + list2.to_a,
-        separator:
-          if separator.value == 'auto'
-            list1.separator || list2.separator || :space
-          else
-            separator.value.to_sym
-          end,
-        bracketed:
-          if bracketed.is_a?(Sass::Script::Value::String) && bracketed.value == 'auto'
-            list1.bracketed
-          else
-            bracketed.to_bool
-          end)
+      sep = if separator.value == 'auto'
+              list1.separator || list2.separator || :space
+            else
+              separator.value.to_sym
+            end
+      list(list1.to_a + list2.to_a, sep)
     end
-    # We don't actually take variable arguments or keyword arguments, but this
-    # is the best way to take either `$separator` or `$bracketed` as keywords
-    # without complaining about the other missing.
-    declare :join, [:list1, :list2], :var_args => true, :var_kwargs => true
+    declare :join, [:list1, :list2]
+    declare :join, [:list1, :list2, :separator]
 
     # Appends a single value onto the end of a list.
     #
@@ -2130,16 +1964,15 @@ MESSAGE
     # @return [Sass::Script::Value::List]
     def append(list, val, separator = identifier("auto"))
       assert_type separator, :String, :separator
-      unless %w(auto space comma).include?(separator.value)
+      unless %w[auto space comma].include?(separator.value)
         raise ArgumentError.new("Separator name must be space, comma, or auto")
       end
-      list.with_contents(list.to_a + [val],
-        separator:
-          if separator.value == 'auto'
-            list.separator || :space
-          else
-            separator.value.to_sym
-          end)
+      sep = if separator.value == 'auto'
+              list.separator || :space
+            else
+              separator.value.to_sym
+            end
+      list(list.to_a + [val], sep)
     end
     declare :append, [:list, :val]
     declare :append, [:list, :val, :separator]
@@ -2209,20 +2042,7 @@ MESSAGE
     def list_separator(list)
       identifier((list.separator || :space).to_s)
     end
-    declare :list_separator, [:list]
-
-    # Returns whether a list uses square brackets.
-    #
-    # @example
-    #   is-bracketed(1px 2px 3px) => false
-    #   is-bracketed([1px, 2px, 3px]) => true
-    # @overload is_bracketed($list)
-    #   @param $list [Sass::Script::Value::Base]
-    # @return [Sass::Script::Value::Bool]
-    def is_bracketed(list)
-      bool(list.bracketed)
-    end
-    declare :is_bracketed, [:list]
+    declare :separator, [:list]
 
     # Returns the value in a map associated with the given key. If the map
     # doesn't have such a key, returns `null`.
@@ -2408,24 +2228,10 @@ MESSAGE
     #   $fn: nth;
     #   call($fn, (a b c), 2) => b
     #
-    # @overload call($function, $args...)
-    #   @param $function [Sass::Script::Value::Function] The function to call.
+    # @overload call($name, $args...)
+    #   @param $name [String] The name of the function to call.
     def call(name, *args)
-      unless name.is_a?(Sass::Script::Value::String) ||
-             name.is_a?(Sass::Script::Value::Function)
-        assert_type name, :Function, :function
-      end
-      if name.is_a?(Sass::Script::Value::String)
-        name = if function_exists(name).to_bool
-                 get_function(name)
-               else
-                 get_function(name, "css" => bool(true))
-               end
-        Sass::Util.sass_warn(<<WARNING)
-DEPRECATION WARNING: Passing a string to call() is deprecated and will be illegal
-in Sass 4.0. Use call(#{name.to_sass}) instead.
-WARNING
-      end
+      assert_type name, :String, :name
       kwargs = args.last.is_a?(Hash) ? args.pop : {}
       funcall = Sass::Script::Tree::Funcall.new(
         name.value,
@@ -2433,8 +2239,6 @@ WARNING
         Sass::Util.map_vals(kwargs) {|v| Sass::Script::Tree::Literal.new(v)},
         nil,
         nil)
-      funcall.line = environment.stack.frames.last.line
-      funcall.filename = environment.stack.frames.last.filename
       funcall.options = options
       perform(funcall)
     end
@@ -2474,7 +2278,6 @@ WARNING
     # @example
     #   $a-false-value: false;
     #   variable-exists(a-false-value) => true
-    #   variable-exists(a-null-value) => true
     #
     #   variable-exists(nonexistent) => false
     #
@@ -2495,7 +2298,6 @@ WARNING
     # @example
     #   $a-false-value: false;
     #   global-variable-exists(a-false-value) => true
-    #   global-variable-exists(a-null-value) => true
     #
     #   .foo {
     #     $some-var: false;
@@ -2523,12 +2325,12 @@ WARNING
     #
     # @overload function_exists($name)
     #   @param name [Sass::Script::Value::String] The name of the function to
-    #     check or a function reference.
+    #     check.
     # @return [Sass::Script::Value::Bool] Whether the function is defined.
     def function_exists(name)
       assert_type name, :String, :name
       exists = Sass::Script::Functions.callable?(name.value.tr("-", "_"))
-      exists ||= environment.caller.function(name.value)
+      exists ||= environment.function(name.value)
       bool(exists)
     end
     declare :function_exists, [:name]
@@ -2551,31 +2353,6 @@ WARNING
     end
     declare :mixin_exists, [:name]
 
-    # Check whether a mixin was passed a content block.
-    #
-    # Unless `content-exists()` is called directly from a mixin, an error will be raised.
-    #
-    # @example
-    #   @mixin needs-content {
-    #     @if not content-exists() {
-    #       @error "You must pass a content block!"
-    #     }
-    #     @content;
-    #   }
-    #
-    # @overload content_exists()
-    # @return [Sass::Script::Value::Bool] Whether a content block was passed to the mixin.
-    def content_exists
-      # frames.last is the stack frame for this function,
-      # so we use frames[-2] to get the frame before that.
-      mixin_frame = environment.stack.frames[-2]
-      unless mixin_frame && mixin_frame.type == :mixin
-        raise Sass::SyntaxError.new("Cannot call content-exists() except within a mixin.")
-      end
-      bool(!environment.caller.content.nil?)
-    end
-    declare :content_exists, []
-
     # Return a string containing the value as its Sass representation.
     #
     # @overload inspect($value)
@@ -2583,7 +2360,6 @@ WARNING
     # @return [Sass::Script::Value::String] A representation of the value as
     #   it would be written in Sass.
     def inspect(value)
-      value.check_deprecated_interp if value.is_a?(Sass::Script::Value::String)
       unquoted_string(value.to_sass)
     end
     declare :inspect, [:value]
@@ -2657,7 +2433,7 @@ WARNING
       end
 
       parsed = [parse_selector(selectors.first, :selectors)]
-      parsed += selectors[1..-1].map {|sel| parse_selector(sel, :selectors, true)}
+      parsed += selectors[1..-1].map {|sel| parse_selector(sel, :selectors, !!:parse_parent_ref)}
       parsed.inject {|result, child| child.resolve_parent_refs(result)}.to_sass_script
     end
     declare :selector_nest, [], :var_args => true
@@ -2745,7 +2521,7 @@ WARNING
 
       extends = Sass::Util::SubsetMap.new
       begin
-        extender.populate_extends(extends, extendee, nil, [], true)
+        extender.populate_extends(extends, extendee)
         selector.do_extend(extends).to_sass_script
       rescue Sass::SyntaxError => e
         raise ArgumentError.new(e.to_s)
@@ -2788,8 +2564,8 @@ WARNING
 
       extends = Sass::Util::SubsetMap.new
       begin
-        replacement.populate_extends(extends, original, nil, [], true)
-        selector.do_extend(extends, [], true).to_sass_script
+        replacement.populate_extends(extends, original)
+        selector.do_extend(extends, [], !!:replace).to_sass_script
       rescue Sass::SyntaxError => e
         raise ArgumentError.new(e.to_s)
       end
@@ -2898,7 +2674,10 @@ WARNING
         yield(value.value), value.numerator_units, value.denominator_units)
     end
 
+    # @comment
+    #   rubocop:disable ParameterLists
     def _adjust(color, amount, attr, range, op, units = "")
+      # rubocop:enable ParameterLists
       assert_type color, :Color, :color
       assert_type amount, :Number, :amount
       Sass::Util.check_range('Amount', range, amount, units)
@@ -2906,14 +2685,19 @@ WARNING
       color.with(attr => color.send(attr).send(op, amount.value))
     end
 
-    def percentage_or_unitless(number, max, name)
-      if number.unitless?
-        number.value
-      elsif number.is_unit?("%")
-        max * number.value / 100.0;
+    def check_alpha_unit(alpha, function)
+      return if alpha.unitless?
+
+      if alpha.is_unit?("%")
+        Sass::Util.sass_warn(<<WARNING)
+DEPRECATION WARNING: Passing a percentage as the alpha value to #{function}() will be
+interpreted differently in future versions of Sass. For now, use #{alpha.value} instead.
+WARNING
       else
-        raise ArgumentError.new(
-          "$#{name}: Expected #{number} to have no units or \"%\"");
+        Sass::Util.sass_warn(<<WARNING)
+DEPRECATION WARNING: Passing a number with units as the alpha value to #{function}() is
+deprecated and will be an error in future versions of Sass. Use #{alpha.value} instead.
+WARNING
       end
     end
   end