Skip to content

Optimize EEx fn block detection #15738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josevalim merged 1 commit into from
Aug 12, 2026
+7 −5
Merged

Optimize EEx fn block detection #15738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions lib/eex/lib/eex/compiler.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,8 @@ defmodule EEx.Compiler do
{[{:end, _} | _], [{:stab_op, _, _} | _]} ->
{:middle_expr, expr, %{}}

{_, [{:stab_op, _, _} | reverse_tokens]} ->
fn_index = Enum.find_index(reverse_tokens, &match?({:fn, _}, &1)) || :infinity
end_index = Enum.find_index(reverse_tokens, &match?({:end, _}, &1)) || :infinity

if end_index > fn_index do
{_, [{:stab_op, _, _} | rev_tokens]} ->
if fn_before_end?(rev_tokens) do
{:start_expr, expr, %{}}
else
{:middle_expr, expr, %{}}
Expand All @@ -227,6 +224,11 @@ defmodule EEx.Compiler do
end
end

defp fn_before_end?([{:fn, _} | _]), do: true
defp fn_before_end?([{:end, _} | _]), do: false
defp fn_before_end?([_ | rev_tokens]), do: fn_before_end?(rev_tokens)
defp fn_before_end?([]), do: false

defp drop_eol([{:eol, _} | rest]), do: drop_eol(rest)
defp drop_eol(rest), do: rest

Expand Down
Loading