Merge pull request #1604 from apiology/fix_word_array_in_array_parsing

Fix array-within-word-array parsing

Author: lsegal

lib/yard/parser/ruby/ruby_parser.rb

@@ -390,7 +390,7 @@ def on_aref_field(*args)
 
         def on_array(other)
           node = AstNode.node_class_for(:array).new(:array, [other])
-          map = @map[MAPPINGS[node.type]]
+          map = @map[MAPPINGS[node.type]] if other.nil? || other.type == :list
           if map && !map.empty?
             lstart, sstart = *map.pop
             node.source_range = Range.new(sstart, @ns_charno - 1)

spec/parser/ruby/ruby_parser_spec.rb

@@ -283,6 +283,11 @@ def hello; end
         src = "%#{tok}{\na b c\n d e f\n}"
         expect(stmt(src).source).to eq src
       end
+
+      it "shows proper source for %#{tok}[] array" do
+        src = "%#{tok}[\na b c\n d e f\n]"
+        expect(stmt(src).source).to eq src
+      end
     end
 
     {'i' => :qsymbols_literal, 'I' => :symbols_literal,
@@ -300,6 +305,33 @@ def hello; end
         end
       end
 
+      it "parses %#{id}{...} literals" do
+        [
+          "TEST = %#{id}{A B C}",
+          "TEST = %#{id}{  A  B  C  }",
+          "TEST = %#{id}{ \nA \nB \nC \n}",
+          "TEST = %#{id}{\n\nAD\n\nB\n\nC\n\n}",
+          "TEST = %#{id}{\n A\n B\n C\n }",
+        ].each do |str|
+          node = stmt(str).jump(sym)
+          expect(node.source).to eq(str[/(\%#{id}\{.+\})/m, 1])
+        end
+      end
+
+      it "parses %#{id}[...] literals" do
+        [
+          "TEST = %#{id}[A B C]",
+          "TEST = %#{id}[  A  B  C  ]",
+          "TEST = %#{id}[ \nA \nB \nC \n]",
+          "TEST = %#{id}[\n\nAD\n\nB\n\nC\n\n]",
+          "TEST = %#{id}[\n A\n B\n C\n ]",
+          "TEST = %#{id}[\n  A]",
+        ].each do |str|
+          node = stmt(str).jump(sym)
+          expect(node.source).to eq(str[/(\%#{id}\[.+\])/m, 1])
+        end
+      end
+
       it "tokenizing %#{id}(...) returns correct tokens" do
         toks = tokenize("TEST = %#{id}(A B C)").flatten
         expect(toks.count(:tstring_content)).to eq(3)
@@ -327,7 +359,7 @@ def method
           # Method comment not docstring
         end
       eof
-      
+
       tokens = tokenize(src.gsub(/^ +/, ''))
       expect(tokens).to eq(tokens.sort_by {|t| t.last })
       expect(tokens.map {|t| t.first }).to eq %i(kw sp ident nl comment kw nl)
@@ -370,6 +402,27 @@ class Foo
       expect(s.jump(:array).source).to eq "['foo', 'bar']"
     end
 
+    it "parses [[]] as array of arrays" do
+      s = stmt(<<-eof)
+        class Foo
+          FOO = [['foo', 'bar']]
+        end
+      eof
+      expect(s.jump(:array).source).to eq "[['foo', 'bar']]"
+    end
+
+    it "parses %w() array inside another empty array" do
+      s = stmts(<<-eof)
+        FOO = [%w( foo bar )]
+      eof
+      expect(s[0].jump(:array).source).to eq '[%w( foo bar )]'
+    end
+
+    it "parses %w() array inside another populated array" do
+      s = stmts("FOO = ['1', %w[]]")
+      expect(s[0].jump(:array).source).to eq "['1', %w[]]"
+    end
+
     it "shows source for unary minus" do
       expect(stmt("X = - 1").jump(:unary).source).to eq '- 1'
     end