sass 3.3.0.alpha.247 → 3.3.0.alpha.252

data/REVISION

@@ -1 +1 @@
-1ce6d0118a8ddca0abb5ee27560d3e4982bdfcaa
+9490465245da8b2913346590c6f0974d1ad039cf

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.247
+3.3.0.alpha.252

data/VERSION_DATE

@@ -1 +1 @@
-07 September 2013 00:37:00 GMT
+12 September 2013 19:42:11 GMT

data/lib/sass/engine.rb

@@ -29,6 +29,7 @@ require 'sass/tree/debug_node'
 require 'sass/tree/warn_node'
 require 'sass/tree/import_node'
 require 'sass/tree/charset_node'
+require 'sass/tree/at_root_node'
 require 'sass/tree/visitors/base'
 require 'sass/tree/visitors/perform'
 require 'sass/tree/visitors/cssize'
@@ -761,109 +762,133 @@ WARNING
       end
     end
 
+    DIRECTIVES = Set[:mixin, :include, :function, :return, :debug, :warn, :for,
+      :each, :while, :if, :else, :extend, :import, :media, :charset, :content,
+      :at_root]
+
     def parse_directive(parent, line, root)
       directive, whitespace, value = line.text[1..-1].split(/(\s+)/, 2)
       offset = directive.size + whitespace.size + 1 if whitespace
 
-      # If value begins with url( or ",
-      # it's a CSS @import rule and we don't want to touch it.
-      case directive
-      when 'import'
-        parse_import(line, value, offset)
-      when 'mixin'
-        parse_mixin_definition(line)
-      when 'content'
-        parse_content_directive(line)
-      when 'include'
-        parse_mixin_include(line, root)
-      when 'function'
-        parse_function(line, root)
-      when 'for'
-        parse_for(line, root, value)
-      when 'each'
-        parse_each(line, root, value)
-      when 'else'
-        parse_else(parent, line, value)
-      when 'while'
-        raise SyntaxError.new("Invalid while directive '@while': expected expression.") unless value
-        Tree::WhileNode.new(parse_script(value, :offset => offset))
-      when 'if'
-        raise SyntaxError.new("Invalid if directive '@if': expected expression.") unless value
-        Tree::IfNode.new(parse_script(value, :offset => offset))
-      when 'debug'
-        raise SyntaxError.new("Invalid debug directive '@debug': expected expression.") unless value
-        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath debug directives.",
-          :line => @line + 1) unless line.children.empty?
-        offset = line.offset + line.text.index(value).to_i
-        Tree::DebugNode.new(parse_script(value, :offset => offset))
-      when 'extend'
-        raise SyntaxError.new("Invalid extend directive '@extend': expected expression.") unless value
-        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath extend directives.",
-          :line => @line + 1) unless line.children.empty?
-        optional = !!value.gsub!(/\s+#{Sass::SCSS::RX::OPTIONAL}$/, '')
-        offset = line.offset + line.text.index(value).to_i
-        interp_parsed = parse_interp(value, offset)
-        selector_range = Sass::Source::Range.new(
-          Sass::Source::Position.new(@line, to_parser_offset(offset)),
-          Sass::Source::Position.new(@line, to_parser_offset(line.offset) + line.text.length),
-          @options[:filename], @options[:importer]
-        )
-        Tree::ExtendNode.new(interp_parsed, optional, selector_range)
-      when 'warn'
-        raise SyntaxError.new("Invalid warn directive '@warn': expected expression.") unless value
-        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath warn directives.",
-          :line => @line + 1) unless line.children.empty?
-        offset = line.offset + line.text.index(value).to_i
-        Tree::WarnNode.new(parse_script(value, :offset => offset))
-      when 'return'
-        raise SyntaxError.new("Invalid @return: expected expression.") unless value
-        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath return directives.",
-          :line => @line + 1) unless line.children.empty?
-        offset = line.offset + line.text.index(value).to_i
-        Tree::ReturnNode.new(parse_script(value, :offset => offset))
-      when 'charset'
-        name = value && value[/\A(["'])(.*)\1\Z/, 2] #"
-        raise SyntaxError.new("Invalid charset directive '@charset': expected string.") unless name
-        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath charset directives.",
-          :line => @line + 1) unless line.children.empty?
-        Tree::CharsetNode.new(name)
-      when 'media'
-        parser = Sass::SCSS::Parser.new(value,
-          @options[:filename], @options[:importer],
-          @line, to_parser_offset(@offset))
-        # -1 includes the '@' into the range.
-        offset = line.offset + line.text.index(directive).to_i - 1
-        parsed_media_query_list = parser.parse_media_query_list.to_a
-        node = Tree::MediaNode.new(parsed_media_query_list)
-        node.source_range = Sass::Source::Range.new(
-          Sass::Source::Position.new(@line, to_parser_offset(offset)),
-          Sass::Source::Position.new(@line, to_parser_offset(line.offset) + line.text.length),
-          @options[:filename], @options[:importer])
-        node
-      else
-        unprefixed_directive = directive.gsub(/^-[a-z0-9]+-/i, '')
-        if unprefixed_directive == 'supports'
-          parser = Sass::SCSS::Parser.new(value, @options[:filename], @line)
-          return Tree::SupportsNode.new(directive, parser.parse_supports_condition)
-        end
+      directive_name = directive.gsub('-', '_').to_sym
+      if DIRECTIVES.include?(directive_name)
+        return send("parse_#{directive_name}_directive", parent, line, root, value, offset)
+      end
 
-        Tree::DirectiveNode.new(
-          value.nil? ? ["@#{directive}"] : ["@#{directive} "] + parse_interp(value, offset))
+      unprefixed_directive = directive.gsub(/^-[a-z0-9]+-/i, '')
+      if unprefixed_directive == 'supports'
+        parser = Sass::SCSS::Parser.new(value, @options[:filename], @line)
+        return Tree::SupportsNode.new(directive, parser.parse_supports_condition)
       end
+
+      return Tree::DirectiveNode.new(
+        value.nil? ? ["@#{directive}"] : ["@#{directive} "] + parse_interp(value, offset))
+    end
+
+    def parse_while_directive(parent, line, root, value, offset)
+      raise SyntaxError.new("Invalid while directive '@while': expected expression.") unless value
+      Tree::WhileNode.new(parse_script(value, :offset => offset))
+    end
+
+    def parse_if_directive(parent, line, root, value, offset)
+      raise SyntaxError.new("Invalid if directive '@if': expected expression.") unless value
+      Tree::IfNode.new(parse_script(value, :offset => offset))
+    end
+
+    def parse_debug_directive(parent, line, root, value, offset)
+      raise SyntaxError.new("Invalid debug directive '@debug': expected expression.") unless value
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath debug directives.",
+        :line => @line + 1) unless line.children.empty?
+      offset = line.offset + line.text.index(value).to_i
+      Tree::DebugNode.new(parse_script(value, :offset => offset))
+    end
+
+    def parse_extend_directive(parent, line, root, value, offset)
+      raise SyntaxError.new("Invalid extend directive '@extend': expected expression.") unless value
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath extend directives.",
+        :line => @line + 1) unless line.children.empty?
+      optional = !!value.gsub!(/\s+#{Sass::SCSS::RX::OPTIONAL}$/, '')
+      offset = line.offset + line.text.index(value).to_i
+      interp_parsed = parse_interp(value, offset)
+      selector_range = Sass::Source::Range.new(
+        Sass::Source::Position.new(@line, to_parser_offset(offset)),
+        Sass::Source::Position.new(@line, to_parser_offset(line.offset) + line.text.length),
+        @options[:filename], @options[:importer]
+      )
+      Tree::ExtendNode.new(interp_parsed, optional, selector_range)
     end
 
-    def parse_for(line, root, text)
-      var, from_expr, to_name, to_expr = text.scan(/^([^\s]+)\s+from\s+(.+)\s+(to|through)\s+(.+)$/).first
+    def parse_warn_directive(parent, line, root, value, offset)
+      raise SyntaxError.new("Invalid warn directive '@warn': expected expression.") unless value
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath warn directives.",
+        :line => @line + 1) unless line.children.empty?
+      offset = line.offset + line.text.index(value).to_i
+      Tree::WarnNode.new(parse_script(value, :offset => offset))
+    end
+
+    def parse_return_directive(parent, line, root, value, offset)
+      raise SyntaxError.new("Invalid @return: expected expression.") unless value
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath return directives.",
+        :line => @line + 1) unless line.children.empty?
+      offset = line.offset + line.text.index(value).to_i
+      Tree::ReturnNode.new(parse_script(value, :offset => offset))
+    end
+
+    def parse_charset_directive(parent, line, root, value, offset)
+      name = value && value[/\A(["'])(.*)\1\Z/, 2] #"
+      raise SyntaxError.new("Invalid charset directive '@charset': expected string.") unless name
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath charset directives.",
+        :line => @line + 1) unless line.children.empty?
+      Tree::CharsetNode.new(name)
+    end
+
+    def parse_media_directive(parent, line, root, value, offset)
+      parser = Sass::SCSS::Parser.new(value,
+        @options[:filename], @options[:importer],
+        @line, to_parser_offset(@offset))
+      offset = line.offset + line.text.index('media').to_i - 1
+      parsed_media_query_list = parser.parse_media_query_list.to_a
+      node = Tree::MediaNode.new(parsed_media_query_list)
+      node.source_range = Sass::Source::Range.new(
+        Sass::Source::Position.new(@line, to_parser_offset(offset)),
+        Sass::Source::Position.new(@line, to_parser_offset(line.offset) + line.text.length),
+        @options[:filename], @options[:importer])
+      node
+    end
+
+    def parse_at_root_directive(parent, line, root, value, offset)
+      at_root_node = Sass::Tree::AtRootNode.new
+      return at_root_node unless value
+
+      parsed = parse_interp(value, offset)
+      selector_range = Sass::Source::Range.new(
+        Sass::Source::Position.new(@line, to_parser_offset(offset)),
+        Sass::Source::Position.new(@line, to_parser_offset(line.offset) + line.text.length),
+        @options[:filename], @options[:importer])
+      rule_node = Tree::RuleNode.new(parsed, full_line_range(line))
+
+      # The caller expects to automatically add children to the returned node
+      # and we want it to add children to the rule node instead, so we
+      # manually handle the wiring here and return nil so the caller doesn't
+      # duplicate our efforts.
+      append_children(rule_node, line.children, false)
+      at_root_node << rule_node
+      parent << at_root_node
+      nil
+    end
+
+    def parse_for_directive(parent, line, root, value, offset)
+      var, from_expr, to_name, to_expr = value.scan(/^([^\s]+)\s+from\s+(.+)\s+(to|through)\s+(.+)$/).first
 
       if var.nil? # scan failed, try to figure out why for error message
-        if text !~ /^[^\s]+/
+        if value !~ /^[^\s]+/
           expected = "variable name"
-        elsif text !~ /^[^\s]+\s+from\s+.+/
+        elsif value !~ /^[^\s]+\s+from\s+.+/
           expected = "'from <expr>'"
         else
           expected = "'to <expr>' or 'through <expr>'"
         end
-        raise SyntaxError.new("Invalid for directive '@for #{text}': expected #{expected}.")
+        raise SyntaxError.new("Invalid for directive '@for #{value}': expected #{expected}.")
       end
       raise SyntaxError.new("Invalid variable \"#{var}\".") unless var =~ Script::VALIDATE
 
@@ -873,16 +898,16 @@ WARNING
       Tree::ForNode.new(var, parsed_from, parsed_to, to_name == 'to')
     end
 
-    def parse_each(line, root, text)
-      vars, list_expr = text.scan(/^([^\s]+(?:\s*,\s*[^\s]+)*)\s+in\s+(.+)$/).first
+    def parse_each_directive(parent, line, root, value, offset)
+      vars, list_expr = value.scan(/^([^\s]+(?:\s*,\s*[^\s]+)*)\s+in\s+(.+)$/).first
 
       if vars.nil? # scan failed, try to figure out why for error message
-        if text !~ /^[^\s]+/
+        if value !~ /^[^\s]+/
           expected = "variable name"
-        elsif text !~ /^[^\s]+(?:\s*,\s*[^\s]+)*[^\s]+\s+from\s+.+/
+        elsif value !~ /^[^\s]+(?:\s*,\s*[^\s]+)*[^\s]+\s+from\s+.+/
           expected = "'in <expr>'"
         end
-        raise SyntaxError.new("Invalid each directive '@each #{text}': expected #{expected}.")
+        raise SyntaxError.new("Invalid each directive '@each #{value}': expected #{expected}.")
       end
 
       vars = vars.split(',').map do |var|
@@ -895,13 +920,13 @@ WARNING
       Tree::EachNode.new(vars, parsed_list)
     end
 
-    def parse_else(parent, line, text)
+    def parse_else_directive(parent, line, root, value, offset)
       previous = parent.children.last
       raise SyntaxError.new("@else must come after @if.") unless previous.is_a?(Tree::IfNode)
 
-      if text
-        if text !~ /^if\s+(.+)/
-          raise SyntaxError.new("Invalid else directive '@else #{text}': expected 'if <expr>'.")
+      if value
+        if value !~ /^if\s+(.+)/
+          raise SyntaxError.new("Invalid else directive '@else #{value}': expected 'if <expr>'.")
         end
         expr = parse_script($1, :offset => line.offset + line.text.index($1))
       end
@@ -912,7 +937,7 @@ WARNING
       nil
     end
 
-    def parse_import(line, value, offset)
+    def parse_import_directive(parent, line, root, value, offset)
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
         :line => @line + 1) unless line.children.empty?
 
@@ -1001,6 +1026,10 @@ WARNING
       node
     end
 
+    def parse_mixin_directive(parent, line, root, value, offset)
+      parse_mixin_definition(line)
+    end
+
     MIXIN_DEF_RE = /^(?:=|@mixin)\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
     def parse_mixin_definition(line)
       name, arg_string = line.text.scan(MIXIN_DEF_RE).first
@@ -1013,7 +1042,7 @@ WARNING
     end
 
     CONTENT_RE = /^@content\s*(.+)?$/
-    def parse_content_directive(line)
+    def parse_content_directive(parent, line, root, value, offset)
       trailing = line.text.scan(CONTENT_RE).first.first
       raise SyntaxError.new("Invalid content directive. Trailing characters found: \"#{trailing}\".") unless trailing.nil?
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath @content directives.",
@@ -1021,6 +1050,10 @@ WARNING
       Tree::ContentNode.new
     end
 
+    def parse_include_directive(parent, line, root, value, offset)
+      parse_mixin_include(line, root)
+    end
+
     MIXIN_INCLUDE_RE = /^(?:\+|@include)\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
     def parse_mixin_include(line, root)
       name, arg_string = line.text.scan(MIXIN_INCLUDE_RE).first
@@ -1033,7 +1066,7 @@ WARNING
     end
 
     FUNCTION_RE = /^@function\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
-    def parse_function(line, root)
+    def parse_function_directive(parent, line, root, value, offset)
       name, arg_string = line.text.scan(FUNCTION_RE).first
       raise SyntaxError.new("Invalid function definition \"#{line.text}\".") if name.nil?
 

data/lib/sass/environment.rb

@@ -21,6 +21,7 @@ module Sass
     attr_reader :options
     attr_writer :caller
     attr_writer :content
+    attr_writer :selector
 
     # @param options [{Symbol => Object}] The options hash. See
     #   {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
@@ -44,6 +45,21 @@ module Sass
       @content || (@parent && @parent.content)
     end
 
+    # The selector for the current CSS rule, or nil if there is no
+    # current CSS rule.
+    #
+    # @return [Selector::CommaSequence?] The current selector, with any
+    #   nesting fully resolved.
+    def selector
+      parent_selector = caller ? caller.selector : (@parent && @parent.selector)
+      return parent_selector unless @selector
+      return @selector.resolve_parent_refs(parent_selector) if parent_selector
+      return @selector
+    end
+
+    # The top-level Environment object.
+    #
+    # @return [Environment]
     def global_env
       @global_env ||= parent.nil? ? self : parent.global_env
     end

data/lib/sass/script/lexer.rb

@@ -95,6 +95,7 @@ module Sass
         :color => HEXCOLOR,
         :bool => /(true|false)\b/,
         :null => /null\b/,
+        :selector => /&/,
         :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|\Z)")})})},
         :op => %r{(#{Regexp.union(*OP_NAMES)})},
       }
@@ -241,8 +242,8 @@ module Sass
         end
 
         variable || string(:double, false) || string(:single, false) || number ||
-          color || bool || null || string(:uri, false) || raw(UNICODERANGE) ||
-          special_fun || special_val || ident_op || ident || op
+          color || bool || null || selector || string(:uri, false) ||
+          raw(UNICODERANGE) || special_fun || special_val || ident_op || ident || op
       end
 
       def variable
@@ -307,6 +308,14 @@ MESSAGE
         [:null, script_null]
       end
 
+      def selector
+        start_pos = source_position
+        return unless scan(REGULAR_EXPRESSIONS[:selector])
+        script_selector = Script::Tree::Selector.new
+        script_selector.source_range = range(start_pos)
+        [:selector, script_selector]
+      end
+
       def special_fun
         return unless str1 = scan(/((-[\w-]+-)?(calc|element)|expression|progid:[a-z\.]*)\(/i)
         str2, _ = Sass::Shared.balance(@scanner, ?(, ?), 1)

data/lib/sass/script/parser.rb

@@ -494,12 +494,17 @@ RUBY
       end
 
       def number
-        return literal unless tok = try_tok(:number)
+        return selector unless tok = try_tok(:number)
         num = tok.value
         num.original = num.to_s unless @in_parens
         literal_node(num, tok.source_range.start_pos)
       end
 
+      def selector
+        return literal unless tok = try_tok(:selector)
+        node(tok.value, tok.source_range.start_pos)
+      end
+
       def literal
         (t = try_tok(:color, :bool, :null)) && (return literal_node(t.value, t.source_range))
       end

data/lib/sass/script/tree.rb

@@ -13,3 +13,4 @@ require 'sass/script/tree/string_interpolation'
 require 'sass/script/tree/literal'
 require 'sass/script/tree/list_literal'
 require 'sass/script/tree/map_literal'
+require 'sass/script/tree/selector'

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

@@ -102,7 +102,7 @@ module Sass::Script::Tree
       splat = @splat.perform(environment) if @splat
       if fn = environment.function(@name)
         keywords = Sass::Util.map_hash(@keywords) {|k, v| [k, v.perform(environment)]}
-        return perform_sass_fn(fn, args, keywords, splat)
+        return perform_sass_fn(fn, args, keywords, splat, environment)
       end
 
       ruby_name = @name.tr('-', '_')
@@ -232,8 +232,10 @@ module Sass::Script::Tree
       args
     end
 
-    def perform_sass_fn(function, args, keywords, splat)
+    def perform_sass_fn(function, args, keywords, splat, environment)
       Sass::Tree::Visitors::Perform.perform_arguments(function, args, keywords, splat) do |env|
+        env.caller = Sass::Environment.new(environment)
+
         val = catch :_sass_return do
           function.tree.each {|c| Sass::Tree::Visitors::Perform.visit(c, env)}
           raise Sass::SyntaxError.new("Function #{@name} finished without @return")

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

@@ -0,0 +1,29 @@
+module Sass::Script::Tree
+  # A SassScript node that will resolve to the current selector.
+  class Selector < Node
+    def initialize; end
+
+    def children
+      []
+    end
+
+    def to_sass(opts = {})
+      '&'
+    end
+
+    def deep_copy
+      self.dup
+    end
+
+    protected
+
+    def _perform(environment)
+      return opts(Sass::Script::Value::Null.new) unless selector = environment.selector
+      opts(Sass::Script::Value::List.new(selector.members.map do |seq|
+        Sass::Script::Value::List.new(seq.members.map do |component|
+          Sass::Script::Value::String.new(component.to_s)
+        end, :space)
+      end, :comma))
+    end
+  end
+end

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

@@ -28,10 +28,5 @@ module Sass::Script::Value
       @keywords_accessed = true
       @keywords
     end
-
-    # @see Base#children
-    def children
-      super + @keywords.values
-    end
   end
 end

data/lib/sass/scss/parser.rb

@@ -154,7 +154,7 @@ module Sass
 
       DIRECTIVES = Set[:mixin, :include, :function, :return, :debug, :warn, :for,
         :each, :while, :if, :else, :extend, :import, :media, :charset, :content,
-        :_moz_document]
+        :_moz_document, :at_root]
 
       PREFIXED_DIRECTIVES = Set[:supports]
 
@@ -471,6 +471,13 @@ module Sass
         val
       end
 
+      def at_root_directive(start_pos)
+        at_root_node = node(Sass::Tree::AtRootNode.new, start_pos)
+        return block(at_root_node, :stylesheet) unless rule_node = ruleset
+        at_root_node << rule_node
+        return at_root_node
+      end
+
       # http://www.w3.org/TR/css3-conditional/
       def supports_directive(name, start_pos)
         condition = expr!(:supports_condition)

data/lib/sass/tree/at_root_node.rb

@@ -0,0 +1,15 @@
+module Sass
+  module Tree
+    # A dynamic node representing an `@at-root` directive.
+    #
+    # An `@at-root` directive with a selector is converted to an \{AtRootNode}
+    # containing a \{RuleNode} at parse time.
+    #
+    # @see Sass::Tree
+    class AtRootNode < Node
+      def bubbles?
+        true
+      end
+    end
+  end
+end

data/lib/sass/tree/visitors/convert.rb

@@ -256,6 +256,15 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
     "#{tab_str}@while #{node.expr.to_sass(@options)}#{yield}"
   end
 
+  def visit_atroot(node)
+    if node.children.length == 1 && node.children.first.is_a?(Sass::Tree::RuleNode)
+      rule = node.children.first
+      "#{tab_str}@at-root #{selector_to_src(rule.rule)}#{visit_children(rule)}"
+    else
+      "#{tab_str}@at-root#{yield}"
+    end
+  end
+
   private
 
   def interp_to_src(interp)

data/lib/sass/tree/visitors/cssize.rb

@@ -214,6 +214,10 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
     rules
   end
 
+  def visit_atroot(node)
+    yield.children
+  end
+
   private
 
   def bubble(node)

data/lib/sass/tree/visitors/perform.rb

@@ -322,7 +322,11 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       node.filename, node.options[:importer], node.line)
     node.parsed_rules ||= parser.parse_selector
     node.stack_trace = @environment.stack.to_s if node.options[:trace_selectors]
-    yield
+    with_environment Sass::Environment.new(@environment, node.options) do
+      @environment.selector = node.parsed_rules
+      node.children = node.children.map {|c| visit(c)}.flatten
+    end
+    node
   end
 
   # Loads the new variable value into the environment.

data/lib/sass/tree/visitors/to_css.rb

@@ -116,7 +116,12 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     node.children.each do |child|
       next if child.invisible?
       visit(child)
-      output "\n" unless node.style == :compressed
+      unless node.style == :compressed
+        output "\n"
+        if child.is_a?(Sass::Tree::DirectiveNode) && child.has_children && !child.bubbles?
+          output "\n"
+        end
+      end
     end
     rstrip!
     return "" if @result.empty?
@@ -210,18 +215,19 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       end
     end
     rstrip!
-    output(if node.style == :compressed
-             "}"
-           else
-             (node.style == :expanded ? "\n" : " ") + "}\n"
-           end)
+    if node.style == :expanded
+      output("\n#{tab_str}")
+    elsif node.style != :compressed
+      output(" ")
+    end
+    output("}")
   ensure
     @in_directive = was_in_directive
   end
 
   def visit_media(node)
     with_tabs(@tabs + node.tabs) {visit_directive(node)}
-    erase! 1 unless node.style == :compressed || node.group_end || @result[-1] != ?\n
+    output("\n") if node.group_end
   end
 
   def visit_supports(node)

data/test/sass/conversion_test.rb

@@ -1648,6 +1648,42 @@ SASS
 SCSS
   end
 
+  def test_at_root
+    assert_scss_to_sass <<SASS, <<SCSS
+.foo
+  @at-root
+    .bar
+      a: b
+    .baz
+      c: d
+SASS
+.foo {
+  @at-root {
+    .bar {
+      a: b;
+    }
+    .baz {
+      c: d;
+    }
+  }
+}
+SCSS
+  end
+
+  def test_at_root_with_selector
+    assert_scss_to_sass <<SASS, <<SCSS
+.foo
+  @at-root .bar
+    a: b
+SASS
+.foo {
+  @at-root .bar {
+    a: b;
+  }
+}
+SCSS
+  end
+
   ## Regression Tests
 
   def test_list_in_args

data/test/sass/engine_test.rb

@@ -2453,6 +2453,29 @@ $val: 20
 SASS
   end
 
+  def test_at_root
+    assert_equal <<CSS, render(<<SASS)
+.bar {
+  a: b; }
+CSS
+.foo
+  @at-root
+    .bar
+      a: b
+SASS
+  end
+
+  def test_at_root_with_selector
+    assert_equal <<CSS, render(<<SASS)
+.bar {
+  a: b; }
+CSS
+.foo
+  @at-root .bar
+    a: b
+SASS
+  end
+
   # Regression tests
 
   def test_list_separator_with_arg_list

data/test/sass/script_conversion_test.rb

@@ -99,6 +99,10 @@ class SassScriptConversionTest < Test::Unit::TestCase
     assert_renders "(foo: (bar, baz), bip: bop)"
   end
 
+  def test_selector
+    assert_renders "&"
+  end
+
   def self.test_precedence(outer, inner)
     op_outer = Sass::Script::Lexer::OPERATORS_REVERSE[outer]
     op_inner = Sass::Script::Lexer::OPERATORS_REVERSE[inner]

data/test/sass/script_test.rb

@@ -552,6 +552,27 @@ SASS
     assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Value::Bool.new(true)))
   end
 
+  def test_selector
+    env = Sass::Environment.new
+    assert_equal "true", resolve("& == null", {}, env)
+
+    env.selector = selector('.foo.bar .baz.bang, .bip.bop')
+    assert_equal ".foo.bar .baz.bang, .bip.bop", resolve("&", {}, env)
+    assert_equal ".foo.bar .baz.bang", resolve("nth(&, 1)", {}, env)
+    assert_equal ".bip.bop", resolve("nth(&, 2)", {}, env)
+    assert_equal ".foo.bar", resolve("nth(nth(&, 1), 1)", {}, env)
+    assert_equal ".baz.bang", resolve("nth(nth(&, 1), 2)", {}, env)
+    assert_equal ".bip.bop", resolve("nth(nth(&, 2), 1)", {}, env)
+    assert_equal "string", resolve("type-of(nth(nth(&, 1), 1))", {}, env)
+
+    env.selector = selector('.foo > .bar')
+    assert_equal ".foo > .bar", resolve("&", {}, env)
+    assert_equal ".foo > .bar", resolve("nth(&, 1)", {}, env)
+    assert_equal ".foo", resolve("nth(nth(&, 1), 1)", {}, env)
+    assert_equal ">", resolve("nth(nth(&, 1), 2)", {}, env)
+    assert_equal ".bar", resolve("nth(nth(&, 1), 3)", {}, env)
+  end
+
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name
@@ -645,6 +666,12 @@ SASS
     env
   end
 
+  def selector(str)
+    parser = Sass::SCSS::StaticParser.new(
+      str, filename_for_test, Sass::Importers::Filesystem.new('.'))
+    parser.parse_selector
+  end
+
   def test_number_printing
     assert_equal "1", eval("1")
     assert_equal "1", eval("1.0")

data/test/sass/scss/scss_test.rb

@@ -1526,6 +1526,251 @@ baz {b: foo()}
 SCSS
   end
 
+  ## @at-root
+
+  def test_simple_at_root
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  a: b; }
+CSS
+.foo {
+  @at-root {
+    .bar {a: b}
+  }
+}
+SCSS
+  end
+
+  def test_at_root_with_selector
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  a: b; }
+CSS
+.foo {
+  @at-root .bar {a: b}
+}
+SCSS
+  end
+
+  def test_at_root_in_mixin
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  a: b; }
+CSS
+@mixin bar {
+  @at-root .bar {a: b}
+}
+
+.foo {
+  @include bar;
+}
+SCSS
+  end
+
+  def test_at_root_in_media
+    assert_equal <<CSS, render(<<SCSS)
+@media screen {
+  .bar {
+    a: b; } }
+CSS
+@media screen {
+  .foo {
+    @at-root .bar {a: b}
+  }
+}
+SCSS
+  end
+
+  def test_at_root_in_bubbled_media
+    assert_equal <<CSS, render(<<SCSS)
+@media screen {
+  .bar {
+    a: b; } }
+CSS
+.foo {
+  @media screen {
+    @at-root .bar {a: b}
+  }
+}
+SCSS
+  end
+
+  def test_at_root_in_unknown_directive
+    assert_equal <<CSS, render(<<SCSS)
+@fblthp {
+  .bar {
+    a: b; } }
+CSS
+@fblthp {
+  .foo {
+    @at-root .bar {a: b}
+  }
+}
+SCSS
+  end
+
+  def test_at_root_in_nested_unknown_directive
+    assert_equal <<CSS, render(<<SCSS)
+.foo {
+  @fblthp {
+    .bar {
+      a: b; } } }
+CSS
+.foo {
+  @fblthp {
+    @at-root .bar {a: b}
+  }
+}
+SCSS
+  end
+
+  ## Selector Script
+
+  def test_selector_script
+    assert_equal(<<CSS, render(<<SCSS))
+.foo .bar {
+  content: ".foo .bar"; }
+CSS
+.foo .bar {
+  content: "\#{&}";
+}
+SCSS
+  end
+
+  def test_nested_selector_script
+    assert_equal(<<CSS, render(<<SCSS))
+.foo .bar {
+  content: ".foo .bar"; }
+CSS
+.foo {
+  .bar {
+    content: "\#{&}";
+  }
+}
+SCSS
+  end
+
+  def test_nested_selector_script_with_outer_comma_selector
+    assert_equal(<<CSS, render(<<SCSS))
+.foo .baz, .bar .baz {
+  content: ".foo .baz, .bar .baz"; }
+CSS
+.foo, .bar {
+  .baz {
+    content: "\#{&}";
+  }
+}
+SCSS
+  end
+
+  def test_nested_selector_script_with_inner_comma_selector
+    assert_equal(<<CSS, render(<<SCSS))
+.foo .bar, .foo .baz {
+  content: ".foo .bar, .foo .baz"; }
+CSS
+.foo {
+  .bar, .baz {
+    content: "\#{&}";
+  }
+}
+SCSS
+  end
+
+  def test_selector_script_through_mixin
+    assert_equal(<<CSS, render(<<SCSS))
+.foo {
+  content: ".foo"; }
+CSS
+@mixin mixin {
+  content: "\#{&}";
+}
+
+.foo {
+  @include mixin;
+}
+SCSS
+  end
+
+  def test_selector_script_through_content
+    assert_equal(<<CSS, render(<<SCSS))
+.foo {
+  content: ".foo"; }
+CSS
+@mixin mixin {
+  @content;
+}
+
+.foo {
+  @include mixin {
+    content: "\#{&}";
+  }
+}
+SCSS
+  end
+
+  def test_selector_script_through_function
+    assert_equal(<<CSS, render(<<SCSS))
+.foo {
+  content: ".foo"; }
+CSS
+@function fn() {
+  @return "\#{&}";
+}
+
+.foo {
+  content: fn();
+}
+SCSS
+  end
+
+  def test_selector_script_through_media
+    assert_equal(<<CSS, render(<<SCSS))
+.foo {
+  content: "outer"; }
+  @media screen {
+    .foo .bar {
+      content: ".foo .bar"; } }
+CSS
+.foo {
+  content: "outer";
+  @media screen {
+    .bar {
+      content: "\#{&}";
+    }
+  }
+}
+SCSS
+  end
+
+  def test_selector_script_save_and_reuse
+    assert_equal(<<CSS, render(<<SCSS))
+.bar {
+  content: ".foo"; }
+CSS
+$var: null;
+.foo {
+  $var: &;
+}
+
+.bar {
+  content: "\#{$var}";
+}
+SCSS
+  end
+
+  def test_selector_script_with_at_root
+    assert_equal(<<CSS, render(<<SCSS))
+.foo-bar {
+  a: b; }
+CSS
+.foo {
+  @at-root \#{&}-bar {
+    a: b;
+  }
+}
+SCSS
+  end
+
   ## Errors
 
   def test_nested_mixin_def_is_scoped
@@ -1736,6 +1981,57 @@ SCSS
 
   # Regression
 
+  def test_nested_unknown_directive
+    assert_equal(<<CSS, render(<<SCSS, :style => :nested))
+.foo {
+  @fblthp {
+    .bar {
+      a: b; } } }
+CSS
+.foo {
+  @fblthp {
+    .bar {a: b}
+  }
+}
+SCSS
+
+    assert_equal(<<CSS, render(<<SCSS, :style => :compressed))
+.foo{@fblthp{.bar{a:b}}}
+CSS
+.foo {
+  @fblthp {
+    .bar {a: b}
+  }
+}
+SCSS
+
+    assert_equal(<<CSS, render(<<SCSS, :style => :compact))
+.foo { @fblthp { .bar { a: b; } } }
+CSS
+.foo {
+  @fblthp {
+    .bar {a: b}
+  }
+}
+SCSS
+
+    assert_equal(<<CSS, render(<<SCSS, :style => :expanded))
+.foo {
+  @fblthp {
+    .bar {
+      a: b;
+    }
+  }
+}
+CSS
+.foo {
+  @fblthp {
+    .bar {a: b}
+  }
+}
+SCSS
+  end
+
   def test_loud_comment_in_compressed_mode
     assert_equal(<<CSS, render(<<SCSS))
 /*! foo */

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302819
+  hash: 592302837
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 247
-  version: 3.3.0.alpha.247
+  - 252
+  version: 3.3.0.alpha.252
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-06 00:00:00 -04:00
+date: 2013-09-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,6 +129,7 @@ files:
 - lib/sass/script/tree/map_literal.rb
 - lib/sass/script/tree/node.rb
 - lib/sass/script/tree/operation.rb
+- lib/sass/script/tree/selector.rb
 - lib/sass/script/tree/string_interpolation.rb
 - lib/sass/script/tree/unary_operation.rb
 - lib/sass/script/tree/variable.rb
@@ -158,18 +159,18 @@ files:
 - lib/sass/shared.rb
 - lib/sass/supports.rb
 - lib/sass/version.rb
-- lib/sass/tree/charset_node.rb
 - lib/sass/tree/comment_node.rb
+- lib/sass/tree/charset_node.rb
+- lib/sass/tree/debug_node.rb
 - lib/sass/tree/content_node.rb
 - lib/sass/tree/css_import_node.rb
-- lib/sass/tree/debug_node.rb
 - lib/sass/tree/directive_node.rb
 - lib/sass/tree/each_node.rb
 - lib/sass/tree/extend_node.rb
 - lib/sass/tree/for_node.rb
 - lib/sass/tree/function_node.rb
-- lib/sass/tree/if_node.rb
 - lib/sass/tree/import_node.rb
+- lib/sass/tree/if_node.rb
 - lib/sass/tree/media_node.rb
 - lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/mixin_node.rb
@@ -178,9 +179,10 @@ files:
 - lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/rule_node.rb
-- lib/sass/tree/supports_node.rb
 - lib/sass/tree/trace_node.rb
+- lib/sass/tree/supports_node.rb
 - lib/sass/tree/variable_node.rb
+- lib/sass/tree/warn_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
 - lib/sass/tree/visitors/convert.rb
@@ -190,8 +192,8 @@ files:
 - lib/sass/tree/visitors/perform.rb
 - lib/sass/tree/visitors/set_options.rb
 - lib/sass/tree/visitors/to_css.rb
-- lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/tree/at_root_node.rb
 - lib/sass/source/map.rb
 - lib/sass/source/position.rb
 - lib/sass/source/range.rb