sass 3.7.4 → 4.0.0.alpha.1

data/lib/sass/scss/rx.rb

@@ -32,7 +32,7 @@ module Sass
       # @return [String] The escaped character
       # @private
       def self.escape_char(c)
-        return "\\%06x" % c.ord unless c =~ %r{[ -/:-~]}
+        return "\\%06x" % Sass::Util.ord(c) unless c =~ /[ -\/:-~]/
         "\\#{c}"
       end
 
@@ -40,7 +40,7 @@ module Sass
       # escaping all significant characters.
       #
       # @param str [String] The text of the regexp
-      # @param flags [Integer] Flags for the created regular expression
+      # @param flags [Fixnum] Flags for the created regular expression
       # @return [Regexp]
       # @private
       def self.quote(str, flags = 0)
@@ -50,9 +50,15 @@ module Sass
       H        = /[0-9a-fA-F]/
       NL       = /\n|\r\n|\r|\f/
       UNICODE  = /\\#{H}{1,6}[ \t\r\n\f]?/
-      s = '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
+      s = if Sass::Util.ruby1_8?
+            '\200-\377'
+          elsif Sass::Util.macruby?
+            '\u0080-\uD7FF\uE000-\uFFFD\U00010000-\U0010FFFF'
+          else
+            '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
+          end
       NONASCII = /[#{s}]/
-      ESCAPE   = /#{UNICODE}|\\[^0-9a-fA-F\r\n\f]/
+      ESCAPE   = /#{UNICODE}|\\[ -~#{s}]/
       NMSTART  = /[_a-zA-Z]|#{NONASCII}|#{ESCAPE}/
       NMCHAR   = /[a-zA-Z0-9_-]|#{NONASCII}|#{ESCAPE}/
       STRING1  = /\"((?:[^\n\r\f\\"]|\\#{NL}|#{ESCAPE})*)\"/
@@ -60,6 +66,7 @@ module Sass
 
       IDENT    = /-*#{NMSTART}#{NMCHAR}*/
       NAME     = /#{NMCHAR}+/
+      NUM      = //
       STRING   = /#{STRING1}|#{STRING2}/
       URLCHAR  = /[#%&*-~]|#{NONASCII}|#{ESCAPE}/
       URL      = /(#{URLCHAR}*)/
@@ -92,7 +99,7 @@ module Sass
       # A unit is like an IDENT, but disallows a hyphen followed by a digit.
       # This allows "1px-2px" to be interpreted as subtraction rather than "1"
       # with the unit "px-2px". It also allows "%".
-      UNIT = /-?#{NMSTART}(?:[a-zA-Z0-9_]|#{NONASCII}|#{ESCAPE}|-(?!\.?\d))*|%/
+      UNIT = /-?#{NMSTART}(?:[a-zA-Z0-9_]|#{NONASCII}|#{ESCAPE}|-(?!\d))*|%/
 
       UNITLESS_NUMBER = /(?:[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?\d+)?/
       NUMBER = /#{UNITLESS_NUMBER}(?:#{UNIT})?/
@@ -121,13 +128,13 @@ module Sass
       OPTIONAL = /!#{W}optional/i
       IDENT_START = /-|#{NMSTART}/
 
-      IDENT_HYPHEN_INTERP = /-+(?=#\{)/
+      IDENT_HYPHEN_INTERP = /-(#\{)/
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|#{ESCAPE})*)\'/
       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
 
       STATIC_COMPONENT = /#{IDENT}|#{STRING_NOINTERP}|#{HEXCOLOR}|[+-]?#{NUMBER}|\!important/i
-      STATIC_VALUE = %r(#{STATIC_COMPONENT}(\s*[\s,\/]\s*#{STATIC_COMPONENT})*(?=[;}]))i
+      STATIC_VALUE = /#{STATIC_COMPONENT}(\s*[\s,\/]\s*#{STATIC_COMPONENT})*([;}])/i
       STATIC_SELECTOR = /(#{NMCHAR}|[ \t]|[,>+*]|[:#.]#{NMSTART}){1,50}([{])/i
     end
   end

data/lib/sass/scss/script_lexer.rb

@@ -0,0 +1,15 @@
+module Sass
+  module SCSS
+    # A mixin for subclasses of {Sass::Script::Lexer}
+    # that makes them usable by {SCSS::Parser} to parse SassScript.
+    # In particular, the lexer doesn't support `!` for a variable prefix.
+    module ScriptLexer
+      private
+
+      def variable
+        return [:raw, "!important"] if scan(Sass::SCSS::RX::IMPORTANT)
+        _variable(Sass::SCSS::RX::VARIABLE)
+      end
+    end
+  end
+end

data/lib/sass/scss/script_parser.rb

@@ -0,0 +1,25 @@
+module Sass
+  module SCSS
+    # A mixin for subclasses of {Sass::Script::Parser}
+    # that makes them usable by {SCSS::Parser} to parse SassScript.
+    # In particular, the parser won't raise an error
+    # when there's more content in the lexer once lexing is done.
+    # In addition, the parser doesn't support `!` for a variable prefix.
+    module ScriptParser
+      private
+
+      # @private
+      def lexer_class
+        klass = Class.new(super)
+        klass.send(:include, ScriptLexer)
+        klass
+      end
+
+      # Instead of raising an error when the parser is done,
+      # rewind the StringScanner so that it hasn't consumed the final token.
+      def assert_done
+        @lexer.unpeek!
+      end
+    end
+  end
+end

data/lib/sass/scss/static_parser.rb

@@ -51,7 +51,10 @@ module Sass
       # @see Parser#initialize
       # @param allow_parent_ref [Boolean] Whether to allow the
       #   parent-reference selector, `&`, when parsing the document.
+      # @comment
+      #   rubocop:disable ParameterLists
       def initialize(str, filename, importer, line = 1, offset = 1, allow_parent_ref = true)
+        # rubocop:enable ParameterLists
         super(str, filename, importer, line, offset)
         @allow_parent_ref = allow_parent_ref
       end
@@ -59,7 +62,7 @@ module Sass
       private
 
       def moz_document_function
-        val = tok(URI) || tok(URL_PREFIX) || tok(DOMAIN) || function(false)
+        val = tok(URI) || tok(URL_PREFIX) || tok(DOMAIN) || function(!:allow_var)
         return unless val
         ss
         [val]
@@ -71,11 +74,11 @@ module Sass
       def var_expr; nil; end
       def interp_string; (s = tok(STRING)) && [s]; end
       def interp_uri; (s = tok(URI)) && [s]; end
-      def interp_ident; (s = ident) && [s]; end
+      def interp_ident(ident = IDENT); (s = tok(ident)) && [s]; end
       def use_css_import?; true; end
 
       def special_directive(name, start_pos)
-        return unless %w(media import charset -moz-document).include?(name)
+        return unless %w[media import charset -moz-document].include?(name)
         super
       end
 
@@ -86,12 +89,13 @@ module Sass
         ws = ''
         while tok(/,/)
           ws << str {ss}
-          next unless (sel = selector)
-          selectors << sel
-          if ws.include?("\n")
-            selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members)
+          if (sel = selector)
+            selectors << sel
+            if ws.include?("\n")
+              selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members)
+            end
+            ws = ''
           end
-          ws = ''
         end
         Selector::CommaSequence.new(selectors)
       end
@@ -136,18 +140,11 @@ MESSAGE
       end
 
       def reference_combinator
-        return unless tok(%r{/})
+        return unless tok(/\//)
         res = '/'
         ns, name = expr!(:qualified_name)
         res << ns << '|' if ns
-        res << name << tok!(%r{/})
-
-        location = " of #{@filename}" if @filename
-        Sass::Util.sass_warn <<MESSAGE
-DEPRECATION WARNING on line #{@line}, column #{@offset}#{location}:
-The reference combinator #{res} is deprecated and will be removed in a future release.
-MESSAGE
-
+        res << name << tok!(/\//)
         res
       end
 
@@ -185,25 +182,25 @@ MESSAGE
 
       def parent_selector
         return unless @allow_parent_ref && tok(/&/)
-        Selector::Parent.new(name)
+        Selector::Parent.new(tok(NAME))
       end
 
       def class_selector
         return unless tok(/\./)
         @expected = "class name"
-        Selector::Class.new(ident!)
+        Selector::Class.new(tok!(IDENT))
       end
 
       def id_selector
         return unless tok(/#(?!\{)/)
         @expected = "id name"
-        Selector::Id.new(name!)
+        Selector::Id.new(tok!(NAME))
       end
 
       def placeholder_selector
         return unless tok(/%/)
         @expected = "placeholder name"
-        Selector::Placeholder.new(ident!)
+        Selector::Placeholder.new(tok!(IDENT))
       end
 
       def element_name
@@ -218,13 +215,13 @@ MESSAGE
       end
 
       def qualified_name(allow_star_name = false)
-        name = ident || tok(/\*/) || (tok?(/\|/) && "")
+        name = tok(IDENT) || tok(/\*/) || (tok?(/\|/) && "")
         return unless name
         return nil, name unless tok(/\|/)
 
-        return name, ident! unless allow_star_name
+        return name, tok!(IDENT) unless allow_star_name
         @expected = "identifier or *"
-        return name, ident || tok!(/\*/)
+        return name, tok(IDENT) || tok!(/\*/)
       end
 
       def attrib
@@ -242,21 +239,21 @@ MESSAGE
         if op
           @expected = "identifier or string"
           ss
-          val = ident || tok!(STRING)
+          val = tok(IDENT) || tok!(STRING)
           ss
         end
-        flags = ident || tok(STRING)
+        flags = tok(IDENT) || tok(STRING)
         tok!(/\]/)
 
         Selector::Attribute.new(name, ns, op, val, flags)
       end
 
       def attrib_name!
-        if (name_or_ns = ident)
+        if (name_or_ns = tok(IDENT))
           # E, E|E
           if tok(/\|(?!=)/)
             ns = name_or_ns
-            name = ident
+            name = tok(IDENT)
           else
             name = name_or_ns
           end
@@ -264,22 +261,20 @@ MESSAGE
           # *|E or |E
           ns = tok(/\*/) || ""
           tok!(/\|/)
-          name = ident!
+          name = tok!(IDENT)
         end
         return ns, name
       end
 
-      SELECTOR_PSEUDO_CLASSES = %w(not matches current any has host host-context).to_set
-
-      PREFIXED_SELECTOR_PSEUDO_CLASSES = %w(nth-child nth-last-child).to_set
+      SELECTOR_PSEUDO_CLASSES = %w[not matches current any has host host-context].to_set
 
-      SELECTOR_PSEUDO_ELEMENTS = %w(slotted).to_set
+      PREFIXED_SELECTOR_PSEUDO_CLASSES = %w[nth-child nth-last-child].to_set
 
       def pseudo
         s = tok(/::?/)
         return unless s
         @expected = "pseudoclass or pseudoelement"
-        name = ident!
+        name = tok!(IDENT)
         if tok(/\(/)
           ss
           deprefixed = deprefix(name)
@@ -287,10 +282,8 @@ MESSAGE
             sel = selector_comma_sequence
           elsif s == ':' && PREFIXED_SELECTOR_PSEUDO_CLASSES.include?(deprefixed)
             arg, sel = prefixed_selector_pseudo
-          elsif s == '::' && SELECTOR_PSEUDO_ELEMENTS.include?(deprefixed)
-            sel = selector_comma_sequence
           else
-            arg = expr!(:declaration_value).join
+            arg = expr!(:pseudo_args)
           end
 
           tok!(/\)/)
@@ -298,6 +291,29 @@ MESSAGE
         Selector::Pseudo.new(s == ':' ? :class : :element, name, arg, sel)
       end
 
+      def pseudo_args
+        arg = expr!(:pseudo_expr)
+        while tok(/,/)
+          arg << ',' << str {ss}
+          arg.concat expr!(:pseudo_expr)
+        end
+        arg
+      end
+
+      def pseudo_expr
+        res = pseudo_expr_token
+        return unless res
+        res << str {ss}
+        while (e = pseudo_expr_token)
+          res << e << str {ss}
+        end
+        res
+      end
+
+      def pseudo_expr_token
+        tok(PLUS) || tok(/[-*]/) || tok(NUMBER) || tok(STRING) || tok(IDENT)
+      end
+
       def prefixed_selector_pseudo
         prefix = str do
           expr = str {expr!(:a_n_plus_b)}
@@ -342,10 +358,11 @@ MESSAGE
       end
 
       def keyframes_selector_component
-        ident || tok(PERCENTAGE)
+        tok(IDENT) || tok(PERCENTAGE)
       end
 
       @sass_script_parser = Class.new(Sass::Script::CssParser)
+      @sass_script_parser.send(:include, ScriptParser)
     end
   end
 end

data/lib/sass/selector.rb

@@ -39,7 +39,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s(opts = {})
+      def to_s
         "&" + (@suffix || '')
       end
 
@@ -65,7 +65,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s(opts = {})
+      def to_s
         "." + @name
       end
 
@@ -92,7 +92,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s(opts = {})
+      def to_s
         "#" + @name
       end
 
@@ -127,7 +127,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s(opts = {})
+      def to_s
         "%" + @name
       end
 
@@ -151,7 +151,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s(opts = {})
+      def to_s
         @namespace ? "#{@namespace}|*" : "*"
       end
 
@@ -223,7 +223,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s(opts = {})
+      def to_s
         @namespace ? "#{@namespace}|#{@name}" : @name
       end
 
@@ -300,7 +300,10 @@ module Sass
       # @param operator [String] The matching operator, e.g. `"="` or `"^="`
       # @param value [String] See \{#value}
       # @param flags [String] See \{#flags}
+      # @comment
+      #   rubocop:disable ParameterLists
       def initialize(name, namespace, operator, value, flags)
+        # rubocop:enable ParameterLists
         @name = name
         @namespace = namespace
         @operator = operator
@@ -309,7 +312,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s(opts = {})
+      def to_s
         res = "["
         res << @namespace << "|" if @namespace
         res << @name

data/lib/sass/selector/abstract_sequence.rb

@@ -8,7 +8,7 @@ module Sass
     class AbstractSequence
       # The line of the Sass template on which this selector was declared.
       #
-      # @return [Integer]
+      # @return [Fixnum]
       attr_reader :line
 
       # The name of the file in which this selector was declared.
@@ -19,8 +19,8 @@ module Sass
       # Sets the line of the Sass template on which this selector was declared.
       # This also sets the line for all child selectors.
       #
-      # @param line [Integer]
-      # @return [Integer]
+      # @param line [Fixnum]
+      # @return [Fixnum]
       def line=(line)
         members.each {|m| m.line = line}
         @line = line
@@ -42,7 +42,7 @@ module Sass
       # Subclasses should define `#_hash` rather than overriding this method,
       # which automatically handles memoizing the result.
       #
-      # @return [Integer]
+      # @return [Fixnum]
       def hash
         @_hash ||= _hash
       end
@@ -59,23 +59,20 @@ module Sass
       end
       alias_method :==, :eql?
 
-      # Whether or not this selector should be hidden due to containing a
-      # placeholder.
-      def invisible?
-        @invisible ||= members.any? do |m|
-          next m.invisible? if m.is_a?(AbstractSequence) || m.is_a?(Pseudo)
+      # Whether or not this selector sequence contains a placeholder selector.
+      # Checks recursively.
+      def has_placeholder?
+        @has_placeholder ||= members.any? do |m|
+          next m.has_placeholder? if m.is_a?(AbstractSequence)
+          next m.selector && m.selector.has_placeholder? if m.is_a?(Pseudo)
           m.is_a?(Placeholder)
         end
       end
 
       # Returns the selector string.
       #
-      # @param opts [Hash] rendering options.
-      # @option opts [Symbol] :style The css rendering style.
-      # @option placeholders [Boolean] :placeholders
-      #   Whether to include placeholder selectors. Defaults to `true`.
       # @return [String]
-      def to_s(opts = {})
+      def to_s
         Sass::Util.abstract(self)
       end
 
@@ -84,7 +81,7 @@ module Sass
       # The base is given by {Sass::Selector::SPECIFICITY_BASE}. This can be a
       # number or a range representing possible specificities.
       #
-      # @return [Integer, Range]
+      # @return [Fixnum, Range]
       def specificity
         _specificity(members)
       end