Reset context on body expression, closes #3590

lib/phoenix_live_view/tokenizer.ex

@@ -157,6 +157,7 @@ defmodule Phoenix.LiveView.Tokenizer do
 
   defp handle_text("{" <> rest, line, column, buffer, acc, %{braces: :enabled} = state) do
     text_to_acc = text_to_acc(buffer, acc, line, column, state.context)
+    state = put_in(state.context, [])
 
     case handle_interpolation(rest, line, column + 1, [], 0, state) do
       {:ok, value, new_line, new_column, rest} ->

test/phoenix_live_view/html_formatter_test.exs

@@ -435,6 +435,15 @@ defmodule Phoenix.LiveView.HTMLFormatterTest do
     )
   end
 
+  test "avoids additional whitespace on curly with html comments" do
+    assert_formatter_doesnt_change("""
+    <select>
+      <!-- Comment -->
+      {hello + world}
+    </select>
+    """)
+  end
+
   test "migrates from eex to curly braces" do
     input = """
       <section>

test/phoenix_live_view/tokenizer_test.exs

@@ -64,6 +64,15 @@ defmodule Phoenix.LiveView.TokenizerTest do
              ]
     end
 
+    test "followed by curly" do
+      assert tokenize("<!-- comment -->{hello}text") == [
+               {:text, "<!-- comment -->",
+                %{column_end: 17, context: [:comment_start, :comment_end], line_end: 1}},
+               {:body_expr, "hello", %{line: 1, column: 17}},
+               {:text, "text", %{line_end: 1, column_end: 28}}
+             ]
+    end
+
     test "multiple lines and wrapped by tags" do
       code = """
       <p>