sass 3.4.0 → 3.4.25

data/lib/sass/engine.rb

@@ -1,6 +1,7 @@
 require 'set'
 require 'digest/sha1'
 require 'sass/cache_stores'
+require 'sass/deprecation'
 require 'sass/source/position'
 require 'sass/source/range'
 require 'sass/source/map'
@@ -84,23 +85,25 @@ module Sass
   # This class handles the parsing and compilation of the Sass template.
   # Example usage:
   #
-  #     template = File.load('stylesheets/sassy.sass')
+  #     template = File.read('stylesheets/sassy.sass')
   #     sass_engine = Sass::Engine.new(template)
   #     output = sass_engine.render
   #     puts output
   class Engine
+    @@old_property_deprecation = Deprecation.new
+
     # A line of Sass code.
     #
     # `text`: `String`
     # : The text in the line, without any whitespace at the beginning or end.
     #
-    # `tabs`: `Fixnum`
+    # `tabs`: `Integer`
     # : The level of indentation of the line.
     #
-    # `index`: `Fixnum`
+    # `index`: `Integer`
     # : The line number in the original document.
     #
-    # `offset`: `Fixnum`
+    # `offset`: `Integer`
     # : The number of bytes in on the line that the text begins.
     #   This ends up being the number of bytes of leading whitespace.
     #
@@ -157,7 +160,7 @@ module Sass
     # @api public
     DEFAULT_OPTIONS = {
       :style => :nested,
-      :load_paths => ['.'],
+      :load_paths => [],
       :cache => true,
       :cache_location => './.sass-cache',
       :syntax => :sass,
@@ -168,11 +171,11 @@ module Sass
     # default values and resolving aliases.
     #
     # @param options [{Symbol => Object}] The options hash;
-    #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
+    #   see {file:SASS_REFERENCE.md#Options the Sass options documentation}
     # @return [{Symbol => Object}] The normalized options hash.
     # @private
     def self.normalize_options(options)
-      options = DEFAULT_OPTIONS.merge(options.reject {|k, v| v.nil?})
+      options = DEFAULT_OPTIONS.merge(options.reject {|_k, v| v.nil?})
 
       # If the `:filename` option is passed in without an importer,
       # assume it's using the default filesystem importer.
@@ -192,6 +195,16 @@ module Sass
         options[:filesystem_importer].new(p.to_s)
       end
 
+      # Remove any deprecated importers if the location is imported explicitly
+      options[:load_paths].reject! do |importer|
+        importer.is_a?(Sass::Importers::DeprecatedPath) &&
+          options[:load_paths].find do |other_importer|
+            other_importer.is_a?(Sass::Importers::Filesystem) &&
+              other_importer != importer &&
+              other_importer.root == importer.root
+          end
+      end
+
       # Backwards compatibility
       options[:property_syntax] ||= options[:attribute_syntax]
       case options[:property_syntax]
@@ -212,14 +225,14 @@ module Sass
     #
     # @param filename [String] The path to the Sass or SCSS file
     # @param options [{Symbol => Object}] The options hash;
-    #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @return [Sass::Engine] The Engine for the given Sass or SCSS file.
     # @raise [Sass::SyntaxError] if there's an error in the document.
     def self.for_file(filename, options)
       had_syntax = options[:syntax]
 
       if had_syntax
-        # Use what was explicitly specificed
+        # Use what was explicitly specified
       elsif filename =~ /\.scss$/
         options.merge!(:syntax => :scss)
       elsif filename =~ /\.sass$/
@@ -230,7 +243,7 @@ module Sass
     end
 
     # The options for the Sass engine.
-    # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     #
     # @return [{Symbol => Object}]
     attr_reader :options
@@ -247,14 +260,17 @@ module Sass
     #   that can be converted to Unicode.
     #   If the template contains an `@charset` declaration,
     #   that overrides the Ruby encoding
-    #   (see {file:SASS_REFERENCE.md#encodings the encoding documentation})
+    #   (see {file:SASS_REFERENCE.md#Encodings the encoding documentation})
     # @param options [{Symbol => Object}] An options hash.
-    #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @see {Sass::Engine.for_file}
     # @see {Sass::Plugin}
     def initialize(template, options = {})
       @options = self.class.normalize_options(options)
       @template = template
+      @checked_encoding = false
+      @filename = nil
+      @line = nil
     end
 
     # Render the template to CSS.
@@ -466,7 +482,7 @@ ERR
 
         line_tabs = line_tab_str.scan(tab_str).size
         if tab_str * line_tabs != line_tab_str
-          message = <<END.strip.gsub("\n", ' ')
+          message = <<END.strip.tr("\n", ' ')
 Inconsistent indentation: #{Sass::Shared.human_indentation line_tab_str, true} used for indentation,
 but the rest of the document was indented using #{Sass::Shared.human_indentation tab_str}.
 END
@@ -479,15 +495,13 @@ END
     end
 
     # @comment
-    #   rubocop:disable ParameterLists
     def try_comment(line, last, tab_str, comment_tab_str, index)
-      # rubocop:enable ParameterLists
       return unless last && last.comment?
       # Nested comment stuff must be at least one whitespace char deeper
       # than the normal indentation
       return unless line =~ /^#{tab_str}\s/
       unless line =~ /^(?:#{comment_tab_str})(.*)$/
-        raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), :line => index)
+        raise SyntaxError.new(<<MSG.strip.tr("\n", " "), :line => index)
 Inconsistent indentation:
 previous line was indented by #{Sass::Shared.human_indentation comment_tab_str},
 but this line was indented by #{Sass::Shared.human_indentation line[/^\s*/]}.
@@ -564,8 +578,8 @@ MSG
           if continued_comment &&
               child.line == continued_comment.line +
               continued_comment.lines + 1
-            continued_comment.value.last.sub!(/ \*\/\Z/, '')
-            child.value.first.gsub!(/\A\/\*/, ' *')
+            continued_comment.value.last.sub!(%r{ \*/\Z}, '')
+            child.value.first.gsub!(%r{\A/\*}, ' *')
             continued_comment.value += ["\n"] + child.value
             next
           end
@@ -614,6 +628,11 @@ WARNING
           raise SyntaxError.new("Invalid property: \"#{line.text}\".",
             :line => @line) if name.nil? || value.nil?
 
+          @@old_property_deprecation.warn(@options[:filename], @line, <<WARNING)
+Old-style properties like "#{line.text}" are deprecated and will be an error in future versions of Sass.
+Use "#{name}: #{value}" instead.
+WARNING
+
           value_start_offset = name_end_offset = name_start_offset + name.length
           unless value.empty?
             # +1 and -1 both compensate for the leading ':', which is part of line.text
@@ -707,9 +726,12 @@ WARNING
         expr = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))
         end_offset = start_offset
       else
-        expr = parse_script(value, :offset => to_parser_offset(start_offset))
+        expr = parse_script(value,
+          :offset => to_parser_offset(start_offset),
+          :css_variable => name.start_with?("--"))
         end_offset = expr.source_range.end_pos.offset - 1
       end
+
       node = Tree::PropNode.new(parse_interp(name), expr, prop)
       node.value_source_range = Sass::Source::Range.new(
         Sass::Source::Position.new(line.index, to_parser_offset(start_offset)),
@@ -766,7 +788,19 @@ WARNING
                else
                  :normal
                end
-        Tree::CommentNode.new(value, type)
+        comment = Tree::CommentNode.new(value, type)
+        comment.line = line.index
+        text = line.text.rstrip
+        if text.include?("\n")
+          end_offset = text.length - text.rindex("\n")
+        else
+          end_offset = to_parser_offset(line.offset + text.length)
+        end
+        comment.source_range = Sass::Source::Range.new(
+          Sass::Source::Position.new(@line, to_parser_offset(line.offset)),
+          Sass::Source::Position.new(@line + text.count("\n"), end_offset),
+          @options[:filename])
+        comment
       else
         Tree::RuleNode.new(parse_interp(line.text), full_line_range(line))
       end
@@ -776,14 +810,12 @@ WARNING
       :each, :while, :if, :else, :extend, :import, :media, :charset, :content,
       :at_root, :error]
 
-    # @comment
-    #   rubocop:disable MethodLength
     def parse_directive(parent, line, root)
       directive, whitespace, value = line.text[1..-1].split(/(\s+)/, 2)
       raise SyntaxError.new("Invalid directive: '@'.") unless directive
       offset = directive.size + whitespace.size + 1 if whitespace
 
-      directive_name = directive.gsub('-', '_').to_sym
+      directive_name = directive.tr('-', '_').to_sym
       if DIRECTIVES.include?(directive_name)
         return send("parse_#{directive_name}_directive", parent, line, root, value, offset)
       end
@@ -838,8 +870,6 @@ WARNING
       )
       Tree::ExtendNode.new(interp_parsed, optional, selector_range)
     end
-    # @comment
-    #   rubocop:enable MethodLength
 
     def parse_warn_directive(parent, line, root, value, offset)
       raise SyntaxError.new("Invalid warn directive '@warn': expected expression.") unless value
@@ -1003,12 +1033,21 @@ WARNING
           end_pos = str.source_range.end_pos
           node = Tree::CssImportNode.new(str)
         else
-          media_parser = Sass::SCSS::Parser.new(scanner,
+          supports_parser = Sass::SCSS::Parser.new(scanner,
             @options[:filename], @options[:importer],
             @line, str.source_range.end_pos.offset)
-          media = media_parser.parse_media_query_list
-          end_pos = Sass::Source::Position.new(@line, media_parser.offset + 1)
-          node = Tree::CssImportNode.new(str, media.to_a)
+          supports_condition = supports_parser.parse_supports_clause
+
+          if scanner.eos?
+            node = Tree::CssImportNode.new(str, [], supports_condition)
+          else
+            media_parser = Sass::SCSS::Parser.new(scanner,
+              @options[:filename], @options[:importer],
+              @line, str.source_range.end_pos.offset)
+            media = media_parser.parse_media_query_list
+            end_pos = Sass::Source::Position.new(@line, media_parser.offset + 1)
+            node = Tree::CssImportNode.new(str, media.to_a, supports_condition)
+          end
         end
 
         node.source_range = Sass::Source::Range.new(
@@ -1115,9 +1154,9 @@ WARNING
     end
 
     def parse_script(script, options = {})
-      line = options[:line] || @line
-      offset = options[:offset] || @offset + 1
-      Script.parse(script, line, offset, @options)
+      line = options.delete(:line) || @line
+      offset = options.delete(:offset) || @offset + 1
+      Script.parse(script, line, offset, @options.merge(options))
     end
 
     def format_comment_text(text, silent)
@@ -1129,9 +1168,10 @@ WARNING
       end
 
       return "/* */" if content.empty?
-      content.last.gsub!(/ ?\*\/ *$/, '')
+      content.last.gsub!(%r{ ?\*/ *$}, '')
+      first = content.shift unless removed_first
       content.map! {|l| l.gsub!(/^\*( ?)/, '\1') || (l.empty? ? "" : " ") + l}
-      content.first.gsub!(/^ /, '') unless removed_first
+      content.unshift first unless removed_first
       if silent
         "/*" + content.join("\n *") + " */"
       else
@@ -1169,10 +1209,15 @@ WARNING
           res << "\\" * (escapes - 1) << '#{'
         else
           res << "\\" * [0, escapes - 1].max
-          # Add 1 to emulate to_parser_offset.
-          res << Script::Parser.new(
-            scan, line, offset + scan.pos - scan.matched_size + 1, options).
-            parse_interpolated
+          if scan[1].include?("\n")
+            line += scan[1].count("\n")
+            offset = scan.matched_size - scan[1].rindex("\n")
+          else
+            offset += scan.matched_size
+          end
+          node = Script::Parser.new(scan, line, offset, options).parse_interpolated
+          offset = node.source_range.end_pos.offset
+          res << node
         end
       end
       res << rest

data/lib/sass/environment.rb

@@ -81,12 +81,19 @@ module Sass
     inherited_hash_reader :function
 
     # @param options [{Symbol => Object}] The options hash. See
-    #   {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #   {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @param parent [Environment] See \{#parent}
     def initialize(parent = nil, options = nil)
       @parent = parent
       @options = options || (parent && parent.options) || {}
-      @stack = Sass::Stack.new if @parent.nil?
+      @stack = @parent.nil? ? Sass::Stack.new : nil
+      @caller = nil
+      @content = nil
+      @filename = nil
+      @functions = nil
+      @mixins = nil
+      @selector = nil
+      @vars = nil
     end
 
     # Returns whether this is the global environment.
@@ -188,4 +195,21 @@ module Sass
       @content ||= env.is_a?(ReadOnlyEnvironment) ? env : ReadOnlyEnvironment.new(env, env.options)
     end
   end
+
+  # An environment that can write to in-scope global variables, but doesn't
+  # create new variables in the global scope. Useful for top-level control
+  # directives.
+  class SemiGlobalEnvironment < Environment
+    def try_set_var(name, value)
+      @vars ||= {}
+      if @vars.include?(name)
+        @vars[name] = value
+        true
+      elsif @parent
+        @parent.try_set_var(name, value)
+      else
+        false
+      end
+    end
+  end
 end

data/lib/sass/error.rb

@@ -69,14 +69,14 @@ module Sass
     # The name of the mixin in which the error occurred.
     # This could be `nil` if the error occurred outside a mixin.
     #
-    # @return [Fixnum]
+    # @return [String]
     def sass_mixin
       sass_backtrace.first[:mixin]
     end
 
     # The line of the Sass template on which the error occurred.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def sass_line
       sass_backtrace.first[:line]
     end
@@ -86,7 +86,7 @@ module Sass
     # @param attrs [{Symbol => Object}] The information in the backtrace entry.
     #   See \{#sass\_backtrace}
     def add_backtrace(attrs)
-      sass_backtrace << attrs.reject {|k, v| v.nil?}
+      sass_backtrace << attrs.reject {|_k, v| v.nil?}
     end
 
     # Modify the top Sass backtrace entries
@@ -104,12 +104,12 @@ module Sass
     # @param attrs [{Symbol => Object}] The information to add to the backtrace entry.
     #   See \{#sass\_backtrace}
     def modify_backtrace(attrs)
-      attrs = attrs.reject {|k, v| v.nil?}
+      attrs = attrs.reject {|_k, v| v.nil?}
       # Move backwards through the backtrace
-      (0...sass_backtrace.size).to_a.reverse.each do |i|
+      (0...sass_backtrace.size).to_a.reverse_each do |i|
         entry = sass_backtrace[i]
         sass_backtrace[i] = attrs.merge(entry)
-        attrs.reject! {|k, v| entry.include?(k)}
+        attrs.reject! {|k, _v| entry.include?(k)}
         break if attrs.empty?
       end
     end
@@ -127,7 +127,7 @@ module Sass
       return nil if super.nil?
       return super if sass_backtrace.all? {|h| h.empty?}
       sass_backtrace.map do |h|
-        "#{h[:filename] || "(sass)"}:#{h[:line]}" +
+        "#{h[:filename] || '(sass)'}:#{h[:line]}" +
           (h[:mixin] ? ":in `#{h[:mixin]}'" : "")
       end + super
     end
@@ -143,7 +143,7 @@ module Sass
         map {|l| "\n" + (" " * "Error: ".size) + l}.join
       "Error: #{msg}" +
         Sass::Util.enum_with_index(sass_backtrace).map do |entry, i|
-          "\n        #{i == 0 ? "on" : "from"} line #{entry[:line]}" +
+          "\n        #{i == 0 ? 'on' : 'from'} line #{entry[:line]}" +
             " of #{entry[:filename] || default_filename}" +
             (entry[:mixin] ? ", in `#{entry[:mixin]}'" : "")
         end.join
@@ -153,7 +153,7 @@ module Sass
       # Returns an error report for an exception in CSS format.
       #
       # @param e [Exception]
-      # @param line_offset [Fixnum] The number of the first line of the Sass template.
+      # @param line_offset [Integer] The number of the first line of the Sass template.
       # @return [String] The error report
       # @raise [Exception] `e`, if the
       #   {file:SASS_REFERENCE.md#full_exception-option `:full_exception`} option
@@ -163,9 +163,9 @@ module Sass
 
         <<END
 /*
-#{header.gsub("*/", "*\\/")}
+#{header.gsub('*/', '*\\/')}
 
-Backtrace:\n#{e.backtrace.join("\n").gsub("*/", "*\\/")}
+Backtrace:\n#{e.backtrace.join("\n").gsub('*/', '*\\/')}
 */
 body:before {
   white-space: pre;
@@ -183,7 +183,7 @@ END
 
         line_num = e.sass_line + 1 - line_offset
         min = [line_num - 6, 0].max
-        section = e.sass_template.rstrip.split("\n")[min ... line_num + 5]
+        section = e.sass_template.rstrip.split("\n")[min...line_num + 5]
         return e.sass_backtrace_str if section.nil? || section.empty?
 
         e.sass_backtrace_str + "\n\n" + Sass::Util.enum_with_index(section).

data/lib/sass/exec/base.rb

@@ -18,11 +18,23 @@ module Sass::Exec
       begin
         parse
       rescue Exception => e
+        # Exit code 65 indicates invalid data per
+        # http://www.freebsd.org/cgi/man.cgi?query=sysexits. Setting it via
+        # at_exit is a bit of a hack, but it allows us to rethrow when --trace
+        # is active and get both the built-in exception formatting and the
+        # correct exit code.
+        at_exit {exit Sass::Util.windows? ? 13 : 65} if e.is_a?(Sass::SyntaxError)
+
         raise e if @options[:trace] || e.is_a?(SystemExit)
 
-        $stderr.print "#{e.class}: " unless e.class == RuntimeError
-        $stderr.puts "#{e.message}"
+        if e.is_a?(Sass::SyntaxError)
+          $stderr.puts e.sass_backtrace_str("standard input")
+        else
+          $stderr.print "#{e.class}: " unless e.class == RuntimeError
+          $stderr.puts e.message.to_s
+        end
         $stderr.puts "  Use --trace for backtrace."
+
         exit 1
       end
       exit 0
@@ -137,7 +149,7 @@ module Sass::Exec
 
     # Wraps the given string in terminal escapes
     # causing it to have the given color.
-    # If terminal esapes aren't supported on this platform,
+    # If terminal escapes aren't supported on this platform,
     # just returns the string instead.
     #
     # @param color [Symbol] The name of the color to use.

data/lib/sass/exec/sass_convert.rb

@@ -108,10 +108,11 @@ END
         @options[:for_tree][:dasherize] = true
       end
 
-      opts.on('--indent NUM',
+      opts.on(
+        '--indent NUM',
         'How many spaces to use for each level of indentation. Defaults to 2.',
-        '"t" means use hard tabs.') do |indent|
-
+        '"t" means use hard tabs.'
+      ) do |indent|
         if indent == 't'
           @options[:for_tree][:indent] = "\t"
         else
@@ -156,13 +157,18 @@ 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
     end
 
     def process_directory
-      unless (input = @options[:input] = @args.shift)
+      @options[:input] = @args.shift
+      unless @options[:input]
         raise "Error: directory required when using --recursive."
       end
 
@@ -207,15 +213,15 @@ END
           puts_action :create, :green, output
         end
 
-        input = open_file(f)
-        process_file(input, output)
+        process_file(f, output)
       end
     end
 
     def process_file(input, output)
-      if input.is_a?(File)
+      input_path, output_path = path_for(input), path_for(output)
+      if input_path
         @options[:from] ||=
-          case input.path
+          case input_path
           when /\.scss$/; :scss
           when /\.sass$/; :sass
           when /\.less$/; raise "sass-convert no longer supports LessCSS."
@@ -225,9 +231,9 @@ END
         raise "Error: the --in-place option requires a filename."
       end
 
-      if output.is_a?(File)
+      if output_path
         @options[:to] ||=
-          case output.path
+          case output_path
           when /\.scss$/; :scss
           when /\.sass$/; :sass
           end
@@ -241,17 +247,17 @@ 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.is_a?(File)
-              Sass::Engine.for_file(input.path, @options[:for_engine])
+            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
 
-      output = input.path if @options[:in_place]
+      output = input_path if @options[:in_place]
       write_output(out, output)
     rescue Sass::SyntaxError => e
       raise e if @options[:trace]
@@ -260,5 +266,18 @@ END
     rescue LoadError => err
       handle_load_error(err)
     end
+
+    def path_for(file)
+      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

@@ -42,6 +42,7 @@ END
         if @args.size == 1
           @args = split_colon_path(@args.first)
         else
+          @fake_update = true
           @options[:update] = true
         end
       end
@@ -155,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
@@ -291,6 +292,16 @@ MSG
 
       dirs, files = @args.map {|name| split_colon_path(name)}.
         partition {|i, _| File.directory? i}
+
+      if @fake_update && !dirs.empty?
+        # Issue 1602.
+        Sass::Util.sass_warn <<WARNING.strip
+DEPRECATION WARNING: Compiling directories without --update or --watch is
+deprecated and won't work in future versions of Sass. Instead use:
+  #{@default_syntax} --update #{@args}
+WARNING
+      end
+
       files.map! do |from, to|
         to ||= from.gsub(/\.[^.]*?$/, '.css')
         sourcemap = Sass::Util.sourcemap_name(to) if @options[:sourcemap]
@@ -355,6 +366,11 @@ MSG
       input = @options[:input]
       output = @options[:output]
 
+      if input == $stdin
+        # See issue 1745
+        (@options[:for_engine][:load_paths] ||= []) << ::Sass::Importers::DeprecatedPath.new(".")
+      end
+
       @options[:for_engine][:syntax] ||= :scss if input.is_a?(File) && input.path =~ /\.scss$/
       @options[:for_engine][:syntax] ||= @default_syntax
       engine =
@@ -370,11 +386,12 @@ MSG
       input.close if input.is_a?(File)
 
       if @options[:sourcemap] != :none && @options[:sourcemap_filename]
-        relative_sourcemap_path = Sass::Util.pathname(@options[:sourcemap_filename]).
-          relative_path_from(Sass::Util.pathname(@options[:output_filename]).dirname)
+        relative_sourcemap_path = Sass::Util.relative_path_from(
+          @options[:sourcemap_filename], Sass::Util.pathname(@options[:output_filename]).dirname)
         rendered, mapping = engine.render_with_sourcemap(relative_sourcemap_path.to_s)
         write_output(rendered, output)
-        write_output(mapping.to_json(
+        write_output(
+          mapping.to_json(
             :type => @options[:sourcemap],
             :css_path => @options[:output_filename],
             :sourcemap_path => @options[:sourcemap_filename]) + "\n",
@@ -384,8 +401,7 @@ MSG
       end
     rescue Sass::SyntaxError => e
       write_output(Sass::SyntaxError.exception_to_css(e), output) if output.is_a?(String)
-      raise e if @options[:trace]
-      raise e.sass_backtrace_str("standard input")
+      raise e
     ensure
       output.close if output.is_a? File
     end
@@ -397,7 +413,7 @@ MSG
     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/base.rb

@@ -90,7 +90,7 @@ module Sass
       #
       # @param uri [String] The URI of the file to check.
       #   Comes from a `:filename` option set on an engine returned by this importer.
-      # @param options [{Symbol => Objet}] Options for the Sass file
+      # @param options [{Symbol => Object}] Options for the Sass file
       #   containing the `@import` currently being checked.
       # @return [Time, nil]
       def mtime(uri, options)