Skip to content

[GROOVY-8100] MarkupBuilder - yield before any markup (state == 0) #1284

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
daniellansun merged 2 commits into from
Jun 21, 2020
Merged

[GROOVY-8100] MarkupBuilder - yield before any markup (state == 0) #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f4589e
Yield before any markup (state == 0)
eddelplus Jun 20, 2020
c14f0f3
[GROOVY-8100] Test for mkp.yield/yieldUnescaped
eddelplus Jun 21, 2020
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
2 changes: 1 addition & 1 deletion subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ void yield(String value, boolean escaping) {
this.nodeIsEmpty = false;
out.print(">");
}
if (state == 2 || state == 3) {
if (state == 0 || state == 2 || state == 3) {
out.print(escaping ? escapeElementContent(value) : value);
}
}
Expand Down
16 changes: 16 additions & 0 deletions subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupBuilderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,22 @@ class MarkupBuilderTest extends BuilderTestSupport {
'''
}

void testMkpYield() {
xml.mkp.yieldUnescaped("<?xml version='1.0' encoding='UTF-8'?>\n")
xml.element {
mkp.yield("<>")
xml.inner("foo") { mkp.yield('bar') }
mkp.yieldUnescaped("\n <inside>wow</inside>")
}
String expectedXml = '''\
<?xml version='1.0' encoding='UTF-8'?>
<element>&lt;&gt;
<inner>foobar</inner>
<inside>wow</inside>
</element>'''
assertEquals expectedXml, fixEOLs(writer.toString())
}

void testWithIndentPrinter() {
xml = new MarkupBuilder(new IndentPrinter(new PrintWriter(writer), "", false))
xml.element(att1:'attr') { subelement('foo') }
Expand Down