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 be9849ac705fe12a53bba9ef6fe125ef85fff2bc Author: ddekany <[email protected]> AuthorDate: Sun Apr 7 09:18:36 2024 +0200 TemplateProcessingTracer: Pass the element to exitElement too. --- freemarker-core/src/main/java/freemarker/core/Environment.java | 2 +- freemarker-core/src/main/java/freemarker/core/ListElseContainer.java | 2 +- .../src/main/java/freemarker/core/TemplateProcessingTracer.java | 2 +- .../src/test/java/freemarker/core/TemplateProcessingTracerTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/freemarker-core/src/main/java/freemarker/core/Environment.java b/freemarker-core/src/main/java/freemarker/core/Environment.java index a24c3333..9907ee07 100644 --- a/freemarker-core/src/main/java/freemarker/core/Environment.java +++ b/freemarker-core/src/main/java/freemarker/core/Environment.java @@ -2919,7 +2919,7 @@ public final class Environment extends Configurable { private void popElement() { if (templateProcessingTracer != null) { TemplateElement element = instructionStack[instructionStackSize - 1]; - templateProcessingTracer.exitElement(this); + templateProcessingTracer.exitElement(this, element); } instructionStackSize--; } diff --git a/freemarker-core/src/main/java/freemarker/core/ListElseContainer.java b/freemarker-core/src/main/java/freemarker/core/ListElseContainer.java index 4e307c37..96779a67 100644 --- a/freemarker-core/src/main/java/freemarker/core/ListElseContainer.java +++ b/freemarker-core/src/main/java/freemarker/core/ListElseContainer.java @@ -47,7 +47,7 @@ class ListElseContainer extends TemplateElement { try { hadItems = listPart.acceptWithResult(env); } finally { - templateProcessingTracer.exitElement(env); + templateProcessingTracer.exitElement(env, listPart); } } diff --git a/freemarker-core/src/main/java/freemarker/core/TemplateProcessingTracer.java b/freemarker-core/src/main/java/freemarker/core/TemplateProcessingTracer.java index 2130e6c4..d16be39b 100644 --- a/freemarker-core/src/main/java/freemarker/core/TemplateProcessingTracer.java +++ b/freemarker-core/src/main/java/freemarker/core/TemplateProcessingTracer.java @@ -48,7 +48,7 @@ public interface TemplateProcessingTracer { * * @since 2.3.23 */ - void exitElement(Environment env); + void exitElement(Environment env, TracedElement tracedElement); /** * Information about the template element that we enter of exit. diff --git a/freemarker-core/src/test/java/freemarker/core/TemplateProcessingTracerTest.java b/freemarker-core/src/test/java/freemarker/core/TemplateProcessingTracerTest.java index c73554d8..767187ba 100644 --- a/freemarker-core/src/test/java/freemarker/core/TemplateProcessingTracerTest.java +++ b/freemarker-core/src/test/java/freemarker/core/TemplateProcessingTracerTest.java @@ -238,7 +238,7 @@ public class TemplateProcessingTracerTest { } } - public void exitElement(Environment env) { + public void exitElement(Environment env, TracedElement tracedElement) { indentation = indentation.isEmpty() ? null : indentation.substring(0, indentation.length() - 1); } }
