Repository: incubator-freemarker Updated Branches: refs/heads/3 6afa586f5 -> 59829da65
(Error message improvement) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/59829da6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/59829da6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/59829da6 Branch: refs/heads/3 Commit: 59829da651ef04e58643808f41c60387f11161d6 Parents: 6afa586 Author: ddekany <ddek...@apache.org> Authored: Fri Mar 9 22:41:22 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Fri Mar 9 22:41:22 2018 +0100 ---------------------------------------------------------------------- .../apache/freemarker/core/MacroCallerTemplateNameTest.java | 6 +++--- .../java/org/apache/freemarker/core/ASTExpBuiltInVariable.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/59829da6/freemarker-core-test/src/test/java/org/apache/freemarker/core/MacroCallerTemplateNameTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/MacroCallerTemplateNameTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/MacroCallerTemplateNameTest.java index 86e775f..d02a6dd 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/MacroCallerTemplateNameTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/MacroCallerTemplateNameTest.java @@ -32,15 +32,15 @@ public class MacroCallerTemplateNameTest extends TemplateTest { @Test public void testNoCaller() throws Exception { - assertErrorContains("${.macroCallerTemplateName}", "no macro caller"); + assertErrorContains("${.macroCallerTemplateName}", "no macro call"); assertErrorContains("" + "<#macro m><#nested></#macro>" + "<@m>${.macroCallerTemplateName}</@>", - "no macro caller"); + "no macro call"); addTemplate("main.ftl", "${.macroCallerTemplateName}"); - assertErrorContainsForNamed("main.ftl", "no macro caller"); + assertErrorContainsForNamed("main.ftl", "no macro call"); } @Test http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/59829da6/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java index ecfa9cf..d55883d 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java @@ -206,8 +206,9 @@ final class ASTExpBuiltInVariable extends ASTExpression { if (name == MACRO_CALLER_TEMPLATE_NAME) { Context ctx = env.getCurrentMacroContext(); if (ctx == null) { - throw new TemplateException("Can't get " + MACRO_CALLER_TEMPLATE_NAME - + " here, as there's no macro caller at this point."); + // TODO [FM3] Adjust error message if the special variable syntax is not `.someName` anymore. + throw new TemplateException( + "Can't get ." + MACRO_CALLER_TEMPLATE_NAME + " here, as there's no macro call in context."); } String name = ctx.callPlace.getTemplate().getLookupName(); return name != null ? new SimpleString(name) : TemplateStringModel.EMPTY_STRING;
