Skip to content

internal/compiler: fix macro statement rendering #997

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

Open
gazerro wants to merge 1 commit into
base: main
Choose a base branch
from
Open

internal/compiler: fix macro statement rendering #997

Show file tree
Hide file tree
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: 12 additions & 0 deletions internal/compiler/emitter_statements.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,18 @@ func (em *emitter) emitNodes(nodes []ast.Node) {
}

case ast.Expression:
// In templates, a macro call used as statement (for example
// `{% Content() %}` in an extending layout) must render directly to
// the current output format instead of discarding its result.
// Non-macro expressions keep the previous behavior.
if call, ok := node.(*ast.Call); ok {
if fn := em.ti(call.Func); fn != nil && fn.IsMacroDeclaration() {
em.fb.enterStack()
em.emitCallNode(call, false, false, em.fb.fn.Format)
em.fb.exitStack()
continue
}
}
em.fb.enterStack()
em.emitExprR(node, reflect.Type(nil), 0)
em.fb.exitStack()
Expand Down
15 changes: 15 additions & 0 deletions test/misc/multi_file_template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2250,6 +2250,21 @@ func TestMultiFileTemplate(t *testing.T) {
expectedOut: "foo",
},

"Using - show in Content block with extends and markdown": {
sources: fstest.Files{
"layout.html": `<html><body>{% Content() %}</body></html>`,
"macro.html": `{% macro M(s markdown) %}{% if s %}{{ s }}{% end %}{% end %}`,
"index.html": `
{% extends "layout.html" %}
{% import "macro.html" %}
{% Content %}{% show M(itea); using markdown %}
# title
hello
{% end using %}`,
},
expectedOut: "<html><body>--- start Markdown ---\n\n\t\t\t\t\t# title\n\t\t\t\t\thello\n\t\t\t\t\t--- end Markdown ---\n</body></html>",
},

"Using - show - Two using statement": {
sources: fstest.Files{
"index.txt": `{% show itea; using %}foo{% end using %}{% show itea; using %}bar{% end using %}`,
Expand Down