sass 3.4.0 → 3.4.25

data/lib/sass/scss/parser.rb

@@ -16,21 +16,20 @@ module Sass
       #   warnings and source maps.
       # @param importer [Sass::Importers::Base] The importer used to import the
       #   file being parsed. Used for source maps.
-      # @param line [Fixnum] The 1-based line on which the source string appeared,
+      # @param line [Integer] The 1-based line on which the source string appeared,
       #   if it's part of another document.
-      # @param offset [Fixnum] The 1-based character (not byte) offset in the line on
+      # @param offset [Integer] The 1-based character (not byte) offset in the line on
       #   which the source string starts. Used for error reporting and sourcemap
       #   building.
-      # @comment
-      #   rubocop:disable ParameterLists
       def initialize(str, filename, importer, line = 1, offset = 1)
-        # rubocop:enable ParameterLists
         @template = str
         @filename = filename
         @importer = importer
         @line = line
         @offset = offset
         @strs = []
+        @expected = nil
+        @throw_error = false
       end
 
       # Parses an SCSS document.
@@ -55,6 +54,15 @@ module Sass
         interp_ident
       end
 
+      # Parses a supports clause for an @import directive
+      def parse_supports_clause
+        init_scanner!
+        ss
+        clause = supports_clause
+        ss
+        clause
+      end
+
       # Parses a media query list.
       #
       # @return [Sass::Media::QueryList] The parsed query list
@@ -108,7 +116,7 @@ module Sass
           if @template.is_a?(StringScanner)
             @template
           else
-            Sass::Util::MultibyteStringScanner.new(@template.gsub("\r", ""))
+            Sass::Util::MultibyteStringScanner.new(@template.tr("\r", ""))
           end
       end
 
@@ -150,21 +158,16 @@ module Sass
         silent = text =~ %r{\A//}
         loud = !silent && text =~ %r{\A/[/*]!}
         line = @line - text.count("\n")
+        comment_start = @scanner.pos - text.length
+        index_before_line = @scanner.string.rindex("\n", comment_start) || -1
+        offset = comment_start - index_before_line
 
         if silent
           value = [text.sub(%r{\A\s*//}, '/*').gsub(%r{^\s*//}, ' *') + ' */']
         else
-          value = Sass::Engine.parse_interp(
-            text, line, @scanner.pos - text.size, :filename => @filename)
-          string_before_comment = @scanner.string[0...@scanner.pos - text.length]
-          newline_before_comment = string_before_comment.rindex("\n")
-          last_line_before_comment =
-            if newline_before_comment
-              string_before_comment[newline_before_comment + 1..-1]
-            else
-              string_before_comment
-            end
-          value.unshift(last_line_before_comment.gsub(/[^\s]/, ' '))
+          value = Sass::Engine.parse_interp(text, line, offset, :filename => @filename)
+          line_before_comment = @scanner.string[index_before_line + 1...comment_start]
+          value.unshift(line_before_comment.gsub(/[^\s]/, ' '))
         end
 
         type = if silent
@@ -174,8 +177,8 @@ module Sass
                else
                  :normal
                end
-        comment = Sass::Tree::CommentNode.new(value, type)
-        comment.line = line
+        start_pos = Sass::Source::Position.new(line, offset)
+        comment = node(Sass::Tree::CommentNode.new(value, type), start_pos)
         node << comment
       end
 
@@ -215,12 +218,12 @@ module Sass
       end
 
       def special_directive(name, start_pos)
-        sym = name.gsub('-', '_').to_sym
+        sym = name.tr('-', '_').to_sym
         DIRECTIVES.include?(sym) && send("#{sym}_directive", start_pos)
       end
 
       def prefixed_directive(name, start_pos)
-        sym = deprefix(name).gsub('-', '_').to_sym
+        sym = deprefix(name).tr('-', '_').to_sym
         PREFIXED_DIRECTIVES.include?(sym) && send("#{sym}_directive", name, start_pos)
       end
 
@@ -380,16 +383,21 @@ module Sass
         if uri
           str = sass_script(:parse_string)
           ss
+          supports = supports_clause
+          ss
           media = media_query_list
           ss
-          return node(Tree::CssImportNode.new(str, media.to_a), start_pos)
+          return node(Tree::CssImportNode.new(str, media.to_a, supports), start_pos)
         end
         ss
 
+        supports = supports_clause
+        ss
         media = media_query_list
-        if str =~ %r{^(https?:)?//} || media || use_css_import?
-          return node(Sass::Tree::CssImportNode.new(
-              Sass::Script::Value::String.quote(str), media.to_a), start_pos)
+        if str =~ %r{^(https?:)?//} || media || supports || use_css_import?
+          return node(
+            Sass::Tree::CssImportNode.new(
+              Sass::Script::Value::String.quote(str), media.to_a, supports), start_pos)
         end
 
         node(Sass::Tree::ImportNode.new(str.strip), start_pos)
@@ -503,7 +511,7 @@ module Sass
 
       def moz_document_function
         val = interp_uri || _interp_string(:url_prefix) ||
-          _interp_string(:domain) || function(!:allow_var) || interpolation
+          _interp_string(:domain) || function(false) || interpolation
         return unless val
         ss
         val
@@ -549,10 +557,23 @@ module Sass
         node(node, start_pos)
       end
 
+      def supports_clause
+        return unless tok(/supports\(/i)
+        ss
+        supports = import_supports_condition
+        ss
+        tok!(/\)/)
+        supports
+      end
+
       def supports_condition
         supports_negation || supports_operator || supports_interpolation
       end
 
+      def import_supports_condition
+        supports_condition || supports_declaration
+      end
+
       def supports_negation
         return unless tok(/not/i)
         ss
@@ -562,7 +583,9 @@ module Sass
       def supports_operator
         cond = supports_condition_in_parens
         return unless cond
-        while (op = tok(/and|or/i))
+        re = /and|or/i
+        while (op = tok(re))
+          re = /#{op}/i
           ss
           cond = Sass::Supports::Operator.new(
             cond, expr!(:supports_condition_in_parens), op)
@@ -570,6 +593,13 @@ module Sass
         cond
       end
 
+      def supports_declaration
+          name = sass_script(:parse)
+          tok!(/:/); ss
+          value = sass_script(:parse)
+          Sass::Supports::Declaration.new(name, value)
+      end
+
       def supports_condition_in_parens
         interp = supports_interpolation
         return interp if interp
@@ -578,19 +608,12 @@ module Sass
           tok!(/\)/); ss
           cond
         else
-          name = sass_script(:parse)
-          tok!(/:/); ss
-          value = sass_script(:parse)
+          decl = supports_declaration
           tok!(/\)/); ss
-          Sass::Supports::Declaration.new(name, value)
+          decl
         end
       end
 
-      def supports_declaration_condition
-        return unless tok(/\(/); ss
-        supports_declaration_body
-      end
-
       def supports_interpolation
         interp = interpolation
         return unless interp
@@ -626,14 +649,15 @@ module Sass
         # are disallowed by the CSS spec,
         # but they're included here for compatibility
         # with some proprietary MS properties
-        str {ss if tok(/[\/,:.=]/)}
+        str {ss if tok(%r{[/,:.=]})}
       end
 
       def ruleset
         start_pos = source_position
         return unless (rules = almost_any_value)
-        block(node(
-          Sass::Tree::RuleNode.new(rules, range(start_pos)), start_pos), :ruleset)
+        block(
+          node(
+            Sass::Tree::RuleNode.new(rules, range(start_pos)), start_pos), :ruleset)
       end
 
       def block(node, context)
@@ -708,8 +732,9 @@ module Sass
           selector << additional_selector
         end
 
-        block(node(
-          Sass::Tree::RuleNode.new(merge(selector), range(start_pos)), start_pos), :ruleset)
+        block(
+          node(
+            Sass::Tree::RuleNode.new(merge(selector), range(start_pos)), start_pos), :ruleset)
       end
 
       # Tries to parse a declaration, and returns the value parsed so far if it
@@ -750,7 +775,7 @@ module Sass
         value_start_pos = source_position
         value = nil
         error = catch_error do
-          value = value!
+          value = value!(name.first.is_a?(String) && name.first.start_with?("--"))
           if tok?(/\{/)
             # Properties that are ambiguous with selectors can't have additional
             # properties nested beneath them.
@@ -808,8 +833,13 @@ module Sass
       def almost_any_value_token
         tok(%r{
           (
+            \\.
+          |
             (?!url\()
-            [^"/\#!;\{\}] # "
+            [^"'/\#!;\{\}] # "
+          |
+            # interp_uri will handle most url() calls, but not ones that take strings
+            url\(#{W}(?=")
           |
             /(?![/*])
           |
@@ -841,7 +871,7 @@ module Sass
         tok!(/:/)
         ss
         value_start_pos = source_position
-        value = value!
+        value = value!(name.first.is_a?(String) && name.first.start_with?("--"))
         value_end_pos = source_position
         ss
         require_block = tok?(/\{/)
@@ -855,7 +885,7 @@ module Sass
         nested_properties! node
       end
 
-      def value!
+      def value!(css_variable = false)
         if tok?(/\{/)
           str = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))
           str.line = source_position.line
@@ -875,10 +905,19 @@ module Sass
           str.source_range = range(start_pos)
           return str
         end
-        sass_script(:parse)
+
+        sass_script(:parse, css_variable)
       end
 
       def nested_properties!(node)
+        if node.name.first.is_a?(String) && node.name.first.start_with?("--")
+          Sass::Util.sass_warn(<<WARNING)
+DEPRECATION WARNING on line #{@line}#{" of #{@filename}" if @filename}:
+Sass 3.6 will change the way CSS variables are parsed. Instead of being parsed as
+normal properties, they will not allow any Sass-specific behavior other than \#{}.
+WARNING
+        end
+
         @expected = 'expression (e.g. 1px, bold) or "{"'
         block(node, :property)
       end
@@ -983,7 +1022,7 @@ module Sass
       end
 
       def str
-        @strs.push ""
+        @strs.push String.new("")
         yield
         @strs.last
       ensure
@@ -1011,8 +1050,7 @@ module Sass
         node
       end
 
-      @sass_script_parser = Class.new(Sass::Script::Parser)
-      @sass_script_parser.send(:include, ScriptParser)
+      @sass_script_parser = Sass::Script::Parser
 
       class << self
         # @private
@@ -1021,7 +1059,7 @@ module Sass
 
       def sass_script(*args)
         parser = self.class.sass_script_parser.new(@scanner, @line, @offset,
-                                                   :filename => @filename, :importer => @importer)
+          :filename => @filename, :importer => @importer, :allow_extra_text => true)
         result = parser.send(*args)
         unless @strs.empty?
           # Convert to CSS manually so that comments are ignored.
@@ -1086,7 +1124,7 @@ module Sass
 
         unless name
           # Display basic regexps as plain old strings
-          source = rx.source.gsub(/\\\//, '/')
+          source = rx.source.gsub(%r{\\/}, '/')
           string = rx.source.gsub(/\\(.)/, '\1')
           name = source == Regexp.escape(string) ? string.inspect : rx.inspect
         end
@@ -1117,14 +1155,20 @@ module Sass
         line = @line
         offset = @offset
         expected = @expected
+
+        logger = Sass::Logger::Delayed.install!
         if catch(:_sass_parser_error) {yield; false}
           @scanner.pos = pos
           @line = line
           @offset = offset
           @expected = expected
           {:pos => pos, :line => line, :expected => @expected, :block => block}
+        else
+          logger.flush
+          nil
         end
       ensure
+        logger.uninstall! if logger
         @throw_error = old_throw_error
       end
 
@@ -1171,33 +1215,34 @@ module Sass
 
       def tok(rx, last_group_lookahead = false)
         res = @scanner.scan(rx)
-        if res
-          # This fixes https://github.com/nex3/sass/issues/104, which affects
-          # Ruby 1.8.7 and REE. This fix is to replace the ?= zero-width
-          # positive lookahead operator in the Regexp (which matches without
-          # consuming the matched group), with a match that does consume the
-          # group, but then rewinds the scanner and removes the group from the
-          # end of the matched string. This fix makes the assumption that the
-          # matched group will always occur at the end of the match.
-          if last_group_lookahead && @scanner[-1]
-            @scanner.pos -= @scanner[-1].length
-            res.slice!(-@scanner[-1].length..-1)
-          end
 
-          newline_count = res.count(NEWLINE)
-          if newline_count > 0
-            @line += newline_count
-            @offset = res[res.rindex(NEWLINE)..-1].size
-          else
-            @offset += res.size
-          end
+        return unless res
+
+        # This fixes https://github.com/nex3/sass/issues/104, which affects
+        # Ruby 1.8.7 and REE. This fix is to replace the ?= zero-width
+        # positive lookahead operator in the Regexp (which matches without
+        # consuming the matched group), with a match that does consume the
+        # group, but then rewinds the scanner and removes the group from the
+        # end of the matched string. This fix makes the assumption that the
+        # matched group will always occur at the end of the match.
+        if last_group_lookahead && @scanner[-1]
+          @scanner.pos -= @scanner[-1].length
+          res.slice!(-@scanner[-1].length..-1)
+        end
 
-          @expected = nil
-          if !@strs.empty? && rx != COMMENT && rx != SINGLE_LINE_COMMENT
-            @strs.each {|s| s << res}
-          end
-          res
+        newline_count = res.count(NEWLINE)
+        if newline_count > 0
+          @line += newline_count
+          @offset = res[res.rindex(NEWLINE)..-1].size
+        else
+          @offset += res.size
         end
+
+        @expected = nil
+        if !@strs.empty? && rx != COMMENT && rx != SINGLE_LINE_COMMENT
+          @strs.each {|s| s << res}
+        end
+        res
       end
 
       # Remove a vendor prefix from `str`.

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" % Sass::Util.ord(c) unless c =~ /[ -\/:-~]/
+        return "\\%06x" % (Sass::Util.ord(c)) unless c =~ %r{[ -/:-~]}
         "\\#{c}"
       end
 
@@ -40,7 +40,7 @@ module Sass
       # escaping all significant characters.
       #
       # @param str [String] The text of the regexp
-      # @param flags [Fixnum] Flags for the created regular expression
+      # @param flags [Integer] Flags for the created regular expression
       # @return [Regexp]
       # @private
       def self.quote(str, flags = 0)
@@ -66,7 +66,6 @@ module Sass
 
       IDENT    = /-*#{NMSTART}#{NMCHAR}*/
       NAME     = /#{NMCHAR}+/
-      NUM      = //
       STRING   = /#{STRING1}|#{STRING2}/
       URLCHAR  = /[#%&*-~]|#{NONASCII}|#{ESCAPE}/
       URL      = /(#{URLCHAR}*)/
@@ -96,8 +95,13 @@ module Sass
 
       IMPORTANT = /!#{W}important/i
 
+      # 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))*|%/
+
       UNITLESS_NUMBER = /(?:[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?\d+)?/
-      NUMBER = /#{UNITLESS_NUMBER}(?:#{IDENT}|%)?/
+      NUMBER = /#{UNITLESS_NUMBER}(?:#{UNIT})?/
       PERCENTAGE = /#{UNITLESS_NUMBER}%/
 
       URI = /url\(#{W}(?:#{STRING}|#{URL})#{W}\)/i
@@ -123,18 +127,13 @@ module Sass
       OPTIONAL = /!#{W}optional/i
       IDENT_START = /-|#{NMSTART}/
 
-      # 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))*|%/
-
       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 = /#{STATIC_COMPONENT}(\s*[\s,\/]\s*#{STATIC_COMPONENT})*([;}])/i
+      STATIC_VALUE = %r(#{STATIC_COMPONENT}(\s*[\s,/]\s*#{STATIC_COMPONENT})*([;}]))i
       STATIC_SELECTOR = /(#{NMCHAR}|[ \t]|[,>+*]|[:#.]#{NMSTART}){1,50}([{])/i
     end
   end

data/lib/sass/scss/static_parser.rb

@@ -62,7 +62,7 @@ module Sass
       private
 
       def moz_document_function
-        val = tok(URI) || tok(URL_PREFIX) || tok(DOMAIN) || function(!:allow_var)
+        val = tok(URI) || tok(URL_PREFIX) || tok(DOMAIN) || function(false)
         return unless val
         ss
         [val]
@@ -78,7 +78,7 @@ module Sass
       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
 
@@ -89,13 +89,12 @@ module Sass
         ws = ''
         while tok(/,/)
           ws << str {ss}
-          if (sel = selector)
-            selectors << sel
-            if ws.include?("\n")
-              selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members)
-            end
-            ws = ''
+          next unless (sel = selector)
+          selectors << sel
+          if ws.include?("\n")
+            selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members)
           end
+          ws = ''
         end
         Selector::CommaSequence.new(selectors)
       end
@@ -140,11 +139,18 @@ MESSAGE
       end
 
       def reference_combinator
-        return unless tok(/\//)
+        return unless tok(%r{/})
         res = '/'
         ns, name = expr!(:qualified_name)
         res << ns << '|' if ns
-        res << name << tok!(/\//)
+        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
       end
 
@@ -266,9 +272,9 @@ MESSAGE
         return ns, name
       end
 
-      SELECTOR_PSEUDO_CLASSES = %w[not matches current any has host host-context].to_set
+      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
+      PREFIXED_SELECTOR_PSEUDO_CLASSES = %w(nth-child nth-last-child).to_set
 
       def pseudo
         s = tok(/::?/)
@@ -358,11 +364,10 @@ MESSAGE
       end
 
       def keyframes_selector_component
-        tok(/from|to/i) || 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/scss.rb

@@ -1,6 +1,4 @@
 require 'sass/scss/rx'
-require 'sass/scss/script_lexer'
-require 'sass/scss/script_parser'
 require 'sass/scss/parser'
 require 'sass/scss/static_parser'
 require 'sass/scss/css_parser'

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 [Fixnum]
+      # @return [Integer]
       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 [Fixnum]
-      # @return [Fixnum]
+      # @param line [Integer]
+      # @return [Integer]
       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 [Fixnum]
+      # @return [Integer]
       def hash
         @_hash ||= _hash
       end
@@ -71,8 +71,10 @@ module Sass
 
       # Returns the selector string.
       #
+      # @param opts [Hash] rendering options.
+      # @option opts [Symbol] :style The css rendering style.
       # @return [String]
-      def to_s
+      def to_s(opts = {})
         Sass::Util.abstract(self)
       end
 
@@ -81,7 +83,7 @@ module Sass
       # The base is given by {Sass::Selector::SPECIFICITY_BASE}. This can be a
       # number or a range representing possible specificities.
       #
-      # @return [Fixnum, Range]
+      # @return [Integer, Range]
       def specificity
         _specificity(members)
       end

data/lib/sass/selector/comma_sequence.rb

@@ -2,6 +2,8 @@ module Sass
   module Selector
     # A comma-separated sequence of selectors.
     class CommaSequence < AbstractSequence
+      @@compound_extend_deprecation = Sass::Deprecation.new
+
       # The comma-separated selector sequences
       # represented by this class.
       #
@@ -25,12 +27,7 @@ module Sass
       # @raise [Sass::SyntaxError] If a parent selector is invalid
       def resolve_parent_refs(super_cseq, implicit_parent = true)
         if super_cseq.nil?
-          if @members.any? do |sel|
-               sel.members.any? do |sel_or_op|
-                 sel_or_op.is_a?(SimpleSequence) &&
-                   sel_or_op.members.any? {|ssel| ssel.is_a?(Parent)}
-               end
-             end
+          if contains_parent_ref?
             raise Sass::SyntaxError.new(
               "Base-level rules cannot contain the parent-selector-referencing character '&'.")
           end
@@ -42,6 +39,13 @@ module Sass
         end))
       end
 
+      # Returns whether there's a {Parent} selector anywhere in this sequence.
+      #
+      # @return [Boolean]
+      def contains_parent_ref?
+        @members.any? {|sel| sel.contains_parent_ref?}
+      end
+
       # Non-destrucively extends this selector with the extensions specified in a hash
       # (which should come from {Sass::Tree::Visitors::Cssize}).
       #
@@ -94,8 +98,11 @@ module Sass
       #   The node that caused this extension.
       # @param parent_directives [Array<Sass::Tree::DirectiveNode>]
       #   The parent directives containing `extend_node`.
+      # @param allow_compound_target [Boolean]
+      #   Whether `extendee` is allowed to contain compound selectors.
       # @raise [Sass::SyntaxError] if this extension is invalid.
-      def populate_extends(extends, extendee, extend_node = nil, parent_directives = [])
+      def populate_extends(extends, extendee, extend_node = nil, parent_directives = [],
+          allow_compound_target = false)
         extendee.members.each do |seq|
           if seq.members.size > 1
             raise Sass::SyntaxError.new("Can't extend #{seq}: can't extend nested selectors")
@@ -109,6 +116,13 @@ module Sass
           end
 
           sel = sseq.members
+          if !allow_compound_target && sel.length > 1
+            @@compound_extend_deprecation.warn(sseq.filename, sseq.line, <<WARNING)
+Extending a compound selector, #{sseq}, is deprecated and will not be supported in a future release.
+See https://github.com/sass/sass/issues/1599 for details.
+WARNING
+          end
+
           members.each do |member|
             unless member.members.last.is_a?(Sass::Selector::SimpleSequence)
               raise Sass::SyntaxError.new("#{member} can't extend: invalid selector")
@@ -157,8 +171,10 @@ module Sass
       end
 
       # @see AbstractSequence#to_s
-      def to_s
-        @members.join(", ").gsub(", \n", ",\n")
+      def to_s(opts = {})
+        @members.map {|m| m.to_s(opts)}.
+          join(opts[:style] == :compressed ? "," : ", ").
+          gsub(", \n", ",\n")
       end
 
       private