sass 3.4.21 → 3.4.22

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

@@ -128,12 +128,15 @@ module Sass::Script::Tree
       splat = Sass::Tree::Visitors::Perform.perform_splat(
         @splat, keywords, @kwarg_splat, environment)
       if (fn = environment.function(@name))
+        css_variable_warning.warn! if css_variable_warning
         return without_original(perform_sass_fn(fn, args, splat, environment))
       end
 
       args = construct_ruby_args(ruby_name, args, splat, environment)
 
       if Sass::Script::Functions.callable?(ruby_name)
+        css_variable_warning.warn! if css_variable_warning
+
         local_environment = Sass::Environment.new(environment.global_env, environment.options)
         local_environment.caller = Sass::ReadOnlyEnvironment.new(environment, environment.options)
         result = opts(Sass::Script::Functions::EvaluationContext.new(
@@ -208,7 +211,7 @@ module Sass::Script::Tree
 
       argnames = signature.args[args.size..-1] || []
       deprecated_argnames = (signature.deprecated && signature.deprecated[args.size..-1]) || []
-      args = args + argnames.zip(deprecated_argnames).map do |(argname, deprecated_argname)|
+      args += argnames.zip(deprecated_argnames).map do |(argname, deprecated_argname)|
         if keywords.has_key?(argname)
           keywords.delete(argname)
         elsif deprecated_argname && keywords.has_key?(deprecated_argname)
@@ -296,8 +299,12 @@ module Sass::Script::Tree
             message = "wrong number of arguments (#{given} for #{expected})"
           end
         end
-      elsif e.message =~ /^wrong number of arguments \(\d+ for \d+\)/ &&
-          e.backtrace[0] !~ /:in `(block in )?#{ruby_name}'$/
+      elsif (md = /^wrong number of arguments \(given (\d+), expected (\d+)\)/.match(e.message)) &&
+            e.backtrace[0] =~ /:in `#{ruby_name}'$/
+        # Handle ruby 2.3 error formatting
+        message = "wrong number of arguments (#{md[1]} for #{md[2]})"
+      elsif e.message =~ /^wrong number of arguments/ &&
+            e.backtrace[0] !~ /:in `(block in )?#{ruby_name}'$/
         raise e
       end
       raise Sass::SyntaxError.new("#{message} for `#{name}'")

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

@@ -23,6 +23,14 @@ module Sass::Script::Tree
     # @return [String]
     attr_accessor :filename
 
+    # The warning that this node should emit if it executes in a way that's not
+    # safe for a CSS variable value.
+    #
+    # This is `nil` if this is not in a CSS variable value.
+    #
+    # @return [Sass::Script::CssVariableWarning]
+    attr_accessor :css_variable_warning
+
     # Sets the options hash for this node,
     # as well as for all child nodes.
     # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.

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

@@ -78,6 +78,13 @@ module Sass::Script::Tree
           "Invalid null operation: \"#{value1.inspect} #{@operator} #{value2.inspect}\".")
       end
 
+      if css_variable_warning && @operator == :div &&
+         !(value1.is_a?(Sass::Script::Value::Number) && value1.original &&
+           value2.is_a?(Sass::Script::Value::Number) && value2.original) &&
+         !(value1.is_a?(Sass::Script::Value::String) && value2.is_a?(Sass::Script::Value::String))
+        css_variable_warning.warn!
+      end
+
       begin
         result = opts(value1.send(@operator, value2))
       rescue NoMethodError => e

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

@@ -22,6 +22,7 @@ module Sass::Script::Value
     def initialize(value = nil)
       value.freeze unless value.nil? || value == true || value == false
       @value = value
+      @options = nil
     end
 
     # Sets the options hash for this node,

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

@@ -25,7 +25,8 @@ module Sass::Script::Value
       rgba
     end
 
-    ALTERNATE_COLOR_NAMES = Sass::Util.map_vals({
+    ALTERNATE_COLOR_NAMES = Sass::Util.map_vals(
+      {
         'aqua'                 => 0x00FFFFFF,
         'darkgrey'             => 0xA9A9A9FF,
         'darkslategrey'        => 0x2F4F4FFF,
@@ -35,10 +36,11 @@ module Sass::Script::Value
         'lightgrey'            => 0xD3D3D3FF,
         'lightslategrey'       => 0x778899FF,
         'slategrey'            => 0x708090FF,
-    }, &method(:int_to_rgba))
+      }, &method(:int_to_rgba))
 
     # A hash from color names to `[red, green, blue]` value arrays.
-    COLOR_NAMES = Sass::Util.map_vals({
+    COLOR_NAMES = Sass::Util.map_vals(
+      {
         'aliceblue'            => 0xF0F8FFFF,
         'antiquewhite'         => 0xFAEBD7FF,
         'aquamarine'           => 0x7FFFD4FF,
@@ -179,7 +181,7 @@ module Sass::Script::Value
         'whitesmoke'           => 0xF5F5F5FF,
         'yellow'               => 0xFFFF00FF,
         'yellowgreen'          => 0x9ACD32FF
-     }, &method(:int_to_rgba))
+      }, &method(:int_to_rgba))
 
     # A hash from `[red, green, blue, alpha]` value arrays to color names.
     COLOR_NAMES_REVERSE = COLOR_NAMES.invert.freeze

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

@@ -252,14 +252,14 @@ module Sass::Script::Value
     def parse_unit_string(unit_string)
       denominator_units = numerator_units = Sass::Script::Value::Number::NO_UNITS
       return numerator_units, denominator_units unless unit_string && unit_string.length > 0
-      num_over_denominator = unit_string.split(/ *\/ */)
+      num_over_denominator = unit_string.split(%r{ */ *})
       unless (1..2).include?(num_over_denominator.size)
         raise ArgumentError.new("Malformed unit string: #{unit_string}")
       end
       numerator_units = num_over_denominator[0].split(/ *\* */)
       denominator_units = (num_over_denominator[1] || "").split(/ *\* */)
       [[numerator_units, "numerator"], [denominator_units, "denominator"]].each do |units, name|
-        if unit_string =~ /\// && units.size == 0
+        if unit_string =~ %r{/} && units.size == 0
           raise ArgumentError.new("Malformed unit string: #{unit_string}")
         end
         if units.any? {|unit| unit !~ VALID_UNIT}

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

@@ -71,6 +71,7 @@ module Sass::Script::Value
       super(value)
       @numerator_units = numerator_units
       @denominator_units = denominator_units
+      @options = nil
       normalize!
     end
 
@@ -469,11 +470,10 @@ module Sass::Script::Value
         sans_common_units(@numerator_units, @denominator_units)
 
       @denominator_units.each_with_index do |d, i|
-        if convertable?(d) && (u = @numerator_units.find(&method(:convertable?)))
-          @value /= conversion_factor(d, u)
-          @denominator_units.delete_at(i)
-          @numerator_units.delete_at(@numerator_units.index(u))
-        end
+        next unless convertable?(d) && (u = @numerator_units.find(&method(:convertable?)))
+        @value /= conversion_factor(d, u)
+        @denominator_units.delete_at(i)
+        @numerator_units.delete_at(@numerator_units.index(u))
       end
     end
 

data/lib/sass/scss.rb

@@ -1,6 +1,4 @@
 require 'sass/scss/rx'
-require 'sass/scss/script_lexer'
-require 'sass/scss/script_parser'
 require 'sass/scss/parser'
 require 'sass/scss/static_parser'
 require 'sass/scss/css_parser'

data/lib/sass/scss/css_parser.rb

@@ -50,8 +50,7 @@ module Sass
         block(node(Sass::Tree::KeyframeRuleNode.new(selector.strip), start_pos), :ruleset)
       end
 
-      @sass_script_parser = Class.new(Sass::Script::CssParser)
-      @sass_script_parser.send(:include, ScriptParser)
+      @sass_script_parser = Sass::Script::CssParser
     end
   end
 end

data/lib/sass/scss/parser.rb

@@ -28,6 +28,8 @@ module Sass
         @line = line
         @offset = offset
         @strs = []
+        @expected = nil
+        @throw_error = false
       end
 
       # Parses an SCSS document.
@@ -509,7 +511,7 @@ module Sass
 
       def moz_document_function
         val = interp_uri || _interp_string(:url_prefix) ||
-          _interp_string(:domain) || function(!:allow_var) || interpolation
+          _interp_string(:domain) || function(false) || interpolation
         return unless val
         ss
         val
@@ -638,7 +640,7 @@ module Sass
         # are disallowed by the CSS spec,
         # but they're included here for compatibility
         # with some proprietary MS properties
-        str {ss if tok(/[\/,:.=]/)}
+        str {ss if tok(%r{[/,:.=]})}
       end
 
       def ruleset
@@ -764,7 +766,7 @@ module Sass
         value_start_pos = source_position
         value = nil
         error = catch_error do
-          value = value!
+          value = value!(name.first.is_a?(String) && name.first.start_with?("--"))
           if tok?(/\{/)
             # Properties that are ambiguous with selectors can't have additional
             # properties nested beneath them.
@@ -857,7 +859,7 @@ module Sass
         tok!(/:/)
         ss
         value_start_pos = source_position
-        value = value!
+        value = value!(name.first.is_a?(String) && name.first.start_with?("--"))
         value_end_pos = source_position
         ss
         require_block = tok?(/\{/)
@@ -871,7 +873,7 @@ module Sass
         nested_properties! node
       end
 
-      def value!
+      def value!(css_variable = false)
         if tok?(/\{/)
           str = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))
           str.line = source_position.line
@@ -891,10 +893,19 @@ module Sass
           str.source_range = range(start_pos)
           return str
         end
-        sass_script(:parse)
+
+        sass_script(:parse, css_variable)
       end
 
       def nested_properties!(node)
+        if node.name.first.is_a?(String) && node.name.first.start_with?("--")
+          Sass::Util.sass_warn(<<WARNING)
+DEPRECATION WARNING on line #{@line}#{" of #{@filename}" if @filename}:
+Sass 3.6 will change the way CSS variables are parsed. Instead of being parsed as
+normal properties, they will not allow any Sass-specific behavior other than \#{}.
+WARNING
+        end
+
         @expected = 'expression (e.g. 1px, bold) or "{"'
         block(node, :property)
       end
@@ -1027,8 +1038,7 @@ module Sass
         node
       end
 
-      @sass_script_parser = Class.new(Sass::Script::Parser)
-      @sass_script_parser.send(:include, ScriptParser)
+      @sass_script_parser = Sass::Script::Parser
 
       class << self
         # @private
@@ -1037,7 +1047,7 @@ module Sass
 
       def sass_script(*args)
         parser = self.class.sass_script_parser.new(@scanner, @line, @offset,
-                                                   :filename => @filename, :importer => @importer)
+          :filename => @filename, :importer => @importer, :allow_extra_text => true)
         result = parser.send(*args)
         unless @strs.empty?
           # Convert to CSS manually so that comments are ignored.
@@ -1102,7 +1112,7 @@ module Sass
 
         unless name
           # Display basic regexps as plain old strings
-          source = rx.source.gsub(/\\\//, '/')
+          source = rx.source.gsub(%r{\\/}, '/')
           string = rx.source.gsub(/\\(.)/, '\1')
           name = source == Regexp.escape(string) ? string.inspect : rx.inspect
         end

data/lib/sass/scss/rx.rb

@@ -32,7 +32,7 @@ module Sass
       # @return [String] The escaped character
       # @private
       def self.escape_char(c)
-        return "\\%06x" % (Sass::Util.ord(c)) unless c =~ /[ -\/:-~]/
+        return "\\%06x" % (Sass::Util.ord(c)) unless c =~ %r{[ -/:-~]}
         "\\#{c}"
       end
 
@@ -133,7 +133,7 @@ module Sass
       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
 
       STATIC_COMPONENT = /#{IDENT}|#{STRING_NOINTERP}|#{HEXCOLOR}|[+-]?#{NUMBER}|\!important/i
-      STATIC_VALUE = /#{STATIC_COMPONENT}(\s*[\s,\/]\s*#{STATIC_COMPONENT})*([;}])/i
+      STATIC_VALUE = %r(#{STATIC_COMPONENT}(\s*[\s,/]\s*#{STATIC_COMPONENT})*([;}]))i
       STATIC_SELECTOR = /(#{NMCHAR}|[ \t]|[,>+*]|[:#.]#{NMSTART}){1,50}([{])/i
     end
   end

data/lib/sass/scss/static_parser.rb

@@ -62,7 +62,7 @@ module Sass
       private
 
       def moz_document_function
-        val = tok(URI) || tok(URL_PREFIX) || tok(DOMAIN) || function(!:allow_var)
+        val = tok(URI) || tok(URL_PREFIX) || tok(DOMAIN) || function(false)
         return unless val
         ss
         [val]
@@ -78,7 +78,7 @@ module Sass
       def use_css_import?; true; end
 
       def special_directive(name, start_pos)
-        return unless %w[media import charset -moz-document].include?(name)
+        return unless %w(media import charset -moz-document).include?(name)
         super
       end
 
@@ -89,13 +89,12 @@ module Sass
         ws = ''
         while tok(/,/)
           ws << str {ss}
-          if (sel = selector)
-            selectors << sel
-            if ws.include?("\n")
-              selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members)
-            end
-            ws = ''
+          next unless (sel = selector)
+          selectors << sel
+          if ws.include?("\n")
+            selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members)
           end
+          ws = ''
         end
         Selector::CommaSequence.new(selectors)
       end
@@ -140,11 +139,11 @@ MESSAGE
       end
 
       def reference_combinator
-        return unless tok(/\//)
+        return unless tok(%r{/})
         res = '/'
         ns, name = expr!(:qualified_name)
         res << ns << '|' if ns
-        res << name << tok!(/\//)
+        res << name << tok!(%r{/})
         res
       end
 
@@ -266,9 +265,9 @@ MESSAGE
         return ns, name
       end
 
-      SELECTOR_PSEUDO_CLASSES = %w[not matches current any has host host-context].to_set
+      SELECTOR_PSEUDO_CLASSES = %w(not matches current any has host host-context).to_set
 
-      PREFIXED_SELECTOR_PSEUDO_CLASSES = %w[nth-child nth-last-child].to_set
+      PREFIXED_SELECTOR_PSEUDO_CLASSES = %w(nth-child nth-last-child).to_set
 
       def pseudo
         s = tok(/::?/)
@@ -362,7 +361,6 @@ MESSAGE
       end
 
       @sass_script_parser = Class.new(Sass::Script::CssParser)
-      @sass_script_parser.send(:include, ScriptParser)
     end
   end
 end

data/lib/sass/selector/pseudo.rb

@@ -9,7 +9,7 @@ module Sass
       # selectors.
       #
       # @return [Set<String>]
-      ACTUALLY_ELEMENTS = %w[after before first-line first-letter].to_set
+      ACTUALLY_ELEMENTS = %w(after before first-line first-letter).to_set
 
       # Like \{#type}, but returns the type of selector this looks like, rather
       # than the type it is semantically. This only differs from type for

data/lib/sass/selector/sequence.rb

@@ -395,10 +395,10 @@ module Sass
                 ([merged, '+'] if merged)
               ].compact
             end
-          elsif op1 == '>' && %w[~ +].include?(op2)
+          elsif op1 == '>' && %w(~ +).include?(op2)
             res.unshift sel2, op2
             seq1.push sel1, op1
-          elsif op2 == '>' && %w[~ +].include?(op1)
+          elsif op2 == '>' && %w(~ +).include?(op1)
             res.unshift sel1, op1
             seq2.push sel2, op2
           elsif op1 == op2

data/lib/sass/selector/simple_sequence.rb

@@ -88,7 +88,7 @@ module Sass
       def resolve_parent_refs(super_cseq)
         resolved_members = @members.map do |sel|
           next sel unless sel.is_a?(Pseudo) && sel.selector
-          sel.with_selector(sel.selector.resolve_parent_refs(super_cseq, !:implicit_parent))
+          sel.with_selector(sel.selector.resolve_parent_refs(super_cseq, false))
         end.flatten
 
         # Parent selector only appears as the first selector in the sequence
@@ -161,7 +161,7 @@ module Sass
         members = self.members.map do |sel|
           next sel unless sel.is_a?(Pseudo) && sel.selector
           next sel if seen.include?([sel])
-          extended = sel.selector.do_extend(extends, parent_directives, replace, seen, !:original)
+          extended = sel.selector.do_extend(extends, parent_directives, replace, seen, false)
           next sel if extended == sel.selector
           extended.members.reject! {|seq| seq.has_placeholder?}
 
@@ -204,7 +204,7 @@ module Sass
         groups.map! do |sels, seq|
           next [] if seen.include?(sels)
           seq.do_extend(
-            extends, parent_directives, !:replace, seen_with_pseudo_selectors + [sels], !:original)
+            extends, parent_directives, false, seen_with_pseudo_selectors + [sels], false)
         end
         groups.flatten!
 
@@ -260,7 +260,7 @@ module Sass
 
         # Some psuedo-selectors can be subselectors of non-pseudo selectors.
         # Pull those out here so we can efficiently check against them below.
-        their_subselector_pseudos = %w[matches any nth-child nth-last-child].
+        their_subselector_pseudos = %w(matches any nth-child nth-last-child).
           map {|name| their_spcs[name] || []}.flatten
 
         # If `self`'s non-pseudo simple selectors aren't a subset of `their_sseq`'s,

data/lib/sass/stack.rb

@@ -101,8 +101,8 @@ module Sass
     def to_s
       Sass::Util.enum_with_index(Sass::Util.enum_cons(frames.reverse + [nil], 2)).
           map do |(frame, caller), i|
-        "#{i == 0 ? "on" : "from"} line #{frame.line}" +
-          " of #{frame.filename || "an unknown file"}" +
+        "#{i == 0 ? 'on' : 'from'} line #{frame.line}" +
+          " of #{frame.filename || 'an unknown file'}" +
           (caller && caller.name ? ", in `#{caller.name}'" : "")
       end.join("\n")
     end

data/lib/sass/tree/function_node.rb

@@ -36,7 +36,7 @@ module Sass
         @splat = splat
         super()
 
-        return unless %w[and or not].include?(name)
+        return unless %w(and or not).include?(name)
         raise Sass::SyntaxError.new("Invalid function name \"#{name}\".")
       end
     end

data/lib/sass/tree/node.rb

@@ -90,6 +90,8 @@ module Sass
 
       def initialize
         @children = []
+        @filename = nil
+        @options = nil
       end
 
       # Sets the options hash for the node and all its children.