Engine: Inline comments on <% end %> on output blocks produce invalid Ruby

lib/herb/engine.rb

@@ -286,14 +286,25 @@ def add_expression_block_end(code, escaped: false)
 
       @src.chomp! if @src.end_with?("\n") && code_stripped.start_with?(" ")
 
-      @src << " " << code_stripped
-      @src << (escaped ? "))" : ")")
-
-      @src << if code.include?("#") || trailing_newline
-                "\n"
-              else
-                ";"
-              end
+      has_comment = code.include?("#")
+      closing = escaped ? "))" : ")"
+
+      if has_comment
+        comment_index = code_stripped.index("#")
+        code_part = code_stripped[0...comment_index].rstrip
+        comment_part = code_stripped[comment_index..]
+
+        @src << " " << code_part << closing << " " << comment_part << "\n"
+      else
+        @src << " " << code_stripped
+        @src << closing
+
+        @src << if trailing_newline
+                  "\n"
+                else
+                  ";"
+                end
+      end
 
       @buffer_on_stack = false
     end

test/engine/engine_block_test.rb

@@ -107,5 +107,11 @@ class EngineBlockTest < Minitest::Spec
 
       assert_compiled_snapshot(template)
     end
+
+    test "inline comment on end inside output block does not break parens" do
+      template = "<%= render Foo.new do %>hello<% end # comment %>"
+
+      assert_compiled_snapshot(template)
+    end
   end
 end