Skip to content

In EscapeJinjavaFilter, escape both double closing braces to not have better consistency #1027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasmith-hs merged 1 commit into from
Mar 20, 2023
+2 −1
Merged

In EscapeJinjavaFilter, escape both double closing braces to not have better consistency #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
In EscapeJinjavaFilter, escape both double closing braces to not have… 
… a mismatch
  • Loading branch information
@jasmith-hs
jasmith-hs committed Mar 10, 2023
commit 29a7c0996904f60f9c032e3ac888eb3e4c265b97
1 change: 1 addition & 0 deletions src/main/java/com/hubspot/jinjava/lib/filter/EscapeJinjavaFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public static String escapeJinjavaEntities(String input) {
public static String escapeFullJinjavaEntities(String input) {
return input
.replace("{{", BLBRACE + BLBRACE)
.replace("}}", BRBRACE + BRBRACE)
.replaceAll("\\{([{%#])", BLBRACE + "$1")
.replaceAll("([}%#])}", "$1" + BRBRACE);
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/hubspot/jinjava/lib/filter/EscapeJinjavaFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void testDoesNotEscapeJson() {
f.filter("{'foo': 'bar', '{{{ foo }}}': '{% bar %}'}", interpreter, "false")
)
.isEqualTo(
"{'foo': 'bar', '{{{ foo }}}': '{% bar %}'}"
"{'foo': 'bar', '{{{ foo }}}': '{% bar %}'}"
);
}
}