Skip to content

Commit 9fd9bce

Browse files
zachallaunjosevalim
authored andcommitted
Code.Normalizer: Use correct meta fields in normalize_call/2 (#12389)
1 parent 2ca0f1a commit 9fd9bce

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

lib/elixir/lib/code/normalizer.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ defmodule Code.Normalizer do
362362
normalize_kw_blocks(form, meta, args, state)
363363

364364
allow_keyword?(form, arity) ->
365-
args = normalize_args(args, %{state | parent_meta: state.parent_meta})
365+
args = normalize_args(args, %{state | parent_meta: meta})
366366
{last_arg, leading_args} = List.pop_at(args, -1, [])
367367

368368
last_args =
@@ -384,7 +384,7 @@ defmodule Code.Normalizer do
384384
{form, meta, leading_args ++ last_args}
385385

386386
true ->
387-
args = normalize_args(args, %{state | parent_meta: state.parent_meta})
387+
args = normalize_args(args, %{state | parent_meta: meta})
388388
{form, meta, args}
389389
end
390390
end

lib/elixir/test/elixir/code_normalizer/formatted_ast_test.exs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,28 @@ defmodule Code.Normalizer.FormatterASTTest do
507507
# after
508508
""",
509509
literal_encoder: fn literal, _ -> {:ok, literal} end
510+
511+
assert_same """
512+
block do
513+
# before 1
514+
1 + 1
515+
516+
# before 2
517+
2 + 2
518+
end
519+
""",
520+
literal_encoder: fn literal, _ -> {:ok, literal} end
521+
522+
assert_same """
523+
block do
524+
# before 1
525+
Mix.install([1 + 1])
526+
527+
# before 2
528+
Mix.install([2 + 2])
529+
end
530+
""",
531+
literal_encoder: fn literal, _ -> {:ok, literal} end
510532
end
511533

512534
test "before and after expressions with newlines" do

0 commit comments

Comments
 (0)