Change representation to support multiple parens

Author: jonatanklosko

lib/elixir/src/elixir_parser.yrl

@@ -786,7 +786,16 @@ build_block([{Op, ExprMeta, Args}], {Before, After}) ->
   ExprMetaWithExtra =
     case ?token_metadata() of
       true ->
-        ExprMeta ++ [{parens_opening, meta_from_token(Before)}, {parens_closing, meta_from_token(After)}];
+        ParensEntry = meta_from_token(Before) ++ [{closing, meta_from_token(After)}],
+        case ExprMeta of
+          % If there are multiple parens, those will result in subsequent
+          % build_block/2 calls, so we can assume parens entry is first
+          [{parens, Parens} | Meta] ->
+            [{parens, [ParensEntry | Parens]} | Meta];
+
+          Meta ->
+            [{parens, [ParensEntry]} | Meta]
+        end;
       false ->
         ExprMeta
     end,

lib/elixir/test/elixir/kernel/parser_test.exs

@@ -618,10 +618,26 @@ defmodule Kernel.ParserTest do
                   1,
                   {:+,
                    [
+                     parens: [[line: 1, column: 5, closing: [line: 1, column: 11]]],
                      line: 1,
-                     column: 8,
-                     parens_opening: [line: 1, column: 5],
-                     parens_closing: [line: 1, column: 11]
+                     column: 8
+                   ], [2, 3]}
+                ]}
+
+      file = "1 + ((2 + 3))"
+
+      assert Code.string_to_quoted!(file, token_metadata: true, columns: true) ==
+               {:+, [line: 1, column: 3],
+                [
+                  1,
+                  {:+,
+                   [
+                     parens: [
+                       [line: 1, column: 5, closing: [line: 1, column: 13]],
+                       [line: 1, column: 6, closing: [line: 1, column: 12]]
+                     ],
+                     line: 1,
+                     column: 9
                    ], [2, 3]}
                 ]}
     end
@@ -666,19 +682,17 @@ defmodule Kernel.ParserTest do
                      [
                        {:__block__,
                         [
+                          parens: [[line: 1, closing: [line: 1]]],
                           token: "1",
-                          line: 1,
-                          parens_opening: [line: 1],
-                          parens_closing: [line: 1]
+                          line: 1
                         ], [1]}
                      ],
                      {:__block__, [delimiter: "\"", line: 1], ["hello"]}
                    ]}
                 ]}
 
       assert string_to_quoted.("(1)") ==
-               {:__block__,
-                [token: "1", line: 1, parens_opening: [line: 1], parens_closing: [line: 1]], [1]}
+               {:__block__, [parens: [[line: 1, closing: [line: 1]]], token: "1", line: 1], [1]}
     end
 
     test "adds identifier_location for qualified identifiers" do