This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3-gae in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 389a9e51f30341730ef287ade0c7c481ac9a043c Author: ddekany <[email protected]> AuthorDate: Sat Dec 16 22:26:46 2023 +0100 For PR #88 forceAutoEscape: Better error message, and test coverage for blocking <#ftl auto_esc=false> --- src/main/javacc/FTL.jj | 2 +- src/test/java/freemarker/core/OutputFormatTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj index bad64ca7..f4390862 100644 --- a/src/main/javacc/FTL.jj +++ b/src/main/javacc/FTL.jj @@ -4569,7 +4569,7 @@ void HeaderElement() : } else { if (autoEscapingPolicy == Configuration.FORCE_AUTO_ESCAPING_POLICY) { throw new ParseException( - forcedAutoEscapingPolicyExceptionMessage("auto_esc setting"), + forcedAutoEscapingPolicyExceptionMessage(ks + "=false"), exp); } autoEscapingPolicy = Configuration.DISABLE_AUTO_ESCAPING_POLICY; diff --git a/src/test/java/freemarker/core/OutputFormatTest.java b/src/test/java/freemarker/core/OutputFormatTest.java index a9de869c..7b8219f9 100644 --- a/src/test/java/freemarker/core/OutputFormatTest.java +++ b/src/test/java/freemarker/core/OutputFormatTest.java @@ -878,6 +878,8 @@ public class OutputFormatTest extends TemplateTest { assertErrorContains("", IllegalArgumentException.class, "plainText", "auto_escaping_policy", "force"); cfg.setOutputFormat(DummyOutputFormat.INSTANCE); + assertErrorContains("<#ftl auto_esc=false>", ParseException.class, + "auto_esc=false", "auto_escaping_policy", "force"); assertErrorContains("<#outputformat 'plainText'></#outputformat>", ParseException.class, "plainText", "auto_escaping_policy", "force"); assertErrorContains("<#noAutoEsc></#noAutoEsc>", ParseException.class,
