Add metadata about single-expression block closing/opening

Author: jonatanklosko

lib/elixir/src/elixir_parser.yrl

@@ -782,11 +782,36 @@ build_block(Exprs) -> build_block(Exprs, []).
 
 build_block([{unquote_splicing, _, [_]}]=Exprs, Meta) ->
   {'__block__', Meta, Exprs};
+build_block([{Op, ExprMeta, Args}], Meta) ->
+  ExprMetaWithExtra =
+    case ?token_metadata() of
+      true -> ExprMeta ++ block_meta(Meta);
+      false -> ExprMeta
+    end,
+  {Op, ExprMetaWithExtra, Args};
 build_block([Expr], _Meta) ->
   Expr;
 build_block(Exprs, Meta) ->
   {'__block__', Meta, Exprs}.
 
+block_meta(Meta) ->
+  block_meta(Meta, [], []).
+
+block_meta([], [], []) ->
+  [];
+block_meta([], [], Closing) ->
+  [{parens_closing, Closing}];
+block_meta([], Opening, Closing) ->
+  [{parens_opening, lists:reverse(Opening)} | block_meta([], [], Closing)];
+block_meta([{line, Line} | Meta], Opening, Closing) ->
+  block_meta(Meta, [{line, Line} | Opening], Closing);
+block_meta([{column, Column} | Meta], Opening, Closing) ->
+  block_meta(Meta, [{column, Column} | Opening], Closing);
+block_meta([{closing, Closing} | Meta], Opening, _Closing) ->
+  block_meta(Meta, Opening, Closing);
+block_meta([_ | Meta], Opening, Closing) ->
+  block_meta(Meta, Opening, Closing).
+
 %% Newlines
 
 newlines_pair(Left, Right) ->

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

@@ -609,6 +609,23 @@ defmodule Kernel.ParserTest do
                 [[do: {:__block__, [], []}]]}
     end
 
+    test "adds opening and closing information for single-expression block" do
+      file = "1 + (2 + 3)"
+
+      assert Code.string_to_quoted!(file, token_metadata: true, columns: true) ==
+               {:+, [line: 1, column: 3],
+                [
+                  1,
+                  {:+,
+                   [
+                     line: 1,
+                     column: 8,
+                     parens_opening: [line: 1, column: 5],
+                     parens_closing: [line: 1, column: 11]
+                   ], [2, 3]}
+                ]}
+    end
+
     test "with :literal_encoder" do
       opts = [literal_encoder: &{:ok, {:__block__, &2, [&1]}}, token_metadata: true]
       string_to_quoted = &Code.string_to_quoted!(&1, opts)
@@ -646,10 +663,22 @@ defmodule Kernel.ParserTest do
                 [
                   {:->, [line: 1],
                    [
-                     [{:__block__, [token: "1", line: 1], [1]}],
+                     [
+                       {:__block__,
+                        [
+                          token: "1",
+                          line: 1,
+                          parens_opening: [line: 1],
+                          parens_closing: [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]}
     end
 
     test "adds identifier_location for qualified identifiers" do