sass 3.1.0.alpha.221 → 3.1.0.alpha.246

data/lib/sass/script/list.rb

@@ -61,7 +61,6 @@ module Sass::Script
         value.map {|e| e.perform(environment)},
         separator)
       list.options = self.options
-      list.context = self.context
       list
     end
 

data/lib/sass/script/node.rb

@@ -8,18 +8,6 @@ module Sass::Script
     # @return [{Symbol => Object}]
     attr_reader :options
 
-    # The context in which this node was parsed,
-    # which determines how some operations are performed.
-    #
-    # Can be `:equals`, which means it's part of a `$var = val` or `prop = val` assignment,
-    # or `:default`, which means it's anywhere else
-    # (including `$var: val` and `prop: val` assignments,
-    # `#{}`-interpolations,
-    # and other script contexts such as `@if` conditions).
-    #
-    # @return [Symbol]
-    attr_reader :context
-
     # The line of the document on which this node appeared.
     #
     # @return [Fixnum]
@@ -41,21 +29,6 @@ module Sass::Script
       end
     end
 
-    # Sets the context for this node,
-    # as well as for all child nodes.
-    #
-    # @param context [Symbol]
-    # @see #context
-    def context=(context)
-      @context = context
-      children.each {|c| c.context = context}
-    end
-
-    # Creates a new script node.
-    def initialize
-      @context = :default
-    end
-
     # Evaluates the node.
     #
     # \{#perform} shouldn't be overridden directly;

data/lib/sass/script/number.rb

@@ -149,7 +149,7 @@ module Sass::Script
     def div(other)
       if other.is_a? Number
         res = operate(other, :/)
-        if self.original && other.original && context != :equals
+        if self.original && other.original
           res.original = "#{self.original}/#{other.original}"
         end
         res

data/lib/sass/script/operation.rb

@@ -66,11 +66,6 @@ module Sass::Script
       literal1 = @operand1.perform(environment)
       literal2 = @operand2.perform(environment)
 
-      if @operator == :space && context == :equals
-        literal1 = Sass::Script::String.new(literal1.value) if literal1.is_a?(Sass::Script::String)
-        literal2 = Sass::Script::String.new(literal2.value) if literal2.is_a?(Sass::Script::String)
-      end
-
       begin
         opts(literal1.send(@operator, literal2))
       rescue NoMethodError => e

data/lib/sass/script/parser.rb

@@ -316,15 +316,8 @@ RUBY
           offset = @lexer.offset + 1
           c = assert_tok(:const)
           var = Script::Variable.new(c.value)
-          if tok = (try_tok(:colon) || try_tok(:single_eq))
+          if tok = try_tok(:colon)
             val = assert_expr(:space)
-
-            if tok.type == :single_eq
-              val.context = :equals
-              val.options = @options
-              Script.equals_warning("mixin argument defaults", "$#{c.value}",
-                val.to_sass, false, line, offset, @options[:filename])
-            end
             must_have_default = true
           elsif must_have_default
             raise SyntaxError.new("Required argument #{var.inspect} must come before any optional arguments.")

data/lib/sass/script/string.rb

@@ -15,15 +15,6 @@ module Sass::Script
     # @return [Symbol] `:string` or `:identifier`
     attr_reader :type
 
-    # In addition to setting the \{#context} of the string,
-    # this sets the string to be an identifier if the context is `:equals`.
-    #
-    # @see Node#context=
-    def context=(context)
-      super
-      @type = :identifier if context == :equals
-    end
-
     # Creates a new string.
     #
     # @param value [String] See \{#value}
@@ -42,7 +33,7 @@ module Sass::Script
     # @see Node#to_s
     def to_s(opts = {})
       if @type == :identifier
-        return @context == :equals && @value.empty? ? %q{""} : @value.tr("\n", " ")
+        return @value.tr("\n", " ")
       end
 
       return "\"#{value.gsub('"', "\\\"")}\"" if opts[:quote] == %q{"}
@@ -54,13 +45,7 @@ module Sass::Script
 
     # @see Node#to_sass
     def to_sass(opts = {})
-      if self.type == :identifier && context == :equals &&
-          self.value !~ Sass::SCSS::RX::URI &&
-          Sass::SCSS::RX.escape_ident(self.value).include?(?\\)
-        return "unquote(#{Sass::Script::String.new(self.value, :string).to_sass})"
-      else
-        return to_s
-      end
+      to_s
     end
   end
 end

data/lib/sass/script/string_interpolation.rb

@@ -23,6 +23,7 @@ module Sass::Script
     # @see Node#to_sass
     def to_sass(opts = {})
       # We can get rid of all of this when we remove the deprecated :equals context
+      # XXX CE: It's gone now but I'm not sure what can be removed now.
       before_unquote, before_quote_char, before_str = parse_str(@before.to_sass(opts))
       after_unquote, after_quote_char, after_str = parse_str(@after.to_sass(opts))
       unquote = before_unquote || after_unquote ||

data/lib/sass/scss/parser.rb

@@ -638,9 +638,11 @@ MESSAGE
         tok!(/:/)
         space, value = value!
         ss
+        important = tok(IMPORTANT)
+        ss
         require_block = tok?(/\{/)
 
-        node = node(Sass::Tree::PropNode.new(name.flatten.compact, value, :new))
+        node = node(Sass::Tree::PropNode.new(name.flatten.compact, value, !!important, :new))
 
         return node unless require_block
         nested_properties! node, space

data/lib/sass/scss/rx.rb

@@ -68,6 +68,7 @@ module Sass
       URLCHAR  = /[#%&*-~]|#{NONASCII}|#{ESCAPE}/
       URL      = /(#{URLCHAR}*)/
       W        = /[ \t\r\n\f]*/
+      VARIABLE = /(\$)(#{Sass::SCSS::RX::IDENT})/
 
       # This is more liberal than the spec's definition,
       # but that definition didn't work well with the greediness rules
@@ -118,7 +119,7 @@ module Sass
       # We could use it for 1.9 only, but I don't want to introduce a cross-version
       # behavior difference.
       # In any case, almost all CSS idents will be matched by this.
-      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|\s(?!%)|#[a-f0-9]|[,%]|#{NUM}|\!important)+(?=[;}])/i
+      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|\s(?!%)|#[a-f0-9]|[,%]|#{NUM})+(?=[;}])/i
 
       STATIC_SELECTOR = /(#{NMCHAR}|\s|[,>+*]|[:#.]#{NMSTART})+(?=[{])/i
     end

data/lib/sass/scss/script_lexer.rb

@@ -8,7 +8,7 @@ module Sass
 
       def variable
         return [:raw, "!important"] if scan(Sass::SCSS::RX::IMPORTANT)
-        _variable(/(\$)(#{Sass::SCSS::RX::IDENT})/)
+        _variable(Sass::SCSS::RX::VARIABLE)
       end
     end
   end

data/lib/sass/tree/comment_node.rb

@@ -10,6 +10,14 @@ module Sass::Tree
     # @return [String]
     attr_accessor :value
 
+    # Whether the comment is loud.
+    #
+    # Loud comments start with ! and force the comment to be generated
+    # irrespective of compilation settings or the comment syntax used.
+    #
+    # @return [Boolean]
+    attr_accessor :loud
+
     # Whether or not the comment is silent (that is, doesn't output to CSS).
     #
     # @return [Boolean]
@@ -19,8 +27,10 @@ module Sass::Tree
     # @param silent [Boolean] See \{#silent}
     def initialize(value, silent)
       @lines = []
-      @value = normalize_indentation value
       @silent = silent
+      @value = normalize_indentation value
+      @loud = @value =~ %r{^(/[\/\*])?!}
+      @value.sub!("#{$1}!", $1.to_s) if @loud
       super()
     end
 
@@ -36,9 +46,20 @@ module Sass::Tree
     # Returns `true` if this is a silent comment
     # or the current style doesn't render comments.
     #
+    # Comments starting with ! are never invisible (and the ! is removed from the output.)
+    #
     # @return [Boolean]
     def invisible?
-      style == :compressed || @silent
+      if @loud
+        return false
+      else
+        @silent || (style == :compressed)
+      end
+    end
+
+    # Returns whether this comment should be interpolated for dynamic comment generation.
+    def evaluated?
+      @loud
     end
 
     private

data/lib/sass/tree/mixin_node.rb

@@ -19,13 +19,6 @@ module Sass::Tree
     # @return [{String => Script::Node}]
     attr_reader :keywords
 
-    # @see Node#options=
-    def options=(opts)
-      super
-      @args.each {|a| a.context = :equals} if opts[:sass2]
-      @keywords.each {|k, v| v.context = :equals} if opts[:sass2]
-    end
-
     # @param name [String] The name of the mixin
     # @param args [Array<Script::Node>] See \{#args}
     # @param keywords [{String => Script::Node}] See \{#keywords}

data/lib/sass/tree/prop_node.rb

@@ -23,6 +23,11 @@ module Sass::Tree
     # @return [Sass::Script::Node]
     attr_accessor :value
 
+    # Whether the property was marked as !important.
+    #
+    # @return [Boolean]
+    attr_accessor :important
+
     # The value of the property
     # after any interpolated SassScript has been resolved.
     # Only set once \{Tree::Visitors::Perform} has been run.
@@ -44,14 +49,16 @@ module Sass::Tree
 
     # @param name [Array<String, Sass::Script::Node>] See \{#name}
     # @param value [Sass::Script::Node] See \{#value}
+    # @param important [Boolean] whether this is an !important property
     # @param prop_syntax [Symbol] `:new` if this property uses `a: b`-style syntax,
     #   `:old` if it uses `:a b`-style syntax
-    def initialize(name, value, prop_syntax)
+    def initialize(name, value, important, prop_syntax)
       @name = Sass::Util.strip_string_array(
         Sass::Util.merge_adjacent_strings(name))
       @value = value
       @tabs = 0
       @prop_syntax = prop_syntax
+      @important = important
       super()
     end
 
@@ -89,7 +96,7 @@ module Sass::Tree
       old = opts[:old] && fmt == :sass
       initial = old ? ':' : ''
       mid = old ? '' : ':'
-      "#{initial}#{name}#{mid} #{self.class.val_to_sass(value, opts)}".rstrip
+      "#{initial}#{name}#{mid} #{self.class.val_to_sass(value, opts)}#{' !important' if important}".rstrip
     end
 
     private
@@ -136,7 +143,7 @@ module Sass::Tree
         unless node.is_a?(Sass::Script::Operation) && node.operator == :div &&
             node.operand1.is_a?(Sass::Script::Number) &&
             node.operand2.is_a?(Sass::Script::Number) &&
-            (node.context == :equals || !node.operand1.original || !node.operand2.original)
+            (!node.operand1.original || !node.operand2.original)
           return node
         end
 

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

@@ -17,11 +17,11 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     raise e
   end
 
+  PARENT_CLASSES = [ Sass::Tree::EachNode,   Sass::Tree::ForNode,   Sass::Tree::IfNode,
+                     Sass::Tree::ImportNode, Sass::Tree::MixinNode, Sass::Tree::WhileNode]
   def visit_children(parent)
     old_parent = @parent
-    @parent = parent unless is_any_of?(parent, 
-      Sass::Tree::EachNode, Sass::Tree::ForNode, Sass::Tree::IfNode,
-      Sass::Tree::ImportNode, Sass::Tree::MixinNode, Sass::Tree::WhileNode)
+    @parent = parent unless is_any_of?(parent, PARENT_CLASSES)
     old_real_parent, @real_parent = @real_parent, parent
     super
   ensure
@@ -48,8 +48,9 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     "@charset may only be used at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
+  INVALID_EXTEND_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::MixinDefNode]
   def invalid_extend_parent?(parent, child)
-    unless is_any_of?(parent, Sass::Tree::RuleNode, Sass::Tree::MixinDefNode)
+    unless is_any_of?(parent, INVALID_EXTEND_PARENTS)
       "Extend directives may only be used within rules."
     end
   end
@@ -58,18 +59,23 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     "Functions may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
+  INVALID_FUNCTION_CHILDREN = [
+    Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::EachNode,
+    Sass::Tree::ForNode,      Sass::Tree::IfNode,    Sass::Tree::ReturnNode,
+    Sass::Tree::VariableNode, Sass::Tree::WarnNode,  Sass::Tree::WhileNode
+  ]
   def invalid_function_child?(parent, child)
-    unless is_any_of?(child,
-        Sass::Tree::CommentNode, Sass::Tree::DebugNode, Sass::Tree::EachNode,
-        Sass::Tree::ForNode, Sass::Tree::IfNode, Sass::Tree::ReturnNode,
-        Sass::Tree::VariableNode, Sass::Tree::WarnNode, Sass::Tree::WhileNode)
+    unless is_any_of?(child, INVALID_FUNCTION_CHILDREN)
       "Functions can only contain variable declarations and control directives."
     end
   end
 
+  INVALID_IMPORT_PARENTS = [
+    Sass::Tree::IfNode,   Sass::Tree::ForNode, Sass::Tree::WhileNode,
+    Sass::Tree::EachNode, Sass::Tree::MixinDefNode
+  ]
   def invalid_import_parent?(parent, child)
-    if is_any_of?(@real_parent, Sass::Tree::IfNode, Sass::Tree::ForNode, Sass::Tree::WhileNode,
-        Sass::Tree::EachNode, Sass::Tree::MixinDefNode)
+    if is_any_of?(@real_parent, INVALID_IMPORT_PARENTS)
       return "Import directives may not be used within control directives or mixins."
     end
     return if parent.is_a?(Sass::Tree::RootNode)
@@ -92,16 +98,17 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     "Mixins may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
+  INVALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode]
   def invalid_prop_child?(parent, child)
-    unless is_any_of?(child, Sass::Tree::CommentNode, Sass::Tree::PropNode)
+    unless is_any_of?(child, INVALID_PROP_CHILDREN)
       "Illegal nesting: Only properties may be nested beneath properties."
     end
   end
 
+  INVALID_PROP_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::PropNode,
+                          Sass::Tree::MixinDefNode, Sass::Tree::DirectiveNode]
   def invalid_prop_parent?(parent, child)
-    unless is_any_of?(parent,
-        Sass::Tree::RuleNode, Sass::Tree::PropNode,
-        Sass::Tree::MixinDefNode, Sass::Tree::DirectiveNode)
+    unless is_any_of?(parent, INVALID_PROP_PARENTS)
       "Properties are only allowed within rules, directives, or other properties." + child.pseudo_class_selector_message
     end
   end
@@ -112,8 +119,11 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
 
   private
 
-  def is_any_of?(val, *classes)
-    classes.any? {|c| val.is_a?(c)}
+  def is_any_of?(val, classes)
+    for c in classes
+      return true if val.is_a?(c)
+    end
+    return false
   end
 
   def try_send(method, *args, &block)

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

@@ -49,7 +49,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_comment(node)
-    if @format == :sass
+    content = if @format == :sass
       content = node.value.gsub(/\*\/$/, '').rstrip
       if content =~ /\A[ \t]/
         # Re-indent SCSS comments like this:
@@ -79,12 +79,21 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
       content.rstrip + "\n"
     else
       spaces = ('  ' * [@tabs - node.value[/^ */].size, 0].max)
-      if node.silent
+      content = if node.silent
         node.value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
       else
         node.value
       end.gsub(/^/, spaces) + "\n"
+      content
+    end
+    if node.loud
+      if node.silent
+        content.gsub!(%r{^\s*(//!?)}, '//!')
+      else
+        content.sub!(%r{^\s*(/\*)}, '/*!')
+      end
     end
+    content
   end
 
   def visit_debug(node)

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

@@ -52,7 +52,14 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   # Removes this node from the tree if it's a silent comment.
   def visit_comment(node)
-    node.silent ? [] : node
+    return [] if node.invisible?
+    if node.evaluated?
+      node.value.gsub!(/(^|[^\\])\#\{([^}]*)\}/) do |md|
+        $1+Sass::Script.parse($2, node.line, 0, node.options).perform(@environment).to_s
+      end
+      node.value = run_interp([Sass::Script::String.new(node.value)])
+    end
+    node
   end
 
   # Prints the expression to STDERR.
@@ -184,11 +191,7 @@ END
         elsif kv = passed_keywords[var.underscored_name]
           kv.perform(env)
         elsif default
-          val = default.perform(env)
-          if default.context == :equals && val.is_a?(Sass::Script::String)
-            val = Sass::Script::String.new(val.value)
-          end
-          val
+          default.perform(env)
         end)
       raise Sass::SyntaxError.new("Mixin #{node.name} is missing parameter #{var.inspect}.") unless env.var(var.name)
       env
@@ -210,12 +213,7 @@ END
   def visit_prop(node)
     node.resolved_name = run_interp(node.name)
     val = node.value.perform(@environment)
-    node.resolved_value =
-      if node.value.context == :equals && val.is_a?(Sass::Script::String)
-        val.value
-      else
-        val.to_s
-      end
+    node.resolved_value = val.to_s
     yield
   end
 
@@ -236,7 +234,6 @@ END
   def visit_variable(node)
     return [] if node.guarded && !@environment.var(node.name).nil?
     val = node.expr.perform(@environment)
-    val = Sass::Script::String.new(val.value) if node.expr.context == :equals && val.is_a?(Sass::Script::String)
     @environment.set_var(node.name, val)
     []
   end