Prevent accidental expressions from being output #1123
Merged
Conversation
This file contains 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
…tags/notes when PREVENT_ACCIDENTAL_EXPRESSIONS is enabled
boulter
approved these changes
Oct 24, 2023
Comment on lines
75
to
83
| String separator = new StringBuilder() | ||
| .append('\n') | ||
| .append(tokenScannerSymbols.getPrefixChar()) | ||
| .append(tokenScannerSymbols.getNoteChar()) | ||
| .append(tokenScannerSymbols.getTrimChar()) | ||
| .append(' ') | ||
| .append(tokenScannerSymbols.getNoteChar()) | ||
| .append(tokenScannerSymbols.getExprEndChar()) | ||
| .toString(); |
There was a problem hiding this comment.
You could create this statically.
There was a problem hiding this comment.
I'm not sure what you mean. Do you mean memoize it inside of TokenScannerSymbols? The result is different depending on what symbols are used
There was a problem hiding this comment.
I was thinking that TokenScannerSymbols were static. Doesn't seem that this will be called too often. If it does, then I think memoization would be helpful.
Comment on lines
97
to
99
| cur.charAt(0) == tokenScannerSymbols.getTag() || | ||
| cur.charAt(0) == tokenScannerSymbols.getExprStartChar() || | ||
| cur.charAt(0) == tokenScannerSymbols.getNoteChar() |
There was a problem hiding this comment.
Maybe this could be extracted to a useful function for checking if it's the start of something?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This adds a feature flag for
PREVENT_ACCIDENTAL_EXPRESSIONSwhere, when combining output, it will check if the last character of the previous node and the first character of the current node create a tag/expression/note start string. If so, it will add a\n{#- #}spacer, which, if the entire output is passed back to jinjava, will tokensise properly, and maintain the correct whitespace due to the left-trim of the note.Note/expression trimming is added in #1122
For example:
Would normally output as:
But with this feature enabled, it will output as:
Which will prevent a
PrintTagfrom being in it, if it were to be passed back into the interpreter.