⚒️ Fix ExprFormatTime CCE + Support non-literals

src/main/java/ch/njol/skript/expressions/ExprFormatTime.java → src/main/java/ch/njol/skript/expressions/ExprFormatDate.java

@@ -20,6 +20,8 @@
 
 import java.text.SimpleDateFormat;
 
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.VariableString;
 import org.bukkit.event.Event;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -31,52 +33,81 @@
 import ch.njol.skript.expressions.base.PropertyExpression;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
-import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.VariableString;
 import ch.njol.skript.util.Date;
 import ch.njol.skript.util.Getter;
 import ch.njol.util.Kleenean;
 
-@Name("Formatted Time")
-@Description("Converts date to human-readable text format. By default, 'yyyy-MM-dd HH:mm:ss z' (e.g. '2018-03-30 16:03:12 +01') will be used. For reference, see this "
-		+ "<a href=\"https://en.wikipedia.org/wiki/ISO_8601\">Wikipedia article</a>.")
-@Examples("now formatted human-readable")
-@Since("2.2-dev31")
-public class ExprFormatTime extends PropertyExpression<Date, String> {
+@Name("Formatted Date")
+@Description({
+	"Converts date to human-readable text format. By default, 'yyyy-MM-dd HH:mm:ss z' (e.g. '2018-03-30 16:03:12 +01') will be used. For reference, see this "
+		+ "<a href=\"https://en.wikipedia.org/wiki/ISO_8601\">Wikipedia article</a>."
+})
+@Examples({
+	"command /date:",
+		"\ttrigger:",
+			"\t\tsend \"Full date: %now formatted human-readable%\" to sender",
+			"\t\tsend \"Short date: %now formatted as \"\"yyyy-MM-dd\"\"%\" to sender"
+})
+@Since("2.2-dev31, INSERT VERSION (support variables in format)")
+public class ExprFormatDate extends PropertyExpression<Date, String> {
 
 	private static final String defaultFormat = "yyyy-MM-dd HH:mm:ss z";
 
 	static {
-		Skript.registerExpression(ExprFormatTime.class, String.class, ExpressionType.PROPERTY, "%dates% formatted [human-readable] [(with|as) %-string%]");
+		Skript.registerExpression(ExprFormatDate.class, String.class, ExpressionType.PROPERTY,
+			"%dates% formatted [human-readable] [(with|as) %-string%]",
+			"[human-readable] formatted %dates% [(with|as) %-string%]");
 	}
 
-	@SuppressWarnings("null")
+	@SuppressWarnings("NotNullFieldNotInitialized")
 	private SimpleDateFormat format;
 
+	@SuppressWarnings("NotNullFieldNotInitialized")
+	private Expression<? extends String> customFormat;
+
 	@Override
-	@SuppressWarnings("null")
+	@SuppressWarnings({"null", "unchecked"})
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		setExpr((Expression<? extends Date>) exprs[0]);
-		if (exprs[1] != null) {
-			if (!(exprs[1] instanceof Literal)) {
-				VariableString str = (VariableString) exprs[1];
-				if (!str.isSimple()) {
-					Skript.error("Date format must not contain variables!");
+		customFormat = (Expression<? extends String>) exprs[1];
+
+		if (customFormat instanceof Literal || (customFormat instanceof VariableString && ((VariableString) customFormat).isSimple())) {
+			String customFormatValue = customFormat.getSingle(null);
+			if (customFormatValue != null) {
+				try {
+					format = new SimpleDateFormat(customFormatValue);
+				} catch (IllegalArgumentException e) {
+					Skript.error("Invalid date format: " + customFormatValue);
 					return false;
 				}
 			}
-			format = new SimpleDateFormat((String) exprs[1].getSingle(null));
-		} else {
+		} else if (customFormat == null) {
 			format = new SimpleDateFormat(defaultFormat);
 		}
-		
+
 		return true;
 	}
 
-
 	@Override
 	protected String[] get(Event e, Date[] source) {
+		SimpleDateFormat format;
+		String formatString;
+
+		if (customFormat != null && this.format == null) { // customFormat is not Literal or VariableString
+			formatString = customFormat.getSingle(e);
+			if (formatString == null)
+				return null;
+
+			try {
+				format = new SimpleDateFormat(formatString);
+			} catch (IllegalArgumentException ex) {
+				return null;
+			}
+		} else {
+			format = this.format;
+		}
+
 		return get(source, new Getter<String, Date>() {
 			@Override
 			public String get(Date date) {
@@ -92,7 +123,7 @@ public Class<? extends String> getReturnType() {
 
 	@Override
 	public String toString(@Nullable Event e, boolean debug) {
-		return getExpr().toString(e, debug) + " formatted as " + format.toPattern();
+		return getExpr().toString(e, debug) + " formatted as " + (customFormat != null ? customFormat.toString(e, debug) : defaultFormat);
 	}
 
 }

src/test/skript/tests/regressions/4664-formatted time.sk

@@ -0,0 +1,20 @@
+test "formatted time":
+	set {_default} to "yyyy-MM-dd HH:mm:ss z"
+	set {_now} to now
+
+	set {_date1} to {_now} formatted
+	assert {_date1} = {_now} formatted as {_default} with "default date format failed ##1"
+
+	set {_date2} to {_now} formatted human-readable
+	assert {_date2} = {_now} formatted as {_default} with "default date format failed ##2"
+
+	set {_date3} to now formatted as "HH:mm"
+	assert length of {_date3} = 5 with "custom date format failed ##1"
+
+	set {_cFormat} to "hh:mm"
+	set {_date4} to now formatted as {_cFormat}
+	assert length of {_date4} = 5 with "custom date format failed ##2"
+
+	set {_cFormat2} to "i"
+	set {_date5} to now formatted as {_cFormat2}
+	assert {_date5} is not set with "custom date format failed ##3"