sovdeeth
diff --git a/‎src/main/java/ch/njol/skript/doc/Documentation.java‎
Lines changed: 3 additions & 3 deletions b/‎src/main/java/ch/njol/skript/doc/Documentation.java‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/main/java/ch/njol/skript/lang/SkriptParser.java‎
Lines changed: 41 additions & 197 deletions b/‎src/main/java/ch/njol/skript/lang/SkriptParser.java‎
Lines changed: 41 additions & 197 deletions
@@ -7,7 +7,6 @@
 import ch.njol.skript.lang.SkriptEventInfo;
 import ch.njol.skript.lang.SyntaxElementInfo;
 import ch.njol.skript.lang.function.Functions;
-import ch.njol.skript.lang.function.Parameter;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.NonNullPair;
@@ -16,6 +15,7 @@
 import ch.njol.util.coll.iterator.IteratorIterable;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.common.function.Parameter;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -387,8 +387,8 @@ private static void insertFunction(PrintWriter pw, ch.njol.skript.lang.function.
 		}
 
 		StringBuilder params = new StringBuilder();
-		for (Parameter<?> p : func.getParameters()) {
-			if (params.length() != 0)
+		for (Parameter<?> p : func.getSignature().parameters().all()) {
+			if (!params.isEmpty())
 				params.append(", ");
 			params.append(p.toString());
 		}
 
@@ -13,8 +13,6 @@
 import ch.njol.skript.lang.DefaultExpressionUtils.DefaultExpressionError;
 import ch.njol.skript.lang.function.ExprFunctionCall;
 import ch.njol.skript.lang.function.FunctionReference;
-import ch.njol.skript.lang.function.FunctionRegistry;
-import ch.njol.skript.lang.function.Functions;
 import ch.njol.skript.lang.parser.DefaultValueData;
 import ch.njol.skript.lang.parser.ParseStackOverflowException;
 import ch.njol.skript.lang.parser.ParserInstance;
@@ -45,6 +43,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.common.function.FunctionReferenceParser;
 import org.skriptlang.skript.lang.converter.Converters;
 import org.skriptlang.skript.lang.experiment.ExperimentSet;
 import org.skriptlang.skript.lang.experiment.ExperimentalSyntax;
@@ -58,7 +57,6 @@
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
@@ -519,11 +517,10 @@ private static <T extends SyntaxElement> boolean checkExperimentalSyntax(T eleme
 					log.printError();
 					return null;
 				}
-				FunctionReference<T> functionReference = parseFunction(types);
+				org.skriptlang.skript.common.function.FunctionReference<T> functionReference = parseFunctionReference();
 				if (functionReference != null) {
 					log.printLog();
-					//noinspection rawtypes
-					return new ExprFunctionCall(functionReference);
+					return new ExprFunctionCall<>(functionReference, types);
 				} else if (log.hasError()) {
 					log.printError();
 					return null;
@@ -675,9 +672,8 @@ private static <T extends SyntaxElement> boolean checkExperimentalSyntax(T eleme
 				}
 
 				// If it wasn't variable, do same for function call
-				FunctionReference<?> functionReference = parseFunction(types);
+				org.skriptlang.skript.common.function.FunctionReference<?> functionReference = parseFunctionReference();
 				if (functionReference != null) {
-
 					if (onlySingular && !functionReference.isSingle()) {
 						Skript.error("'" + expr + "' can only be a single "
 							+ Classes.toString(Stream.of(exprInfo.classes).map(classInfo -> classInfo.getName().toString()).toArray(), false)
@@ -687,7 +683,7 @@ private static <T extends SyntaxElement> boolean checkExperimentalSyntax(T eleme
 					}
 
 					log.printLog();
-					return new ExprFunctionCall<>(functionReference);
+					return new ExprFunctionCall<>(functionReference, types);
 				} else if (log.hasError()) {
 					log.printError();
 					return null;
@@ -907,12 +903,7 @@ private boolean checkAcceptedType(Class<?> clazz, Class<?> ... types) {
 	private final static String MULTIPLE_AND_OR = "List has multiple 'and' or 'or', will default to 'and'. Use brackets if you want to define multiple lists.";
 	private final static String MISSING_AND_OR = "List is missing 'and' or 'or', defaulting to 'and'";
 
-	private boolean suppressMissingAndOrWarnings = SkriptConfig.disableMissingAndOrWarnings.value();
-
-	private SkriptParser suppressMissingAndOrWarnings() {
-		suppressMissingAndOrWarnings = true;
-		return this;
-	}
+	private final boolean suppressMissingAndOrWarnings = SkriptConfig.disableMissingAndOrWarnings.value();
 
 	@SafeVarargs
 	public final <T> @Nullable Expression<? extends T> parseExpression(Class<? extends T>... types) {
@@ -1185,173 +1176,38 @@ private record OrderedExprInfo(ExprInfo[] infos) { }
 	 * Function parsing
 	 */
 
-	private final static Pattern FUNCTION_CALL_PATTERN = Pattern.compile("(" + Functions.functionNamePattern + ")\\((.*)\\)");
-
+  
 	/**
-	 * @param types The required return type or null if it is not used (e.g. when calling a void function)
-	 * @return The parsed function, or null if the given expression is not a function call or is an invalid function call (check for an error to differentiate these two)
+	 * Attempts to parse {@link SkriptParser#expr} as a function reference.
+	 *
+	 * @param <T> The return type of the function.
+	 * @return A {@link FunctionReference} if a function is found, or {@code null} if none is found.
 	 */
-	@SuppressWarnings("unchecked")
-	public <T> @Nullable FunctionReference<T> parseFunction(@Nullable Class<? extends T>... types) {
-		if (context != ParseContext.DEFAULT && context != ParseContext.EVENT)
-			return null;
-		try (ParseLogHandler log = SkriptLogger.startParseLogHandler()) {
-			Matcher matcher = FUNCTION_CALL_PATTERN.matcher(expr);
-			if (!matcher.matches()) {
-				log.printLog();
-				return null;
-			}
-
-			String functionName = matcher.group(1);
-			String args = matcher.group(2);
-
-			// Check for incorrect quotes, e.g. "myFunction() + otherFunction()" being parsed as one function
-			// See https://github.com/SkriptLang/Skript/issues/1532
-			for (int i = 0; i < args.length(); i = next(args, i, context)) {
-				if (i == -1) {
-					log.printLog();
-					return null;
-				}
-			}
-
-			if ((flags & PARSE_EXPRESSIONS) == 0) {
-				Skript.error("Functions cannot be used here (or there is a problem with your arguments).");
-				log.printError();
-				return null;
-			}
-
-			SkriptParser skriptParser = new SkriptParser(args, flags | PARSE_LITERALS, context)
-				.suppressMissingAndOrWarnings();
-			Expression<?>[] params = args.isEmpty() ? new Expression[0] : null;
-
-			String namespace = null;
-			ParserInstance parser = getParser();
-			if (parser.isActive()) {
-				namespace = parser.getCurrentScript().getConfig().getFileName();
-			}
-
-			if (params == null) { // there are arguments to parse
-				// determine signatures that could match
-				var signatures = FunctionRegistry.getRegistry().getSignatures(namespace, functionName).stream()
-					.filter(signature -> {
-						if (signature.getMaxParameters() == 0) { // we have arguments, but this function doesn't
-							return false;
-						}
-						if (types != null) { // filter signatures based on expected return type
-							if (signature.getReturnType() == null) {
-								return false;
-							}
-							Class<?> signatureType = signature.getReturnType().getC();
-							for (Class<?> type : types) {
-								//noinspection DataFlowIssue - individual elements won't be null
-								if (Converters.converterExists(signatureType, type)) {
-									return true;
-								}
-							}
-							return false;
-						}
-						return true;
-					})
-					.toList();
-
-				// here, we map all signatures into type/plurality collections
-				// for example, all possible types (and whether they are plural) for the first parameter
-				//  will be mapped into the 0-index of both collections
-				record SignatureData(ClassInfo<?> classInfo, boolean plural) { }
-				List<List<SignatureData>> signatureDatas = new ArrayList<>();
-				boolean trySingle = false;
-				boolean trySinglePlural = false;
-				for (var signature : signatures) {
-					trySingle |= signature.getMinParameters() <= 1 || signature.getMaxParameters() == 1;
-					trySinglePlural |= trySingle && !signature.getParameter(0).isSingleValue();
-					for (int i = 0; i < signature.getMaxParameters(); i++) {
-						if (signatureDatas.size() <= i) {
-							signatureDatas.add(new ArrayList<>());
-						}
-						var parameter = signature.getParameter(i);
-						signatureDatas.get(i).add(new SignatureData(parameter.getType(), !parameter.isSingleValue()));
-					}
-				}
-				ExprInfo[] signatureInfos = new ExprInfo[signatureDatas.size()];
-				for (int infoIndex = 0; infoIndex < signatureInfos.length; infoIndex++) {
-					List<SignatureData> datas = signatureDatas.get(infoIndex);
-					ClassInfo<?>[] infos = new ClassInfo[datas.size()];
-					boolean[] isPlural = new boolean[infos.length];
-					for (int dataIndex = 0; dataIndex < infos.length; dataIndex++) {
-						SignatureData data = datas.get(dataIndex);
-						infos[dataIndex] = data.classInfo;
-						isPlural[dataIndex] = data.plural;
-					}
-					signatureInfos[infoIndex] = new ExprInfo(infos, isPlural);
-				}
-				OrderedExprInfo orderedExprInfo = new OrderedExprInfo(signatureInfos);
-
-				if (trySingle) {
-					params = this.getFunctionArguments(
-						() -> skriptParser.parseSingleExpr(true, null, orderedExprInfo.infos[0]),
-						args);
-					if (params == null && trySinglePlural) {
-						log.clear();
-						log.clearError();
-						try (ParseLogHandler listLog = SkriptLogger.startParseLogHandler()) {
-							params = this.getFunctionArguments(
-								() -> skriptParser.parseExpressionList(listLog, orderedExprInfo.infos[0]),
-								args);
-						}
-					}
-				}
-				if (params == null) {
-					log.clear();
-					log.clearError();
-					try (ParseLogHandler listLog = SkriptLogger.startParseLogHandler()) {
-						params = this.getFunctionArguments(
-							() -> skriptParser.parseExpressionList(listLog, orderedExprInfo),
-							args);
-					}
-				}
-				if (params == null) {
-					log.printError();
-					return null;
-				}
-			}
-
-			for (Expression<?> param : params) {
-				if (KeyProviderExpression.areKeysRecommended(param))
-					param.returnNestedStructures(true);
-			}
-			FunctionReference<T> functionReference = new FunctionReference<>(functionName, SkriptLogger.getNode(), namespace, types, params);
-			if (!functionReference.validateFunction(true)) {
-				log.printError();
-				return null;
-			}
-			log.printLog();
-			return functionReference;
+	public <T> org.skriptlang.skript.common.function.FunctionReference<T> parseFunctionReference() {
+		if (context == ParseContext.DEFAULT || context == ParseContext.EVENT) {
+			return new FunctionReferenceParser(context, flags).parseFunctionReference(expr);
 		}
+		return null;
 	}
 
-	private Expression<?> @Nullable [] getFunctionArguments(Supplier<Expression<?>> parsing, String args) {
-		if (args.isEmpty()) {
-			return new Expression[0];
+	/**
+	 * @deprecated Use {@link #parseFunctionReference()} instead.
+	 */
+	@Deprecated(forRemoval = true, since = "INSERT VERSION")
+	public <T> @Nullable FunctionReference<T> parseFunction(@Nullable Class<? extends T>... types) {
+		if (context != ParseContext.DEFAULT && context != ParseContext.EVENT) {
+			return null;
 		}
-
-		Expression<?> parsedExpression = parsing.get();
-		if (parsedExpression == null) {
+		var newReference = new FunctionReferenceParser(context, flags).parseFunctionReference(expr);
+		if (newReference == null) {
 			return null;
 		}
 
-		Expression<?>[] params;
-		if (parsedExpression instanceof ExpressionList) {
-			if (!parsedExpression.getAnd()) {
-				Skript.error("Function arguments must be separated by commas and optionally an 'and', but not an 'or'."
-								 + " Put the 'or' into a second set of parentheses if you want to make it a single parameter, e.g. 'give(player, (sword or axe))'");
-				return null;
-			}
-			params = ((ExpressionList<?>) parsedExpression).getExpressions();
-		} else {
-			params = new Expression[] {parsedExpression};
-		}
+		var expressions = Arrays.stream(newReference.arguments())
+				.map(org.skriptlang.skript.common.function.FunctionReference.Argument::value)
+				.toArray(Expression[]::new);
 
-		return params;
+		return new FunctionReference<>(newReference.name(), null, newReference.namespace(), types, expressions);
 	}
 
 	/*
@@ -1596,22 +1452,24 @@ public static int next(String expr, int startIndex, ParseContext context) {
 			return startIndex + 1;
 
 		int index;
-		switch (expr.charAt(startIndex)) {
-			case '"':
+		return switch (expr.charAt(startIndex)) {
+			case '"' -> {
 				index = nextQuote(expr, startIndex + 1);
-				return index < 0 ? -1 : index + 1;
-			case '{':
+				yield index < 0 ? -1 : index + 1;
+			}
+			case '{' -> {
 				index = VariableString.nextVariableBracket(expr, startIndex + 1);
-				return index < 0 ? -1 : index + 1;
-			case '(':
+				yield index < 0 ? -1 : index + 1;
+			}
+			case '(' -> {
 				for (index = startIndex + 1; index >= 0 && index < exprLength; index = next(expr, index, context)) {
 					if (expr.charAt(index) == ')')
-						return index + 1;
+						yield index + 1;
 				}
-				return -1;
-			default:
-				return startIndex + 1;
-		}
+				yield -1;
+			}
+			default -> startIndex + 1;
+		};
 	}
 
 	/**
@@ -1816,18 +1674,4 @@ private static ParserInstance getParser() {
 		ParserInstance.registerData(DefaultValueData.class, DefaultValueData::new);
 	}
 
-	/**
-	 * @deprecated due to bad naming conventions,
-	 * use {@link #LIST_SPLIT_PATTERN} instead. 
-	 */
-	@Deprecated(since = "2.7.0", forRemoval = true)
-	public final static Pattern listSplitPattern = LIST_SPLIT_PATTERN;
-
-	/**
-	 * @deprecated due to bad naming conventions,
-	 * use {@link #WILDCARD} instead.
-	 */
-	@Deprecated(since = "2.8.0", forRemoval = true)
-	public final static String wildcard = WILDCARD;
-
 }