This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch FREEMARKER-35
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from 2a23b00b Merge remote-tracking branch 'origin/2.3-gae' into
FREEMARKER-35
add 5d16d1cc Fix string comparison to avoid using the collator.
Benchmarking has shown an up-to-1000x performance degradation from using the
collator.
add 611f27ef Unicode-normalize strings before comparing them.
add 1c274bc3 Only use the new logic (without Collator) when
`incompatibleImprovements` >= 2.3.33.
add dbacf3b5 Merge pull request #87 from nolaviz/nolaviz-devel
add 8b229bfb Additional documentation, and test for: PR #87 - Fix string
comparison to avoid using the collator
add d88154f9 (Minor javadoc content improvement)
add 93a96377 Solution for PR #97 Speedup ConcatenatedSequence iteration,
but it works differently as the PR.
add d75ddc6c Simplified ConcatenatedSequence iteration logic.
Non-recursive ConcatenatedSequence.size() to limit stack usage.
add d63b2766 README IntelliJ instructions adjusted
add 8ac81c61 Made ConcatenatedSequence.get(int) a lot less slow when it
was made from a lot of concatenated sequences. Not fast still, but way faster
in those cases, and is a backward compatible solution. (That is, it's a
solution that doesn't assume that the nested sequences weren't changed since
the concatenation. It could be much faster if we can assume that.)
add 4ca8c34a ConcatenatedSequence now also implements
TemplateCollectionModelEx, and thus has an isEmpty() that's more efficient than
size() == 0. Also extende the Unit test to check with more kind sequence
implementations, and with sequences containing null items.
add 020e54e9 Support "forced" auto-escaping policy.
add c38c8876 Change error messages to explicitly refer to
auto_escaping_policy.
add e5521545 Fix tyop.
add 9a19894d Merge pull request #88 from nolaviz/nolaviz-devel-forceautoesc
add cf5164ca For PR #88 forceAutoEscape: Better error messages. Some more
test coverage.
add c01e084c For PR #88 forceAutoEscape: Fixed javadoc error
add eb1a0ad2 For PR #88 forceAutoEscape: Postpone failing due to
non-escaping output format until we are past the #ftl header
add 389a9e51 For PR #88 forceAutoEscape: Better error message, and test
coverage for blocking <#ftl auto_esc=false>
add 6965a7ed For PR #88 forceAutoEscape: Documentation
add 2713f7ac Ensure the "else" part of a `#list` is evaluated in
`Environment.visit()`.
add 87568040 Add a `TemplateProcessingTracer` interface.
add 66857d98 Make the `TemplateProcessingTracer` interface slightly more
useful.
add d5c8c766 Merge pull request #89 from nolaviz/nolaviz-patch1
add 52992c34 PR #89 TemplateProcessingTracer reworked: - Instead of
passing several arguments to the TemplateProcessingTracer method, only pass a
single TracedElement object. This allow use to add new methods later without
breaking backward compatibility. - Added TracedElement.getDescription() to give
a single-line canonical description of the element (same format that we use in
FTL stack taces) - Expose the Environment object to TemplateProcessingTracer
methods - Do not expose the T [...]
new 9742e5e2 Merge remote-tracking branch 'origin/2.3-gae' into
FREEMARKER-35
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 7 +-
.../java/freemarker/core/AddConcatExpression.java | 261 ++++++++++++-
...va => BuiltInBannedWhenForcedAutoEscaping.java} | 6 +-
.../core/BuiltInsForOutputFormatRelated.java | 2 +-
src/main/java/freemarker/core/Configurable.java | 3 +-
src/main/java/freemarker/core/Environment.java | 36 ++
src/main/java/freemarker/core/EvalUtil.java | 9 +-
src/main/java/freemarker/core/IfBlock.java | 24 +-
.../java/freemarker/core/ListElseContainer.java | 21 +-
src/main/java/freemarker/core/TemplateElement.java | 8 +-
src/main/java/freemarker/core/TemplateObject.java | 24 +-
.../freemarker/core/TemplateProcessingTracer.java | 95 +++++
.../java/freemarker/template/Configuration.java | 32 +-
src/main/java/freemarker/template/Template.java | 16 +-
.../java/freemarker/template/_TemplateAPI.java | 2 +
src/main/javacc/FTL.jj | 62 ++-
src/manual/en_US/book.xml | 125 +++++-
.../freemarker/core/ConcatenatedSequenceTest.java | 421 +++++++++++++++++++++
.../java/freemarker/core/OutputFormatTest.java | 42 +-
.../core/TemplateProcessingTracerTest.java | 245 ++++++++++++
.../test/templatesuite/expected/comparisons.txt | 1 -
.../test/templatesuite/templates/comparisons.ftl | 22 ++
22 files changed, 1399 insertions(+), 65 deletions(-)
copy src/main/java/freemarker/core/{BuiltInBannedWhenAutoEscaping.java =>
BuiltInBannedWhenForcedAutoEscaping.java} (83%)
create mode 100644 src/main/java/freemarker/core/TemplateProcessingTracer.java
create mode 100644 src/test/java/freemarker/core/ConcatenatedSequenceTest.java
create mode 100644
src/test/java/freemarker/core/TemplateProcessingTracerTest.java
