commit c38c88765d1f00e74fa5d3a2623733c6ccf26f64
author Alon Ziv <nolaviz@google.com> Fri May 26 16:28:24 2023 +0000
committer Alon Ziv <nolaviz@google.com> Fri May 26 16:28:24 2023 +0000
tree ab145c4d474c932d7ae177f039d9f511c20bf644
parent 020e54e935ae55f4a3779a4c42c9d7c0c43d92e6

Change error messages to explicitly refer to auto_escaping_policy.

src/main/javacc/FTL.jj

diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj
index a64e76d..6bf25c2 100644
--- a/src/main/javacc/FTL.jj
+++ b/src/main/javacc/FTL.jj
@@ -240,7 +240,7 @@
 	if (!(outputFormat instanceof MarkupOutputFormat)
 	    && autoEscapingPolicy == Configuration.FORCE_AUTO_ESCAPING_POLICY) {
 	    throw new IllegalArgumentException(
-                    "Non-markup output format cannot be used when auto-escaping is forced.");
+                    "Non-markup output format cannot be used when auto_scaping_policy is FORCE_AUTO_ESCAPING_POLICY.");
 	}
         recalculateAutoEscapingField();
 
@@ -2233,7 +2233,8 @@
 	if (result instanceof BuiltInBannedWhenForcedAutoEscaping) {
 	    if (autoEscapingPolicy == Configuration.FORCE_AUTO_ESCAPING_POLICY) {
 	        throw new ParseException(
-		        "Using ?" + t.image + " is not allowed while auto-escaping is forced.", template, t);
+		        "Using ?" + t.image + " is not allowed while auto_escaping_policy is FORCE_AUTO_ESCAPING_POLICY.",
+			template, t);
 	    }
 	}
 
@@ -4062,7 +4063,8 @@
 	    if (!(outputFormat instanceof MarkupOutputFormat)
 	    	&& autoEscapingPolicy == Configuration.FORCE_AUTO_ESCAPING_POLICY) {
 	        throw new ParseException(
-			"Non-markup output format cannot be used when auto-escaping is forced.", template, start);
+			"Non-markup output format cannot be used when auto_escaping_policy is FORCE_AUTO_ESCAPING_POLICY.",
+			template, start);
 	    }
             recalculateAutoEscapingField();
         } catch (IllegalArgumentException e) {
@@ -4120,7 +4122,8 @@
     {
 	if (autoEscapingPolicy == Configuration.FORCE_AUTO_ESCAPING_POLICY) {
 	    throw new ParseException(
-	    	"Auto-escaping mode is forced; <#noautoesc> cannot be used.", template, start);
+	    	"<#noautoesc> cannot be used when auto_escaping_policy is FORCE_AUTO_ESCAPING_POLICY.",
+		template, start);
 	}
         lastAutoEscapingPolicy = autoEscapingPolicy;
         autoEscapingPolicy = Configuration.DISABLE_AUTO_ESCAPING_POLICY;
@@ -4563,7 +4566,8 @@
                             } else {
 				if (autoEscapingPolicy == Configuration.FORCE_AUTO_ESCAPING_POLICY) {
 				    throw new ParseException(
-				            "Auto-escaping is forced and cannot be disabled.", exp);
+				            "auto_esc setting cannot be used when auto_escaping_policy is FORCE_AUTO_ESCAPING_POLICY.",
+					    exp);
 				}
                                 autoEscapingPolicy = Configuration.DISABLE_AUTO_ESCAPING_POLICY;
                             }

src/test/java/freemarker/core/OutputFormatTest.java

diff --git a/src/test/java/freemarker/core/OutputFormatTest.java b/src/test/java/freemarker/core/OutputFormatTest.java
index bb442fe..6e53c7a 100644
--- a/src/test/java/freemarker/core/OutputFormatTest.java
+++ b/src/test/java/freemarker/core/OutputFormatTest.java
@@ -860,9 +860,9 @@
         assertOutput(commonFTL, esced);
 
         cfg.setOutputFormat(DummyOutputFormat.INSTANCE);
-        assertErrorContains("<#outputformat 'plainText'></#outputformat>", "auto-escaping is forced");
-        assertErrorContains("<#noAutoEsc></#noAutoEsc>", "Auto-escaping mode is forced");
-        assertErrorContains("<#assign foo='bar'>${foo?noEsc}", "auto-escaping is forced");
+        assertErrorContains("<#outputformat 'plainText'></#outputformat>", "auto_escaping_policy is FORCE_AUTO_ESCAPING_POLICY");
+        assertErrorContains("<#noAutoEsc></#noAutoEsc>", "auto_escaping_policy is FORCE_AUTO_ESCAPING_POLICY");
+        assertErrorContains("<#assign foo='bar'>${foo?noEsc}", "auto_escaping_policy is FORCE_AUTO_ESCAPING_POLICY");
     }
 
     @Test