Merge pull request RPTools#5227 from fishface60/fix-strformat-newline

Support strformat literals without passing args
kwvanderlinde · Feb 13, 2025 · ab44985 · ab44985
2 parents d8a0cbf + 97cf72c
commit ab44985
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/functions/StringFunctions.java b/src/main/java/net/rptools/maptool/client/functions/StringFunctions.java
@@ -230,11 +230,7 @@ public Object childEvaluate(
       }
       if (functionName.equalsIgnoreCase("strformat")) {
         int size = parameters.size();
-        if (size > 1) {
-          return format(parameters.get(0).toString(), resolver, parameters.subList(1, size));
-        } else {
-          return format(parameters.get(0).toString(), resolver, null);
-        }
+        return format(parameters.get(0).toString(), resolver, parameters.subList(1, size));
       }
       if (functionName.equalsIgnoreCase("matches")) {
         if (parameters.size() < 2) {
@@ -443,10 +439,6 @@ public String format(String string, VariableResolver resolver, List<Object> args
     }
     m.appendTail(sb);
 
-    if (args == null) {
-      return sb.toString();
-    }
-
     Object[] argArray = args.toArray();
 
     // Change all integers in BigDecimal to BigIntegers so formating specifiers work correctly.