Let APT macro blocks end at the last brace on the line - #1069
Open
slachiewicz wants to merge 1 commit into
Open
Conversation
MacroBlock.traverse() located the end of the macro with indexOf('}'),
which is the *first* closing brace. A parameter value containing braces
therefore truncated the macro, silently dropping the rest of the value.
This shows up when the raw source of a *.apt.vm file is parsed, where
Velocity references are still unresolved:
%{snippet|file=${project.build.directory}/test-classes/resolve.txt}
parsed as file=${project.build.directory}, dropping the path. In a normal
site build Velocity runs first so no brace remains, but doxia-converter
parses the unprocessed source and lost the parameter.
The macro block always ends with the closing brace, so use lastIndexOf.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
MacroBlock.traverse() located the end of the macro with indexOf('}'),
which is the first closing brace. A parameter value containing braces
therefore truncated the macro, silently dropping the rest of the value.
This shows up when the raw source of a *.apt.vm file is parsed, where
Velocity references are still unresolved:
%{snippet|file=${project.build.directory}/test-classes/resolve.txt}
parsed as file=${project.build.directory}, dropping the path. In a normal
site build Velocity runs first so no brace remains, but doxia-converter
parses the unprocessed source and lost the parameter.
The macro block always ends with the closing brace, so use lastIndexOf.
Part of the wider migration tracked in
apache/maven-doxia-converter#139