Fix handling of nested do expressions in EEx, closes #1710

Author: José Valim

lib/eex/lib/eex/compiler.ex

@@ -31,7 +31,7 @@ defmodule EEx.Compiler do
   defp generate_buffer([{ :start_expr, line, mark, chars }|t], buffer, scope, state) do
     { contents, t } = generate_buffer(t, "", [chars|scope], state.dict([]).line(line).start_line(line))
     buffer = state.engine.handle_expr(buffer, mark, contents)
-    generate_buffer(t, buffer, scope, state.dict([]))
+    generate_buffer(t, buffer, scope, state)
   end
 
   defp generate_buffer([{ :middle_expr, line, _, chars }|t], buffer, [current|scope], state) do

lib/eex/test/eex_test.exs

@@ -264,6 +264,21 @@ foo
     assert_eval expected, string
   end
 
+  test "evaluates nested do expressions" do
+    string = """
+    <% y = ["a", "b", "c"] %>
+    <%= cond do %>
+     <% "a" in y -> %>
+      Good
+     <% true -> %>
+      <% if true do %>true<% else %>false<% end %>
+      Bad
+    <% end %>
+    """
+
+    assert_eval "\n\n  Good\n \n", string
+  end
+
   test "unicode" do
     template = """
       • <%= "•" %> •