Merge QWords into ArrayLiteral

Signed-off-by: Alexandre Terrasa <alexandre.terrasa@shopify.com>

Author: Morriar

lib/syntax_tree/dsl.rb

@@ -654,15 +654,6 @@ def QSymbolsBeg(value)
       QSymbolsBeg.new(value: value, location: Location.default)
     end
 
-    # Create a new QWords node.
-    def QWords(beginning, elements)
-      QWords.new(
-        beginning: beginning,
-        elements: elements,
-        location: Location.default
-      )
-    end
-
     # Create a new QWordsBeg node.
     def QWordsBeg(value)
       QWordsBeg.new(value: value, location: Location.default)

lib/syntax_tree/field_visitor.rb

@@ -658,13 +658,6 @@ def visit_qsymbols_beg(node)
         node(node, "qsymbols_beg") { field("value", node.value) }
       end
 
-      def visit_qwords(node)
-        node(node, "qwords") do
-          list("elements", node.elements)
-          comments(node)
-        end
-      end
-
       def visit_qwords_beg(node)
         node(node, "qwords_beg") { field("value", node.value) }
       end

lib/syntax_tree/mutation_visitor.rb

@@ -596,14 +596,6 @@ def visit_qsymbols_beg(node)
         node.copy
       end
 
-      # Visit a QWords node.
-      def visit_qwords(node)
-        node.copy(
-          beginning: visit(node.beginning),
-          elements: visit_all(node.elements)
-        )
-      end
-
       # Visit a QWordsBeg node.
       def visit_qwords_beg(node)
         node.copy

lib/syntax_tree/node.rb

@@ -1214,7 +1214,7 @@ def format(q)
 
       q.group do
         case lbracket
-        when QSymbolsBeg
+        when QSymbolsBeg, QWordsBeg
           q.text(lbracket.value)
         else
           q.format(lbracket)
@@ -1224,7 +1224,7 @@ def format(q)
           q.indent do
             q.breakable_empty
             case lbracket
-            when QSymbolsBeg
+            when QSymbolsBeg, QWordsBeg
               q.seplist(contents.parts, BREAKABLE_SPACE_SEPARATOR) do |part|
                 q.text(part.value)
               end
@@ -1238,7 +1238,7 @@ def format(q)
         q.breakable_empty
 
         case lbracket
-        when QSymbolsBeg
+        when QSymbolsBeg, QWordsBeg
           q.text(lbracket.value[-1] == "{" ? "}" : "]")
         else
           q.text("]")
@@ -1416,7 +1416,7 @@ def ===(other)
   module AssignFormatting
     def self.skip_indent?(value)
       case value
-      when ArrayLiteral, HashLiteral, Heredoc, Lambda, QWords, Symbols, Words
+      when ArrayLiteral, HashLiteral, Heredoc, Lambda, Symbols, Words
         true
       when CallNode
         skip_indent?(value.receiver)
@@ -8674,82 +8674,6 @@ def ===(other)
     end
   end
 
-  # QWords represents a string literal array without interpolation.
-  #
-  #     %w[one two three]
-  #
-  class QWords < Node
-    # [QWordsBeg] the token that opens this array literal
-    attr_reader :beginning
-
-    # [Array[ TStringContent ]] the elements of the array
-    attr_reader :elements
-
-    # [Array[ Comment | EmbDoc ]] the comments attached to this node
-    attr_reader :comments
-
-    def initialize(beginning:, elements:, location:)
-      @beginning = beginning
-      @elements = elements
-      @location = location
-      @comments = []
-    end
-
-    def accept(visitor)
-      visitor.visit_qwords(self)
-    end
-
-    def child_nodes
-      []
-    end
-
-    def copy(beginning: nil, elements: nil, location: nil)
-      QWords.new(
-        beginning: beginning || self.beginning,
-        elements: elements || self.elements,
-        location: location || self.location
-      )
-    end
-
-    alias deconstruct child_nodes
-
-    def deconstruct_keys(_keys)
-      {
-        beginning: beginning,
-        elements: elements,
-        location: location,
-        comments: comments
-      }
-    end
-
-    def format(q)
-      opening, closing = "%w[", "]"
-
-      if elements.any? { |element| element.match?(/[\[\]]/) }
-        opening = beginning.value
-        closing = Quotes.matching(opening[2])
-      end
-
-      q.text(opening)
-      q.group do
-        q.indent do
-          q.breakable_empty
-          q.seplist(
-            elements,
-            ArrayLiteral::BREAKABLE_SPACE_SEPARATOR
-          ) { |element| q.format(element) }
-        end
-        q.breakable_empty
-      end
-      q.text(closing)
-    end
-
-    def ===(other)
-      other.is_a?(QWords) && beginning === other.beginning &&
-        ArrayMatch.call(elements, other.elements)
-    end
-  end
-
   # QWordsBeg represents the beginning of a string literal array.
   #
   #     %w[one two three]

lib/syntax_tree/parser.rb

@@ -618,7 +618,7 @@ def on_args_new
 
     # :call-seq:
     #   on_array: ((nil | Args | Array [ TStringContent ]) contents) ->
-    #     ArrayLiteral | QWords | Symbols | Words
+    #     ArrayLiteral | Symbols | Words
     def on_array(contents)
       if !contents || contents.is_a?(Args)
         lbracket = consume_token(LBracket)
@@ -3054,11 +3054,14 @@ def on_qsymbols_new
     end
 
     # :call-seq:
-    #   on_qwords_add: (QWords qwords, TStringContent element) -> QWords
+    #   on_qwords_add: (ArrayLiteral qwords, TStringContent element) ->
+    #     ArrayLiteral
     def on_qwords_add(qwords, element)
-      QWords.new(
-        beginning: qwords.beginning,
-        elements: qwords.elements << element,
+      qwords.contents.parts << element
+
+      ArrayLiteral.new(
+        lbracket: qwords.lbracket,
+        contents: qwords.contents,
         location: qwords.location.to(element.location)
       )
     end
@@ -3083,13 +3086,16 @@ def on_qwords_beg(value)
     end
 
     # :call-seq:
-    #   on_qwords_new: () -> QWords
+    #   on_qwords_new: () -> ArrayLiteral
     def on_qwords_new
       beginning = consume_token(QWordsBeg)
 
-      QWords.new(
-        beginning: beginning,
-        elements: [],
+      ArrayLiteral.new(
+        lbracket: beginning,
+        contents: Args.new(
+          parts: [],
+          location: beginning.location
+        ),
         location: beginning.location
       )
     end

lib/syntax_tree/translation/parser.rb

@@ -1906,17 +1906,6 @@ def visit_program(node)
           visit(node.statements)
         end
 
-        # Visit a QWords node.
-        def visit_qwords(node)
-          visit_array(
-            ArrayLiteral.new(
-              lbracket: node.beginning,
-              contents: Args.new(parts: node.elements, location: node.location),
-              location: node.location
-            )
-          )
-        end
-
         # Visit a RangeNode node.
         def visit_range(node)
           s(

lib/syntax_tree/visitor.rb

@@ -278,9 +278,6 @@ class Visitor < BasicVisitor
     # Visit a QSymbolsBeg node.
     alias visit_qsymbols_beg visit_child_nodes
 
-    # Visit a QWords node.
-    alias visit_qwords visit_child_nodes
-
     # Visit a QWordsBeg node.
     alias visit_qwords_beg visit_child_nodes
 

lib/syntax_tree/yarv/compiler.rb

@@ -178,10 +178,6 @@ def visit_mrhs(node)
             visit_all(node.parts)
           end
 
-          def visit_qwords(node)
-            visit_all(node.elements)
-          end
-
           def visit_range(node)
             left, right = [visit(node.left), visit(node.right)]
             node.operator.value === ".." ? left..right : left...right
@@ -387,6 +383,16 @@ def visit_args(node)
       end
 
       def visit_array(node)
+        if node.lbracket.is_a?(QWordsBeg)
+          if options.frozen_string_literal?
+            iseq.duparray(node.accept(RubyVisitor.new))
+          else
+            visit(node.contents)
+            iseq.newarray(node.contents.parts.length)
+          end
+          return
+        end
+
         if (compiled = RubyVisitor.compile(node))
           iseq.duparray(compiled)
         elsif node.contents && node.contents.parts.length == 1 &&
@@ -1412,15 +1418,6 @@ def visit_program(node)
         top_iseq
       end
 
-      def visit_qwords(node)
-        if options.frozen_string_literal?
-          iseq.duparray(node.accept(RubyVisitor.new))
-        else
-          visit_all(node.elements)
-          iseq.newarray(node.elements.length)
-        end
-      end
-
       def visit_range(node)
         if (compiled = RubyVisitor.compile(node))
           iseq.putobject(compiled)

test/node_test.rb

@@ -778,7 +778,7 @@ def test_qsymbols
     end
 
     def test_qwords
-      assert_node(QWords, "%w[one two three]")
+      assert_node(ArrayLiteral, "%w[one two three]")
     end
 
     def test_rational