Ensure line and column are included in empty blocks, closes #14931

Author: josevalim

lib/elixir/src/elixir_parser.yrl

@@ -98,12 +98,12 @@ Nonassoc 330 dot_identifier.
 
 %%% MAIN FLOW OF EXPRESSIONS
 
-grammar -> eoe : {'__block__', meta_from_token('$1'), []}.
+grammar -> eoe : {'__block__', meta_from_location({1, 1, nil}), []}.
 grammar -> expr_list : build_block(reverse('$1')).
 grammar -> eoe expr_list : build_block(reverse('$2')).
 grammar -> expr_list eoe : build_block(reverse(annotate_eoe('$2', '$1'))).
 grammar -> eoe expr_list eoe : build_block(reverse(annotate_eoe('$3', '$2'))).
-grammar -> '$empty' : {'__block__', [], []}.
+grammar -> '$empty' : {'__block__', meta_from_location({1, 1, nil}), []}.
 
 % Note expressions are on reverse order
 expr_list -> expr : ['$1'].

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

@@ -6,6 +6,14 @@ Code.require_file("../test_helper.exs", __DIR__)
 defmodule Kernel.ParserTest do
   use ExUnit.Case, async: true
 
+  test "empty" do
+    assert Code.string_to_quoted!("") == {:__block__, [line: 1], []}
+    assert Code.string_to_quoted!("", columns: true) == {:__block__, [line: 1, column: 1], []}
+
+    assert Code.string_to_quoted!("  \n") == {:__block__, [line: 1], []}
+    assert Code.string_to_quoted!("  \n", columns: true) == {:__block__, [line: 1, column: 1], []}
+  end
+
   describe "nullary ops" do
     test "in expressions" do
       assert parse!("..") == {:.., [line: 1], []}