Split out array contents

Author: kddnewton

lib/syntax_tree.rb

@@ -974,9 +974,8 @@ def to_json(*opts)
   end
 
   # :call-seq:
-  #   on_array: (
-  #     (nil | Args | QSymbols | QWords | Symbols | Words) contents
-  #   ) -> ArrayLiteral
+  #   on_array: ((nil | Args) contents) ->
+  #     ArrayLiteral | QSymbols | QWords | Symbols | Words
   def on_array(contents)
     if !contents || contents.is_a?(Args)
       lbracket = find_token(LBracket)
@@ -988,13 +987,11 @@ def on_array(contents)
       )
     else
       tstring_end = find_token(TStringEnd)
-      contents =
-        contents.class.new(
-          elements: contents.elements,
-          location: contents.location.to(tstring_end.location)
-        )
 
-      ArrayLiteral.new(contents: contents, location: contents.location)
+      contents.class.new(
+        elements: contents.elements,
+        location: contents.location.to(tstring_end.location)
+      )
     end
   end
 

test/syntax_tree_test.rb

@@ -144,10 +144,6 @@ def test_array
       assert_node(ArrayLiteral, 'array', '[1]')
     end
 
-    def test_array_qwords
-      assert_node(ArrayLiteral, 'array', '%w[1]')
-    end
-
     def test_aryptn
       source = <<~SOURCE
         case [1, 2, 3]
@@ -762,11 +758,11 @@ def test_program
     end
 
     def test_qsymbols
-      assert_node(QSymbols, 'qsymbols', '%i[one two three]', &:contents)
+      assert_node(QSymbols, 'qsymbols', '%i[one two three]')
     end
 
     def test_qwords
-      assert_node(QWords, 'qwords', '%w[one two three]', &:contents)
+      assert_node(QWords, 'qwords', '%w[one two three]')
     end
 
     def test_rational
@@ -881,7 +877,7 @@ def test_symbol_literal
     end
 
     def test_symbols
-      assert_node(Symbols, 'symbols', '%I[one two three]', &:contents)
+      assert_node(Symbols, 'symbols', '%I[one two three]')
     end
 
     def test_top_const_field
@@ -980,12 +976,12 @@ def test_while_mod
     def test_word
       at = location(chars: 3..7)
       assert_node(Word, 'word', '%W[word]', at: at) do |node|
-        node.contents.elements.first
+        node.elements.first
       end
     end
 
     def test_words
-      assert_node(Words, 'words', '%W[one two three]', &:contents)
+      assert_node(Words, 'words', '%W[one two three]')
     end
 
     def test_xstring_literal