sass 3.4.21 → 3.4.22

data/lib/sass/exec/sass_convert.rb

@@ -157,6 +157,10 @@ END
         @options[:for_engine][:read_cache] = false
       end
 
+      opts.on('-q', '--quiet', 'Silence warnings and status messages during conversion.') do |bool|
+        @options[:for_engine][:quiet] = bool
+      end
+
       opts.on('--trace', :NONE, 'Show a full Ruby stack trace on error') do
         @options[:trace] = true
       end
@@ -243,12 +247,12 @@ END
         Sass::Util.silence_sass_warnings do
           if @options[:from] == :css
             require 'sass/css'
-            Sass::CSS.new(input.read, @options[:for_tree]).render(@options[:to])
+            Sass::CSS.new(read(input), @options[:for_tree]).render(@options[:to])
           else
             if input_path
               Sass::Engine.for_file(input_path, @options[:for_engine])
             else
-              Sass::Engine.new(input.read, @options[:for_engine])
+              Sass::Engine.new(read(input), @options[:for_engine])
             end.to_tree.send("to_#{@options[:to]}", @options[:for_tree])
           end
         end
@@ -267,5 +271,13 @@ END
       return file.path if file.is_a?(File)
       return file if file.is_a?(String)
     end
+
+    def read(file)
+      if file.respond_to?(:read)
+        file.read
+      else
+        open(file, 'rb') {|f| f.read}
+      end
+    end
   end
 end

data/lib/sass/exec/sass_scss.rb

@@ -156,7 +156,7 @@ END
           '  file: always absolute file URIs',
           '  inline: include the source text in the sourcemap',
           '  none: no sourcemaps') do |type|
-        if type && !%w[auto file inline none].include?(type)
+        if type && !%w(auto file inline none).include?(type)
           $stderr.puts "Unknown sourcemap type #{type}.\n\n"
           $stderr.puts opts
           exit
@@ -290,29 +290,6 @@ File #{@args[1]} #{err}.
 MSG
       end
 
-      # Watch the working directory for changes without adding it to the load
-      # path. This preserves the pre-3.4 behavior when the working directory was
-      # on the load path. We should remove this when we can look for directories
-      # to watch by traversing the import graph.
-      class << Sass::Plugin.compiler
-        # We have to use a class var to make this visible to #watched_file? and
-        # #watched_paths.
-        # rubocop:disable ClassVars
-        @@working_directory = Sass::Util.realpath('.').to_s
-        # rubocop:enable ClassVars
-
-        # rubocop:disable NestedMethodDefinition
-        def watched_file?(file)
-          super(file) ||
-            (file =~ /\.s[ac]ss$/ && file.start_with?(@@working_directory + File::SEPARATOR))
-        end
-
-        def watched_paths
-          @watched_paths ||= super + [@@working_directory]
-        end
-        # rubocop:enable NestedMethodDefinition
-      end
-
       dirs, files = @args.map {|name| split_colon_path(name)}.
         partition {|i, _| File.directory? i}
 
@@ -436,7 +413,7 @@ WARNING
     def split_colon_path(path)
       one, two = path.split(':', 2)
       if one && two && Sass::Util.windows? &&
-          one =~ /\A[A-Za-z]\Z/ && two =~ /\A[\/\\]/
+          one =~ /\A[A-Za-z]\Z/ && two =~ %r{\A[/\\]}
         # If we're on Windows and we were passed a drive letter path,
         # don't split on that colon.
         one2, two = two.split(':', 2)

data/lib/sass/features.rb

@@ -7,12 +7,12 @@ module Sass
     #
     # When this is updated, the documentation of `feature-exists()` should be
     # updated as well.
-    KNOWN_FEATURES = Set[*%w{
+    KNOWN_FEATURES = Set[*%w(
       global-variable-shadowing
       extend-selector-pseudoclass
       units-level-3
       at-error
-    }]
+    )]
 
     # Check if a feature exists by name. This is used to implement
     # the Sass function `feature-exists($feature)`

data/lib/sass/importers/filesystem.rb

@@ -122,7 +122,7 @@ module Sass
         end
 
         # JRuby chokes when trying to import files from JARs when the path starts with './'.
-        ret.map {|f, s| [f.sub(/^\.\//, ''), s]}
+        ret.map {|f, s| [f.sub(%r{^\./}, ''), s]}
       end
 
       def escape_glob_characters(name)
@@ -144,8 +144,11 @@ module Sass
         name = name.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
 
         found = possible_files(remove_root(name)).map do |f, s|
-          path = (dir == "." || Sass::Util.pathname(f).absolute?) ? f :
-            "#{escape_glob_characters(dir)}/#{f}"
+          path = if dir == "." || Sass::Util.pathname(f).absolute?
+                   f
+                 else
+                   "#{escape_glob_characters(dir)}/#{f}"
+                 end
           Dir[path].map do |full_path|
             full_path.gsub!(REDUNDANT_DIRECTORY, File::SEPARATOR)
             [Sass::Util.cleanpath(full_path).to_s, s]

data/lib/sass/plugin/compiler.rb

@@ -289,6 +289,7 @@ module Sass::Plugin
     # @option options [Boolean] :skip_initial_update
     #   Don't do an initial update when starting the watcher when true
     def watch(individual_files = [], options = {})
+      @inferred_directories = []
       options, individual_files = individual_files, [] if individual_files.is_a?(Hash)
       update_stylesheets(individual_files) unless options[:skip_initial_update]
 
@@ -296,8 +297,10 @@ module Sass::Plugin
       individual_files.each do |(source, _, _)|
         source = File.expand_path(source)
         @watched_files << Sass::Util.realpath(source).to_s
-        directories << File.dirname(source)
+        @inferred_directories << File.dirname(source)
       end
+
+      directories += @inferred_directories
       directories = remove_redundant_directories(directories)
 
       # A Listen version prior to 2.0 will write a test file to a directory to
@@ -454,11 +457,10 @@ module Sass::Plugin
           # And try to remove the css file that corresponds to it
           template_location_array.each do |(sass_dir, css_dir)|
             sass_dir = File.expand_path(sass_dir)
-            if child_of_directory?(sass_dir, f)
-              remainder = f[(sass_dir.size + 1)..-1]
-              try_delete_css(css_filename(remainder, css_dir))
-              break
-            end
+            next unless child_of_directory?(sass_dir, f)
+            remainder = f[(sass_dir.size + 1)..-1]
+            try_delete_css(css_filename(remainder, css_dir))
+            break
           end
         end
       end
@@ -531,7 +533,13 @@ module Sass::Plugin
     end
 
     def watched_file?(file)
-      @watched_files.include?(file) || normalized_load_paths.any? {|lp| lp.watched_file?(file)}
+      @watched_files.include?(file) ||
+        normalized_load_paths.any? {|lp| lp.watched_file?(file)} ||
+        @inferred_directories.any? {|d| sass_file_in_directory?(d, file)}
+    end
+
+    def sass_file_in_directory?(directory, filename)
+      filename =~ /\.s[ac]ss$/ && filename.start_with?(directory + File::SEPARATOR)
     end
 
     def watched_paths

data/lib/sass/script/css_variable_warning.rb

@@ -0,0 +1,52 @@
+module Sass
+  module Script
+    # An object tracking whether a warning has been emitted for a given script
+    # tree.
+    #
+    # This is shared among all objects in a script tree. Whenever any of those
+    # objects encounters a situation in which it wouldn't produce semantically
+    # identical CSS to its input, it calls \{#warn!\}. The first time \{#warn!}
+    # is called for a given warning object, it prints a deprecation warning.
+    class CssVariableWarning
+      def initialize
+        @warned = false
+        @value = nil
+      end
+
+      # Sets the root of the script tree that this warning refers to.
+      #
+      # @param value [Sass::Script::Tree::Node]
+      def value=(value)
+        warn_called = @warned && !@value
+        @value = value
+        print_warning if warn_called
+      end
+
+      # The first time this is called, it prints a deprecation warning.
+      #
+      # This may be called before \{#value=}. If it is, the warning is emitted
+      # once the script tree is set.
+      def warn!
+        return if @warned
+        @warned = true
+        return unless @value
+
+        print_warning
+      end
+
+      private
+
+      # Prints this node's warning.
+      def print_warning
+        of_filename = " of #{@value.filename}" if @value.filename
+        Sass::Util.sass_warn(
+          "DEPRECATION WARNING on line #{@value.line}#{of_filename}:\n" +
+          "Sass 3.6 will change the way CSS variables are parsed. Instead of being parsed as\n" +
+          "normal properties, they will not allow any Sass-specific behavior other than \#{}.\n" +
+          "For forwards-compatibility, use \#{}:\n" +
+          "\n" +
+          "  --variable: \#{#{@value.to_sass}};")
+      end
+    end
+  end
+end

data/lib/sass/script/functions.rb

@@ -901,7 +901,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
@@ -1913,7 +1913,7 @@ MESSAGE
     # @return [Sass::Script::Value::List]
     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
       sep = if separator.value == 'auto'
@@ -1949,7 +1949,7 @@ 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
       sep = if separator.value == 'auto'
@@ -2419,7 +2419,7 @@ MESSAGE
       end
 
       parsed = [parse_selector(selectors.first, :selectors)]
-      parsed += selectors[1..-1].map {|sel| parse_selector(sel, :selectors, !!:parse_parent_ref)}
+      parsed += selectors[1..-1].map {|sel| parse_selector(sel, :selectors, true)}
       parsed.inject {|result, child| child.resolve_parent_refs(result)}.to_sass_script
     end
     declare :selector_nest, [], :var_args => true
@@ -2551,7 +2551,7 @@ MESSAGE
       extends = Sass::Util::SubsetMap.new
       begin
         replacement.populate_extends(extends, original)
-        selector.do_extend(extends, [], !!:replace).to_sass_script
+        selector.do_extend(extends, [], true).to_sass_script
       rescue Sass::SyntaxError => e
         raise ArgumentError.new(e.to_s)
       end

data/lib/sass/script/lexer.rb

@@ -155,6 +155,8 @@ module Sass
         @options = options
         @interpolation_stack = []
         @prev = nil
+        @tok = nil
+        @next_tok = nil
       end
 
       # Moves the lexer forward one token.
@@ -417,7 +419,7 @@ MESSAGE
       end
 
       def special_val
-        return unless scan(/!important/i)
+        return unless scan(/!#{W}important/i)
         [:string, Script::Value::String.new("!important")]
       end
 

data/lib/sass/script/parser.rb

@@ -1,4 +1,5 @@
 require 'sass/script/lexer'
+require 'sass/script/css_variable_warning'
 
 module Sass
   module Script
@@ -24,11 +25,17 @@ module Sass
       #   Used for error reporting and sourcemap building
       # @param offset [Fixnum] The character (not byte) offset where the script starts in the line.
       #   Used for error reporting and sourcemap building
-      # @param options [{Symbol => Object}] An options hash;
-      #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
+      # @param options [{Symbol => Object}] An options hash; see
+      #   {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+      #   This supports an additional `:allow_extra_text` option that controls
+      #   whether the parser throws an error when extra text is encountered
+      #   after the parsed construct.
       def initialize(str, line, offset, options = {})
         @options = options
+        @allow_extra_text = options.delete(:allow_extra_text)
         @lexer = lexer_class.new(str, line, offset, options)
+        @stop_at = nil
+        @css_variable_warning = nil
       end
 
       # Parses a SassScript expression within an interpolated segment (`#{}`).
@@ -46,7 +53,7 @@ module Sass
         expr = assert_expr :expr
         assert_tok :end_interpolation
         expr = Sass::Script::Tree::Interpolation.new(
-          nil, expr, nil, !:wb, !:wa, :warn_for_color => warn_for_color)
+          nil, expr, nil, false, false, :warn_for_color => warn_for_color)
         check_for_interpolation expr
         expr.options = @options
         node(expr, start_pos)
@@ -57,13 +64,23 @@ module Sass
 
       # Parses a SassScript expression.
       #
+      # @param css_variable [Boolean] Whether this is the value of a CSS variable.
       # @return [Script::Tree::Node] The root node of the parse tree
       # @raise [Sass::SyntaxError] if the expression isn't valid SassScript
-      def parse
+      def parse(css_variable = false)
+        if css_variable
+          @css_variable_warning = CssVariableWarning.new
+        end
+
         expr = assert_expr :expr
         assert_done
         expr.options = @options
         check_for_interpolation expr
+
+        if css_variable
+          @css_variable_warning.value = expr
+        end
+
         expr
       rescue Sass::SyntaxError => e
         e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
@@ -215,12 +232,12 @@ module Sass
 
       # Parses a SassScript expression.
       #
-      # @overload parse(str, line, offset, filename = nil)
       # @return [Script::Tree::Node] The root node of the parse tree
       # @see Parser#initialize
       # @see Parser#parse
-      def self.parse(*args)
-        new(*args).parse
+      def self.parse(value, line, offset, options = {})
+        css_variable = options.delete :css_variable
+        new(value, line, offset, options).parse(css_variable)
       end
 
       PRECEDENCE = [
@@ -233,6 +250,8 @@ module Sass
 
       ASSOCIATIVE = [:plus, :times]
 
+      VALID_CSS_OPS = [:comma, :single_eq, :space, :div]
+
       class << self
         # Returns an integer representing the precedence
         # of the given operator.
@@ -272,6 +291,10 @@ module Sass
                   return other_interp
                 end
 
+                if @css_variable_warning && !VALID_CSS_OPS.include?(tok.type)
+                  @css_variable_warning.warn!
+                end
+
                 e = node(Tree::Operation.new(e, assert_expr(#{sub.inspect}), tok.type),
                          e.source_range.start_pos)
               end
@@ -287,6 +310,8 @@ RUBY
               interp = try_op_before_interp(tok)
               return interp if interp
               start_pos = source_position
+
+              @css_variable_warning.warn! if @css_variable_warning
               node(Tree::UnaryOperation.new(assert_expr(:unary_#{op}), :#{op}), start_pos)
             end
 RUBY
@@ -313,6 +338,7 @@ RUBY
         return list e, start_pos unless @lexer.peek && @lexer.peek.type == :colon
 
         pair = map_pair(e)
+        @css_variable_warning.warn! if @css_variable_warning
         map = node(Sass::Script::Tree::MapLiteral.new([pair]), start_pos)
         while try_tok(:comma)
           pair = map_pair
@@ -373,7 +399,7 @@ RUBY
 
         interp = node(
           Script::Tree::Interpolation.new(
-            prev, str, nil, wb, !:wa, :originally_text => true, :deprecation => deprecation),
+            prev, str, nil, wb, false, :originally_text => true, :deprecation => deprecation),
           (prev || str).source_range.start_pos)
         interpolation(interp)
       end
@@ -399,7 +425,7 @@ RUBY
           end
         interp = node(
           Script::Tree::Interpolation.new(
-            prev, str, assert_expr(name), !:wb, wa,
+            prev, str, assert_expr(name), false, wa,
             :originally_text => true, :deprecation => deprecation),
           (prev || str).source_range.start_pos)
         interp
@@ -410,7 +436,7 @@ RUBY
         while (interp = try_tok(:begin_interpolation))
           wb = @lexer.whitespace?(interp)
           char_before = @lexer.char(interp.pos - 1)
-          mid = assert_expr :expr
+          mid = without_css_variable_warning {assert_expr :expr}
           assert_tok :end_interpolation
           wa = @lexer.whitespace?
           char_after = @lexer.char
@@ -599,11 +625,11 @@ RUBY
         return paren unless first
         str = literal_node(first.value, first.source_range)
         return str unless try_tok(:string_interpolation)
-        mid = assert_expr :expr
+        mid = without_css_variable_warning {assert_expr :expr}
         assert_tok :end_interpolation
         last = assert_expr(:special_fun)
         node(
-          Tree::Interpolation.new(str, mid, last, !:wb, !:wa),
+          Tree::Interpolation.new(str, mid, last, false, false),
           first.source_range.start_pos)
       end
 
@@ -614,6 +640,8 @@ RUBY
         e.force_division! if e
         end_pos = source_position
         assert_tok(:rparen)
+
+        @css_variable_warning.warn! if @css_variable_warning
         e || node(Sass::Script::Tree::ListLiteral.new([], nil), start_pos, end_pos)
       end
 
@@ -621,6 +649,8 @@ RUBY
         start_pos = source_position
         c = try_tok(:const)
         return string unless c
+
+        @css_variable_warning.warn! if @css_variable_warning
         node(Tree::Variable.new(*c.value), start_pos)
       end
 
@@ -629,7 +659,7 @@ RUBY
         return number unless first
         str = literal_node(first.value, first.source_range)
         return str unless try_tok(:string_interpolation)
-        mid = assert_expr :expr
+        mid = without_css_variable_warning {assert_expr :expr}
         assert_tok :end_interpolation
         last = assert_expr(:string)
         node(Tree::StringInterpolation.new(str, mid, last), first.source_range.start_pos)
@@ -647,6 +677,7 @@ RUBY
       def selector
         tok = try_tok(:selector)
         return literal unless tok
+        @css_variable_warning.warn! if @css_variable_warning
         node(tok.value, tok.source_range.start_pos)
       end
 
@@ -698,8 +729,14 @@ RUBY
       end
 
       def assert_done
-        return if @lexer.done?
-        @lexer.expected!(EXPR_NAMES[:default])
+        if @allow_extra_text
+          # If extra text is allowed, just rewind the lexer so that the
+          # StringScanner is pointing to the end of the parsed text.
+          @lexer.unpeek!
+        else
+          return if @lexer.done?
+          @lexer.expected!(EXPR_NAMES[:default])
+        end
       end
 
       # @overload node(value, source_range)
@@ -728,12 +765,27 @@ RUBY
             range(source_range_or_start_pos, end_pos)
           end
 
+        node.css_variable_warning = @css_variable_warning
         node.line = source_range.start_pos.line
         node.source_range = source_range
         node.filename = @options[:filename]
         node
       end
 
+      # Runs the given block without CSS variable warnings enabled.
+      #
+      # CSS warnings don't apply within interpolation, so this is used to
+      # disable them.
+      #
+      # @yield []
+      def without_css_variable_warning
+        old_css_variable_warning = @css_variable_warning
+        @css_variable_warning = nil
+        yield
+      ensure
+        @css_variable_warning = old_css_variable_warning
+      end
+
       # Checks a script node for any immediately-deprecated interpolations, and
       # emits warnings for them.
       #