Extract static function isNoteTagOrExprChar

jasmith-hs · jasmith-hs · commit 160c25461a5d · 2023-10-27T13:22:36.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/tree/output/OutputList.java b/src/main/java/com/hubspot/jinjava/tree/output/OutputList.java
@@ -71,16 +71,7 @@ private String joinNodesWithoutAddingExpressions(
     LengthLimitingStringBuilder val,
     TokenScannerSymbols tokenScannerSymbols
   ) {
-    @SuppressWarnings("StringBufferReplaceableByString")
-    String separator = new StringBuilder()
-      .append('\n')
-      .append(tokenScannerSymbols.getPrefixChar())
-      .append(tokenScannerSymbols.getNoteChar())
-      .append(tokenScannerSymbols.getTrimChar())
-      .append(' ')
-      .append(tokenScannerSymbols.getNoteChar())
-      .append(tokenScannerSymbols.getExprEndChar())
-      .toString();
+    String separator = getWhitespaceSeparator(tokenScannerSymbols);
     String prev = null;
     String cur;
     for (OutputNode node : nodes) {
@@ -93,11 +84,7 @@ private String joinNodesWithoutAddingExpressions(
         ) {
           if (
             cur.length() > 0 &&
-            (
-              cur.charAt(0) == tokenScannerSymbols.getTag() ||
-              cur.charAt(0) == tokenScannerSymbols.getExprStartChar() ||
-              cur.charAt(0) == tokenScannerSymbols.getNoteChar()
-            )
+            TokenScannerSymbols.isNoteTagOrExprChar(tokenScannerSymbols, cur.charAt(0))
           ) {
             val.append(separator);
           }
@@ -115,6 +102,20 @@ private String joinNodesWithoutAddingExpressions(
     return val.toString();
   }
 
+  private static String getWhitespaceSeparator(TokenScannerSymbols tokenScannerSymbols) {
+    @SuppressWarnings("StringBufferReplaceableByString")
+    String separator = new StringBuilder()
+      .append('\n')
+      .append(tokenScannerSymbols.getPrefixChar())
+      .append(tokenScannerSymbols.getNoteChar())
+      .append(tokenScannerSymbols.getTrimChar())
+      .append(' ')
+      .append(tokenScannerSymbols.getNoteChar())
+      .append(tokenScannerSymbols.getExprEndChar())
+      .toString();
+    return separator;
+  }
+
   private String joinNodes(LengthLimitingStringBuilder val) {
     for (OutputNode node : nodes) {
       try {
diff --git a/src/main/java/com/hubspot/jinjava/tree/parse/TokenScannerSymbols.java b/src/main/java/com/hubspot/jinjava/tree/parse/TokenScannerSymbols.java
@@ -122,4 +122,10 @@ public String getClosingComment() {
     }
     return closingComment;
   }
+
+  public static boolean isNoteTagOrExprChar(TokenScannerSymbols symbols, char c) {
+    return (
+      c == symbols.getNote() || c == symbols.getTag() || c == symbols.getExprStartChar()
+    );
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,4 +122,10 @@ public String getClosingComment() {`
`122`	`122`	`}`
`123`	`123`	`return closingComment;`
`124`	`124`	`}`
	`125`	`+`
	`126`	`+ public static boolean isNoteTagOrExprChar(TokenScannerSymbols symbols, char c) {`
	`127`	`+ return (`
	`128`	`+ c == symbols.getNote() \|\| c == symbols.getTag() \|\| c == symbols.getExprStartChar()`
	`129`	`+ );`
	`130`	`+ }`
`125`	`131`	`}`