sass 3.3.0.alpha.256 → 3.3.0.alpha.353

data/lib/sass/plugin/compiler.rb

@@ -33,10 +33,10 @@ module Sass::Plugin
 
     # Creates a new compiler.
     #
-    # @param options [{Symbol => Object}]
+    # @param opts [{Symbol => Object}]
     #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
-    def initialize(options = {})
-      self.options.merge!(options)
+    def initialize(opts = {})
+      options.merge!(opts)
     end
 
     # Register a callback to be run after stylesheets are mass-updated.
@@ -159,7 +159,8 @@ module Sass::Plugin
 
     # Updates out-of-date stylesheets.
     #
-    # Checks each Sass/SCSS file in {file:SASS_REFERENCE.md#template_location-option `:template_location`}
+    # Checks each Sass/SCSS file in
+    # {file:SASS_REFERENCE.md#template_location-option `:template_location`}
     # to see if it's been modified more recently than the corresponding CSS file
     # in {file:SASS_REFERENCE.md#css_location-option `:css_location`}.
     # If it has, it updates the CSS file.
@@ -230,7 +231,8 @@ module Sass::Plugin
 
       # TODO: Keep better track of what depends on what
       # so we don't have to run a global update every time anything changes.
-      listener = create_listener(*(directories + [{:relative_paths => false}])) do |modified, added, removed|
+      listener_args = directories + [{:relative_paths => false}]
+      listener = create_listener(*listener_args) do |modified, added, removed|
         recompile_required = false
 
         modified.uniq.each do |f|
@@ -246,7 +248,7 @@ module Sass::Plugin
         end
 
         removed.uniq.each do |f|
-          if files = individual_files.find {|(source,_,_)| File.expand_path(source) == f}
+          if (files = individual_files.find {|(source, _, _)| File.expand_path(source) == f})
             recompile_required = true
             # This was a file we were watching explicitly and compiling to a particular location.
             # Delete the corresponding file.
@@ -269,21 +271,24 @@ module Sass::Plugin
         end
 
         if recompile_required
-          # In case a file we're watching is removed and then recreated we prune out the non-existant files here.
+          # In case a file we're watching is removed and then recreated we
+          # prune out the non-existant files here.
           watched_files_remaining = individual_files.select {|(source, _, _)| File.exists?(source)}
           update_stylesheets(watched_files_remaining)
         end
       end
 
-      # The native windows listener is much slower than the polling
-      # option, according to https://github.com/nex3/sass/commit/a3031856b22bc834a5417dedecb038b7be9b9e3e#commitcomment-1295118
+      # The native windows listener is much slower than the polling option, according to
+      # https://github.com/nex3/sass/commit/a3031856b22bc834a5417dedecb038b7be9b9e3e
       listener.force_polling(true) if @options[:poll] || Sass::Util.windows?
 
+      # rubocop:disable RescueException
       begin
         listener.start!
       rescue Exception => e
         raise e unless e.is_a?(Interrupt)
       end
+      # rubocop:enable RescueException
     end
 
     # Non-destructively modifies \{#options} so that default values are properly set,
@@ -313,9 +318,13 @@ module Sass::Plugin
       dedupped = []
       directories.each do |new_directory|
         # no need to add a directory that is already watched.
-        next if dedupped.any? {|existing_directory| child_of_directory?(existing_directory, new_directory)}
+        next if dedupped.any? do |existing_directory|
+          child_of_directory?(existing_directory, new_directory)
+        end
         # get rid of any sub directories of this new directory
-        dedupped.reject! {|existing_directory| child_of_directory?(new_directory, existing_directory)}
+        dedupped.reject! do |existing_directory|
+          child_of_directory?(new_directory, existing_directory)
+        end
         dedupped << new_directory
       end
       dedupped
@@ -338,14 +347,16 @@ module Sass::Plugin
         else
           rendered = engine.render
         end
-      rescue Exception => e
+      rescue StandardError => e
         compilation_error_occured = true
         run_compilation_error e, filename, css, sourcemap
         rendered = Sass::SyntaxError.exception_to_css(e, options)
       end
 
       write_file(css, rendered)
-      write_file(sourcemap, mapping.to_json(:css_path => css, :sourcemap_path => sourcemap)) if mapping
+      if mapping
+        write_file(sourcemap, mapping.to_json(:css_path => css, :sourcemap_path => sourcemap))
+      end
       run_updated_stylesheet(filename, css, sourcemap) unless compilation_error_occured
     end
 
@@ -379,7 +390,8 @@ module Sass::Plugin
     end
 
     def normalized_load_paths
-      @normalized_load_paths ||= Sass::Engine.normalize_options(:load_paths=> load_paths)[:load_paths]
+      @normalized_load_paths ||=
+        Sass::Engine.normalize_options(:load_paths => load_paths)[:load_paths]
     end
 
     def load_paths(opts = options)
@@ -395,7 +407,8 @@ module Sass::Plugin
     end
 
     def css_filename(name, path)
-      "#{path}#{File::SEPARATOR unless path.end_with?(File::SEPARATOR)}#{name}".gsub(/\.s[ac]ss$/, '.css')
+      "#{path}#{File::SEPARATOR unless path.end_with?(File::SEPARATOR)}#{name}".
+        gsub(/\.s[ac]ss$/, '.css')
     end
 
     def relative_to_pwd(f)

data/lib/sass/plugin/configuration.rb

@@ -18,7 +18,8 @@ module Sass
         }.freeze
       end
 
-      # Resets the options and {Sass::Callbacks::InstanceMethods#clear_callbacks! clears all callbacks}.
+      # Resets the options and
+      # {Sass::Callbacks::InstanceMethods#clear_callbacks! clears all callbacks}.
       def reset!
         @options = nil
         clear_callbacks!
@@ -36,7 +37,8 @@ module Sass
       # This means that Sass/SCSS files in `template_location`
       # will be compiled to CSS files in `css_location`.
       #
-      # This is preferred over manually manipulating the {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
+      # This is preferred over manually manipulating the
+      # {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
       # since the option can be in multiple formats.
       #
       # Note that this method will change `options[:template_location]`
@@ -56,7 +58,8 @@ module Sass
       # This means that Sass/SCSS files in `template_location`
       # will no longer be compiled to CSS files in `css_location`.
       #
-      # This is preferred over manually manipulating the {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
+      # This is preferred over manually manipulating the
+      # {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
       # since the option can be in multiple formats.
       #
       # Note that this method will change `options[:template_location]`
@@ -100,10 +103,15 @@ module Sass
         options[:template_location] =
           case options[:template_location]
           when nil
-            options[:css_location] ?
-              [[File.join(options[:css_location], 'sass'), options[:css_location]]] : []
-          when String; [[options[:template_location], options[:css_location]]]
-          else; options[:template_location].to_a
+            if options[:css_location]
+              [[File.join(options[:css_location], 'sass'), options[:css_location]]]
+            else
+              []
+            end
+          when String
+            [[options[:template_location], options[:css_location]]]
+          else
+            options[:template_location].to_a
           end
       end
     end

data/lib/sass/plugin/merb.rb

@@ -5,7 +5,7 @@ unless defined?(Sass::MERB_LOADED)
     # Different default options in a m envirionment.
     def default_options
       @default_options ||= begin
-        version = Merb::VERSION.split('.').map { |n| n.to_i }
+        version = Merb::VERSION.split('.').map {|n| n.to_i}
         if version[0] <= 0 && version[1] < 5
           root = MERB_ROOT
           env  = MERB_ENV

data/lib/sass/plugin/staleness_checker.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module Sass
   module Plugin
     # The class handles `.s[ca]ss` file staleness checks via their mtime timestamps.
@@ -24,11 +26,13 @@ module Sass
     #   as its instance-level caches are never explicitly expired.
     class StalenessChecker
       @dependencies_cache = {}
+      @dependency_cache_mutex = Mutex.new
 
       class << self
         # TODO: attach this to a compiler instance.
         # @private
         attr_accessor :dependencies_cache
+        attr_reader :dependency_cache_mutex
       end
 
       # Creates a new StalenessChecker
@@ -37,15 +41,13 @@ module Sass
       # @param options [{Symbol => Object}]
       #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
       def initialize(options)
-        @dependencies = self.class.dependencies_cache
-
         # URIs that are being actively checked for staleness. Protects against
         # import loops.
         @actively_checking = Set.new
 
         # Entries in the following instance-level caches are never explicitly expired.
-        # Instead they are supposed to automaticaly go out of scope when a series of staleness checks
-        # (this instance of StalenessChecker was created for) is finished.
+        # Instead they are supposed to automaticaly go out of scope when a series of staleness
+        # checks (this instance of StalenessChecker was created for) is finished.
         @mtimes, @dependencies_stale, @parse_trees = {}, {}, {}
         @options = Sass::Engine.normalize_options(options)
       end
@@ -131,7 +133,7 @@ module Sass
           begin
             mtime = importer.mtime(uri, @options)
             if mtime.nil?
-              @dependencies.delete([uri, importer])
+              with_dependency_cache {|cache| cache.delete([uri, importer])}
               nil
             else
               mtime
@@ -140,18 +142,21 @@ module Sass
       end
 
       def dependencies(uri, importer)
-        stored_mtime, dependencies = Sass::Util.destructure(@dependencies[[uri, importer]])
+        stored_mtime, dependencies =
+          with_dependency_cache {|cache| Sass::Util.destructure(cache[[uri, importer]])}
 
         if !stored_mtime || stored_mtime < mtime(uri, importer)
           dependencies = compute_dependencies(uri, importer)
-          @dependencies[[uri, importer]] = [mtime(uri, importer), dependencies]
+          with_dependency_cache do |cache|
+            cache[[uri, importer]] = [mtime(uri, importer), dependencies]
+          end
         end
 
         dependencies
       end
 
       def dependency_updated?(css_mtime)
-        Proc.new do |uri, importer|
+        proc do |uri, importer|
           next true if @actively_checking.include?(uri)
           begin
             @actively_checking << uri
@@ -178,6 +183,17 @@ module Sass
       def tree(uri, importer)
         @parse_trees[[uri, importer]] ||= importer.find(uri, @options).to_tree
       end
+
+      # Get access to the global dependency cache in a threadsafe manner.
+      # Inside the block, no other thread can access the dependency cache.
+      #
+      # @yieldparam cache [Hash] The hash that is the global dependency cache
+      # @return The value returned by the block to which this method yields
+      def with_dependency_cache
+        StalenessChecker.dependency_cache_mutex.synchronize do
+          yield StalenessChecker.dependencies_cache
+        end
+      end
     end
   end
 end

data/lib/sass/repl.rb

@@ -18,7 +18,7 @@ module Sass
       @line = 0
       loop do
         @line += 1
-        unless text = Readline.readline('>> ')
+        unless (text = Readline.readline('>> '))
           puts
           return
         end
@@ -48,8 +48,8 @@ module Sass
     rescue Sass::SyntaxError => e
       puts "SyntaxError: #{e.message}"
       if @options[:trace]
-        e.backtrace.each do |e|
-          puts "\tfrom #{e}"
+        e.backtrace.each do |line|
+          puts "\tfrom #{line}"
         end
       end
     end

data/lib/sass/script.rb

@@ -56,7 +56,8 @@ module Sass
 
     # @private
     def self.const_missing(name)
-      super unless klass = CONST_RENAMES[name]
+      klass = CONST_RENAMES[name]
+      super unless klass
       CONST_RENAMES.each {|n, k| const_set(n, k)}
       klass
     end

data/lib/sass/script/css_lexer.rb

@@ -4,6 +4,7 @@ module Sass
     #
     # @see Sass::SCSS::CssParser
     class CssLexer < Lexer
+
       private
 
       def token
@@ -12,16 +13,20 @@ module Sass
 
       def string(re, *args)
         if re == :uri
-          return unless uri = scan(URI)
+          uri = scan(URI)
+          return unless uri
           return [:string, Script::Value::String.new(uri)]
         end
 
         return unless scan(STRING)
-        [:string, Script::Value::String.new((@scanner[1] || @scanner[2]).gsub(/\\(['"])/, '\1'), :string)]
+        string_value = (@scanner[1] || @scanner[2]).gsub(/\\(['"])/, '\1')
+        value = Script::Value::String.new(string_value, :string)
+        [:string, value]
       end
 
       def important
-        return unless s = scan(IMPORTANT)
+        s = scan(IMPORTANT)
+        return unless s
         [:raw, s]
       end
     end

data/lib/sass/script/css_parser.rb

@@ -7,6 +7,7 @@ module Sass
     #
     # @see Sass::SCSS::CssParser
     class CssParser < Parser
+
       private
 
       # @private
@@ -17,8 +18,11 @@ module Sass
       production :div, :unary_plus, :div
 
       def string
-        return number unless tok = try_tok(:string)
-        return literal_node(tok.value, tok.source_range) unless @lexer.peek && @lexer.peek.type == :begin_interpolation
+        tok = try_tok(:string)
+        return number unless tok
+        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

data/lib/sass/script/functions.rb

@@ -1,3 +1,5 @@
+require 'sass/script/value/helpers'
+
 module Sass::Script
   # Methods in this module are accessible from the SassScript context.
   # For example, you can write
@@ -91,13 +93,16 @@ module Sass::Script
   #
   # ## Other Color Functions
   #
-  # \{#adjust_color adjust-color($color, \[$red\], \[$green\], \[$blue\], \[$hue\], \[$saturation\], \[$lightness\], \[$alpha\])}
+  # \{#adjust_color adjust-color($color, \[$red\], \[$green\], \[$blue\],
+  #   \[$hue\], \[$saturation\], \[$lightness\], \[$alpha\])}
   # : Increases or decreases one or more components of a color.
   #
-  # \{#scale_color scale-color($color, \[$red\], \[$green\], \[$blue\], \[$saturation\], \[$lightness\], \[$alpha\])}
+  # \{#scale_color scale-color($color, \[$red\], \[$green\], \[$blue\],
+  #   \[$saturation\], \[$lightness\], \[$alpha\])}
   # : Fluidly scales one or more properties of a color.
   #
-  # \{#change_color change-color($color, \[$red\], \[$green\], \[$blue\], \[$hue\], \[$saturation\], \[$lightness\], \[$alpha\])}
+  # \{#change_color change-color($color, \[$red\], \[$green\], \[$blue\],
+  #   \[$hue\], \[$saturation\], \[$lightness\], \[$alpha\])}
   # : Changes one or more properties of a color.
   #
   # \{#ie_hex_str ie-hex-str($color)}
@@ -342,22 +347,23 @@ module Sass::Script
     def self.signature(method_name, arg_arity, kwarg_arity)
       return unless @signatures[method_name]
       @signatures[method_name].each do |signature|
-        return signature if signature.args.size == arg_arity + kwarg_arity
-        next unless signature.args.size < arg_arity + kwarg_arity
+        sig_arity = signature.args.size
+        return signature if sig_arity == arg_arity + kwarg_arity
+        next unless sig_arity < arg_arity + kwarg_arity
 
         # We have enough args.
         # Now we need to figure out which args are varargs
         # and if the signature allows them.
         t_arg_arity, t_kwarg_arity = arg_arity, kwarg_arity
-        if signature.args.size > t_arg_arity
+        if sig_arity > t_arg_arity
           # we transfer some kwargs arity to args arity
           # if it does not have enough args -- assuming the names will work out.
-          t_kwarg_arity -= (signature.args.size - t_arg_arity)
-          t_arg_arity = signature.args.size
+          t_kwarg_arity -= (sig_arity - t_arg_arity)
+          t_arg_arity = sig_arity
         end
 
-        if (  t_arg_arity == signature.args.size ||   t_arg_arity > signature.args.size && 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
@@ -369,6 +375,7 @@ module Sass::Script
     # are available to use in functions.
     class EvaluationContext
       include Functions
+      include Value::Helpers
 
       # The human-readable names for [Sass::Script::Value::Base]. The default is
       # just the downcased name of the type. The default is the downcased type
@@ -440,8 +447,10 @@ module Sass::Script
       #
       # @example
       #   assert_integer 2px
-      #   assert_integer 2.5px => SyntaxError: "Expected 2.5px to be an integer"
-      #   assert_integer 2.5px, "width" => SyntaxError: "Expected width to be an integer but got 2.5px"
+      #   assert_integer 2.5px
+      #     => SyntaxError: "Expected 2.5px to be an integer"
+      #   assert_integer 2.5px, "width"
+      #     => SyntaxError: "Expected width to be an integer but got 2.5px"
       # @param number [Sass::Script::Value::Base] The value to be validated.
       # @param name [::String] The name of the parameter being validated.
       # @raise [ArgumentError] if number is not an integer or is not a number.
@@ -464,6 +473,7 @@ module Sass::Script
       alias_method :callable?, :public_method_defined?
 
       private
+
       def include(*args)
         r = super
         # We have to re-include ourselves into EvaluationContext to work around
@@ -494,17 +504,17 @@ module Sass::Script
       assert_type green, :Number, :green
       assert_type blue, :Number, :blue
 
-      Sass::Script::Value::Color.new([[red, :red], [green, :green], [blue, :blue]].map do |(c, name)|
-          v = c.value
-          if c.is_unit?("%")
-            v = Sass::Util.check_range("$#{name}: Color value", 0..100, c, '%')
-            v * 255 / 100.0
-          elsif c.unitless?
-            Sass::Util.check_range("$#{name}: Color value", 0..255, c)
-          else
-            raise ArgumentError.new("Expected #{c} to be unitless or have a unit of % but got #{c}")
-          end
-        end)
+      color_attrs = [[red, :red], [green, :green], [blue, :blue]].map do |(c, name)|
+        if c.is_unit?("%")
+          v = Sass::Util.check_range("$#{name}: Color value", 0..100, c, '%')
+          v * 255 / 100.0
+        elsif c.unitless?
+          Sass::Util.check_range("$#{name}: Color value", 0..255, c)
+        else
+          raise ArgumentError.new("Expected #{c} to be unitless or have a unit of % but got #{c}")
+        end
+      end
+      Sass::Script::Value::Color.new(color_attrs)
     end
     declare :rgb, [:red, :green, :blue]
 
@@ -576,7 +586,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)
-      hsla(hue, saturation, lightness, Sass::Script::Value::Number.new(1))
+      hsla(hue, saturation, lightness, number(1))
     end
     declare :hsl, [:hue, :saturation, :lightness]
 
@@ -611,7 +621,8 @@ module Sass::Script
       s = Sass::Util.check_range('Saturation', 0..100, saturation, '%')
       l = Sass::Util.check_range('Lightness', 0..100, lightness, '%')
 
-      Sass::Script::Value::Color.new(:hue => h, :saturation => s, :lightness => l, :alpha => alpha.value)
+      Sass::Script::Value::Color.new(
+        :hue => h, :saturation => s, :lightness => l, :alpha => alpha.value)
     end
     declare :hsla, [:hue, :saturation, :lightness, :alpha]
 
@@ -627,7 +638,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def red(color)
       assert_type color, :Color, :color
-      Sass::Script::Value::Number.new(color.red)
+      number(color.red)
     end
     declare :red, [:color]
 
@@ -643,7 +654,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def green(color)
       assert_type color, :Color, :color
-      Sass::Script::Value::Number.new(color.green)
+      number(color.green)
     end
     declare :green, [:color]
 
@@ -659,7 +670,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def blue(color)
       assert_type color, :Color, :color
-      Sass::Script::Value::Number.new(color.blue)
+      number(color.blue)
     end
     declare :blue, [:color]
 
@@ -677,7 +688,8 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def hue(color)
       assert_type color, :Color, :color
-      Sass::Script::Value::Number.new(color.hue, ["deg"])
+      assert_type color, :Color
+      number(color.hue, "deg")
     end
     declare :hue, [:color]
 
@@ -695,7 +707,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def saturation(color)
       assert_type color, :Color, :color
-      Sass::Script::Value::Number.new(color.saturation, ["%"])
+      number(color.saturation, "%")
     end
     declare :saturation, [:color]
 
@@ -713,7 +725,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def lightness(color)
       assert_type color, :Color, :color
-      Sass::Script::Value::Number.new(color.lightness, ["%"])
+      number(color.lightness, "%")
     end
     declare :lightness, [:color]
 
@@ -729,17 +741,17 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def alpha(*args)
       if args.all? do |a|
-          a.is_a?(Sass::Script::Value::String) && a.type == :identifier &&
-            a.value =~ /^[a-zA-Z]+\s*=/
-        end
+           a.is_a?(Sass::Script::Value::String) && a.type == :identifier &&
+             a.value =~ /^[a-zA-Z]+\s*=/
+         end
         # Support the proprietary MS alpha() function
-        return Sass::Script::Value::String.new("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
 
       assert_type args.first, :Color, :color
-      Sass::Script::Value::Number.new(args.first.alpha)
+      number(args.first.alpha)
     end
     declare :alpha, [:color]
 
@@ -752,10 +764,10 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def opacity(color)
       if color.is_a?(Sass::Script::Value::Number)
-        return Sass::Script::Value::String.new("opacity(#{color})")
+        return identifier("opacity(#{color})")
       end
       assert_type color, :Color, :color
-      Sass::Script::Value::Number.new(color.alpha)
+      number(color.alpha)
     end
     declare :opacity, [:color]
 
@@ -858,7 +870,7 @@ module Sass::Script
     def saturate(color, amount = nil)
       # Support the filter effects definition of saturate.
       # https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html
-      return Sass::Script::Value::String.new("saturate(#{color})") if amount.nil?
+      return identifier("saturate(#{color})") if amount.nil?
       _adjust(color, amount, :saturation, 0..100, :+, "%")
     end
     declare :saturate, [:color, :amount]
@@ -918,7 +930,7 @@ module Sass::Script
     def ie_hex_str(color)
       assert_type color, :Color, :color
       alpha = (color.alpha * 255).round.to_s(16).rjust(2, '0')
-      Sass::Script::Value::String.new("##{alpha}#{color.send(:hex_str)[1..-1]}".upcase)
+      identifier("##{alpha}#{color.send(:hex_str)[1..-1]}".upcase)
     end
     declare :ie_hex_str, [:color]
 
@@ -935,7 +947,8 @@ 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)
-    # @overload adjust_color($color, [$red], [$green], [$blue], [$hue], [$saturation], [$lightness], [$alpha])
+    # @overload adjust_color($color, [$red], [$green], [$blue],
+    #   [$hue], [$saturation], [$lightness], [$alpha])
     # @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
@@ -967,7 +980,8 @@ module Sass::Script
           "alpha" => [-1..1, ""]
         }) do |name, (range, units)|
 
-        next unless val = kwargs.delete(name)
+        val = kwargs.delete(name)
+        next unless val
         assert_type val, :Number, name
         Sass::Util.check_range("$#{name}: Amount", range, val, units) if range
         adjusted = color.send(name) + val.value
@@ -1011,7 +1025,8 @@ 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)
-    # @overload scale_color($color, [$red], [$green], [$blue], [$saturation], [$lightness], [$alpha])
+    # @overload scale_color($color, [$red], [$green], [$blue],
+    #   [$saturation], [$lightness], [$alpha])
     # @param $color [Sass::Script::Value::Color]
     # @param $red [Sass::Script::Value::Number]
     # @param $green [Sass::Script::Value::Number]
@@ -1034,15 +1049,16 @@ module Sass::Script
           "alpha" => 1
         }) do |name, max|
 
-        next unless val = kwargs.delete(name)
+        val = kwargs.delete(name)
+        next unless val
         assert_type val, :Number, name
         assert_unit val, '%', name
         Sass::Util.check_range("$#{name}: Amount", -100..100, val, '%')
 
         current = color.send(name)
-        scale = val.value/100.0
+        scale = val.value / 100.0
         diff = scale > 0 ? max - current : current
-        [name.to_sym, current + diff*scale]
+        [name.to_sym, current + diff * scale]
       end
 
       unless kwargs.empty?
@@ -1067,7 +1083,8 @@ 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)
-    # @overload change_color($color, [$red], [$green], [$blue], [$hue], [$saturation], [$lightness], [$alpha])
+    # @overload change_color($color, [$red], [$green], [$blue], [$hue],
+    #   [$saturation], [$lightness], [$alpha])
     # @param $color [Sass::Script::Value::Color]
     # @param $red [Sass::Script::Value::Number] The new red component for the
     #   color, within 0 and 255 inclusive
@@ -1090,7 +1107,8 @@ module Sass::Script
     def change_color(color, kwargs)
       assert_type color, :Color, :color
       with = Sass::Util.map_hash(%w[red green blue hue saturation lightness alpha]) do |name, max|
-        next unless val = kwargs.delete(name)
+        val = kwargs.delete(name)
+        next unless val
         assert_type val, :Number, name
         [name.to_sym, val.value]
       end
@@ -1126,7 +1144,7 @@ module Sass::Script
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$weight` is out of bounds or any parameter is
     #   the wrong type
-    def mix(color_1, color_2, weight = Sass::Script::Value::Number.new(50))
+    def mix(color_1, color_2, weight = number(50))
       assert_type color_1, :Color, :color_1
       assert_type color_2, :Color, :color_2
       assert_type weight, :Number, :weight
@@ -1152,16 +1170,16 @@ module Sass::Script
       #
       # Finally, the weight of color_1 is renormalized to be within [0, 1]
       # and the weight of color_2 is given by 1 minus the weight of color_1.
-      p = (weight.value/100.0).to_f
-      w = p*2 - 1
+      p = (weight.value / 100.0).to_f
+      w = p * 2 - 1
       a = color_1.alpha - color_2.alpha
 
-      w1 = (((w * a == -1) ? w : (w + a)/(1 + w*a)) + 1)/2.0
+      w1 = ((w * a == -1 ? w : (w + a) / (1 + w * a)) + 1) / 2.0
       w2 = 1 - w1
 
-      rgb = color_1.rgb.zip(color_2.rgb).map {|v1, v2| v1*w1 + v2*w2}
-      alpha = color_1.alpha*p + color_2.alpha*(1-p)
-      Sass::Script::Value::Color.new(rgb + [alpha])
+      rgba = color_1.rgb.zip(color_2.rgb).map {|v1, v2| v1 * w1 + v2 * w2}
+      rgba << color_1.alpha * p + color_2.alpha * (1 - p)
+      rgb_color(*rgba)
     end
     declare :mix, [:color_1, :color_2]
     declare :mix, [:color_1, :color_2, :weight]
@@ -1176,9 +1194,9 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def grayscale(color)
       if color.is_a?(Sass::Script::Value::Number)
-        return Sass::Script::Value::String.new("grayscale(#{color})")
+        return identifier("grayscale(#{color})")
       end
-      desaturate color, Sass::Script::Value::Number.new(100)
+      desaturate color, number(100)
     end
     declare :grayscale, [:color]
 
@@ -1191,7 +1209,7 @@ module Sass::Script
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$color` isn't a color
     def complement(color)
-      adjust_hue color, Sass::Script::Value::Number.new(180)
+      adjust_hue color, number(180)
     end
     declare :complement, [:color]
 
@@ -1204,7 +1222,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def invert(color)
       if color.is_a?(Sass::Script::Value::Number)
-        return Sass::Script::Value::String.new("invert(#{color})")
+        return identifier("invert(#{color})")
       end
 
       assert_type color, :Color, :color
@@ -1227,8 +1245,8 @@ module Sass::Script
     # @return [Sass::Script::Value::String]
     # @raise [ArgumentError] if `$string` isn't a string
     def unquote(string)
-      if string.is_a?(Sass::Script::Value::String)
-        Sass::Script::Value::String.new(string.value, :identifier)
+      if string.is_a?(Sass::Script::Value::String) && string.type != :identifier
+        identifier(string.value)
       else
         string
       end
@@ -1248,7 +1266,11 @@ module Sass::Script
     # @raise [ArgumentError] if `$string` isn't a string
     def quote(string)
       assert_type string, :String, :string
-      Sass::Script::Value::String.new(string.value, :string)
+      if string.type != :string
+        quoted_string(string.value)
+      else
+        string
+      end
     end
     declare :quote, [:string]
 
@@ -1262,7 +1284,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$string` isn't a string
     def str_length(string)
       assert_type string, :String, :string
-      Sass::Script::Value::Number.new(string.value.size)
+      number(string.value.size)
     end
     declare :str_length, [:string]
 
@@ -1291,8 +1313,13 @@ module Sass::Script
       assert_type insert, :String, :insert
       assert_integer index, :index
       assert_unit index, nil, :index
-      insertion_point = index.value > 0 ? [index.value - 1, original.value.size].min : [index.value, -original.value.size - 1].max
-      Sass::Script::Value::String.new(original.value.dup.insert(insertion_point, insert.value), original.type)
+      insertion_point = if index.value > 0
+                          [index.value - 1, original.value.size].min
+                        else
+                          [index.value, -original.value.size - 1].max
+                        end
+      result = original.value.dup.insert(insertion_point, insert.value)
+      Sass::Script::Value::String.new(result, original.type)
     end
     declare :str_insert, [:string, :insert, :index]
 
@@ -1317,11 +1344,10 @@ module Sass::Script
       assert_type string, :String, :string
       assert_type substring, :String, :substring
       index = string.value.index(substring.value) || -1
-      Sass::Script::Value::Number.new(index + 1)
+      number(index + 1)
     end
     declare :str_index, [:string, :substring]
 
-
     # Extracts a substring from `$string`. The substring will begin at index
     # `$start-at` and ends at index `$end-at`.
     #
@@ -1348,7 +1374,7 @@ module Sass::Script
       assert_type string, :String, :string
       assert_unit start_at, nil, "start-at"
 
-      end_at = Sass::Script::Value::Number.new(-1) if end_at.nil?
+      end_at = number(-1) if end_at.nil?
       assert_unit end_at, nil, "end-at"
 
       s = start_at.value > 0 ? start_at.value - 1 : start_at.value
@@ -1407,7 +1433,7 @@ module Sass::Script
     # @return [Sass::Script::Value::String] The unquoted string name of the
     #   value's type
     def type_of(value)
-      Sass::Script::Value::String.new(value.class.name.gsub(/Sass::Script::Value::/,'').downcase)
+      identifier(value.class.name.gsub(/Sass::Script::Value::/, '').downcase)
     end
     declare :type_of, [:value]
 
@@ -1423,7 +1449,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$feature` isn't a string
     def feature_exists(feature)
       assert_type feature, :String, :feature
-      Sass::Script::Value::Bool.new(Sass.has_feature?(feature.value))
+      bool(Sass.has_feature?(feature.value))
     end
     declare :feature_exists, [:feature]
 
@@ -1443,7 +1469,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$number` isn't a number
     def unit(number)
       assert_type number, :Number, :number
-      Sass::Script::Value::String.new(number.unit_str, :string)
+      quoted_string(number.unit_str)
     end
     declare :unit, [:number]
 
@@ -1458,7 +1484,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$number` isn't a number
     def unitless(number)
       assert_type number, :Number, :number
-      Sass::Script::Value::Bool.new(number.unitless?)
+      bool(number.unitless?)
     end
     declare :unitless, [:number]
 
@@ -1476,7 +1502,7 @@ module Sass::Script
     def comparable(number_1, number_2)
       assert_type number_1, :Number, :number_1
       assert_type number_2, :Number, :number_2
-      Sass::Script::Value::Bool.new(number_1.comparable_to?(number_2))
+      bool(number_1.comparable_to?(number_2))
     end
     declare :comparable, [:number_1, :number_2]
 
@@ -1493,7 +1519,7 @@ module Sass::Script
       unless value.is_a?(Sass::Script::Value::Number) && value.unitless?
         raise ArgumentError.new("$value: #{value.inspect} is not a unitless number")
       end
-      Sass::Script::Value::Number.new(value.value * 100, ['%'])
+      number(value.value * 100, '%')
     end
     declare :percentage, [:value]
 
@@ -1599,10 +1625,40 @@ module Sass::Script
     # @param $list [Sass::Script::Value::Base]
     # @return [Sass::Script::Value::Number]
     def length(list)
-      Sass::Script::Value::Number.new(list.to_a.size)
+      number(list.to_a.size)
     end
     declare :length, [:list]
 
+    # Return a new list, based on the list provided, but with the nth
+    # element changed to the value given.
+    #
+    # Note that unlike some languages, the first item in a Sass list is number
+    # 1, the second number 2, and so forth.
+    #
+    # Negative index values address elements in reverse order, starting with the last element
+    # in the list.
+    #
+    # @example
+    #   set-nth($list: 10px 20px 30px, $n: 2, $value: -20px) => 10px -20px 30px
+    # @overload nth($list, $n, $value)
+    # @param $list [Sass::Script::Value::Base] The list that will be copied, having the element
+    #   at index `$n` changed.
+    # @param $n [Sass::Script::Value::Number] The index of the item to set.
+    #   Negative indices count from the end of the list.
+    # @param $value [Sass::Script::Value::Base] The new value at index `$n`.
+    # @return [Sass::Script::Value::List]
+    # @raise [ArgumentError] if `$n` isn't an integer between 1 and the length
+    #   of `$list`
+    def set_nth(list, n, value)
+      assert_type n, :Number, :n
+      Sass::Script::Value::List.assert_valid_index(list, n)
+      index = n.to_i > 0 ? n.to_i - 1 : n.to_i
+      new_list = list.to_a.dup
+      new_list[index] = value
+      Sass::Script::Value::List.new(new_list, list.separator)
+    end
+    declare :set_nth, [:list, :n, :value]
+
     # Gets the nth item in a list.
     #
     # Note that unlike some languages, the first item in a Sass list is number
@@ -1610,6 +1666,9 @@ module Sass::Script
     #
     # This can return the nth pair in a map as well.
     #
+    # Negative index values address elements in reverse order, starting with the last element in
+    # the list.
+    #
     # @example
     #   nth(10px 20px 30px, 1) => 10px
     #   nth((Helvetica, Arial, sans-serif), 3) => sans-serif
@@ -1623,13 +1682,7 @@ module Sass::Script
     #   of `$list`
     def nth(list, n)
       assert_type n, :Number, :n
-      if !n.int? || n.to_i == 0
-        raise ArgumentError.new("List index #{n} must be a non-zero integer")
-      elsif list.to_a.size == 0
-        raise ArgumentError.new("List index is #{n} but list has no items")
-      elsif n.to_i.abs > (size = list.to_a.size)
-        raise ArgumentError.new("List index is #{n} but list is only #{size} item#{'s' if size != 1} long")
-      end
+      Sass::Script::Value::List.assert_valid_index(list, n)
 
       index = n.to_i > 0 ? n.to_i - 1 : n.to_i
       list.to_a[index]
@@ -1656,18 +1709,17 @@ module Sass::Script
     #   If this is `comma` or `space`, that separator will be used. If this is
     #   `auto` (the default), the separator is determined as explained above.
     # @return [Sass::Script::Value::List]
-    def join(list1, list2, separator = Sass::Script::Value::String.new("auto"))
+    def join(list1, list2, separator = identifier("auto"))
       assert_type separator, :String, :separator
       unless %w[auto space comma].include?(separator.value)
         raise ArgumentError.new("Separator name must be space, comma, or auto")
       end
-      Sass::Script::Value::List.new(
-        list1.to_a + list2.to_a,
-        if separator.value == 'auto'
-          list1.separator || list2.separator || :space
-        else
-          separator.value.to_sym
-        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
     declare :join, [:list1, :list2]
     declare :join, [:list1, :list2, :separator]
@@ -1690,18 +1742,17 @@ module Sass::Script
     #   If this is `comma` or `space`, that separator will be used. If this is
     #   `auto` (the default), the separator is determined as explained above.
     # @return [Sass::Script::Value::List]
-    def append(list, val, separator = Sass::Script::String.new("auto"))
+    def append(list, val, separator = identifier("auto"))
       assert_type separator, :String, :separator
       unless %w[auto space comma].include?(separator.value)
         raise ArgumentError.new("Separator name must be space, comma, or auto")
       end
-      Sass::Script::Value::List.new(
-        list.to_a + [val],
-        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]
@@ -1731,11 +1782,10 @@ module Sass::Script
         value.slice!(length)
       end
       new_list_value = values.first.zip(*values[1..-1])
-      Sass::Script::Value::List.new(new_list_value.map{|list| Sass::Script::Value::List.new(list, :space)}, :comma)
+      list(new_list_value.map {|list| list(list, :space)}, :comma)
     end
     declare :zip, [], :var_args => true
 
-
     # Returns the position of a value within a list. If the value isn't found,
     # returns false instead.
     #
@@ -1754,11 +1804,11 @@ module Sass::Script
     # @return [Sass::Script::Value::Number, Sass::Script::Value::Bool] The
     #   1-based index of `$value` in `$list`, or `false`
     def index(list, value)
-      index = list.to_a.index {|e| e.eq(value).to_bool }
+      index = list.to_a.index {|e| e.eq(value).to_bool}
       if index
-        Sass::Script::Value::Number.new(index + 1)
+        number(index + 1)
       else
-        Sass::Script::Value::Bool::FALSE
+        bool(false)
       end
     end
     declare :index, [:list, :value]
@@ -1774,7 +1824,7 @@ module Sass::Script
     # @param $list [Sass::Script::Value::Base]
     # @return [Sass::Script::Value::String] `comma` or `space`
     def list_separator(list)
-      Sass::Script::Value::String.new((list.separator || :space).to_s)
+      identifier((list.separator || :space).to_s)
     end
     declare :separator, [:list]
 
@@ -1883,7 +1933,8 @@ module Sass::Script
     # @raise [ArgumentError] if `$args` isn't a variable argument list
     def keywords(args)
       assert_type args, :ArgList
-      Sass::Script::Value::Map.new(Sass::Util.map_keys(args.keywords) {|k| Sass::Script::String.new(k)})
+      Sass::Script::Value::Map.new(
+        Sass::Util.map_keys(args.keywords) {|k| Sass::Script::String.new(k)})
     end
     declare :keywords, [:args]
 
@@ -1920,7 +1971,7 @@ module Sass::Script
       # avoid the temptation of trying to guess the next unique value.
       value = (Thread.current[:sass_last_unique_id] += (rand(10) + 1))
       # the u makes this a legal identifier if it would otherwise start with a number.
-      Sass::Script::String.new("u" + value.to_s(36).rjust(8, '0'))
+      identifier("u" + value.to_s(36).rjust(8, '0'))
     end
     declare :unique_id, []
 
@@ -1963,7 +2014,7 @@ module Sass::Script
     # @overload counter($args...)
     # @return [String]
     def counter(*args)
-      Sass::Script::Value::String.new("counter(#{args.map {|a| a.to_s(options)}.join(',')})")
+      identifier("counter(#{args.map {|a| a.to_s(options)}.join(',')})")
     end
     declare :counter, [], :var_args => true
 
@@ -1989,10 +2040,14 @@ module Sass::Script
     # It yields a number to a block to perform the operation and return a number
     def numeric_transformation(value)
       assert_type value, :Number, :value
-      Sass::Script::Value::Number.new(yield(value.value), value.numerator_units, value.denominator_units)
+      Sass::Script::Value::Number.new(
+        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)
@@ -2013,7 +2068,7 @@ DEPRECATION WARNING: Passing lists of pairs to #{fn_name} is deprecated and will
 be removed in future versions of Sass. Use Sass maps instead. For details, see
 http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#maps.
 WARNING
-      return obj.to_h
+      obj.to_h
     end
   end
 end