Merge branch 'dev/patch' into dev/feature

Author: APickledWalrus

src/main/java/ch/njol/skript/effects/EffWorldLoad.java

@@ -34,7 +34,7 @@ public class EffWorldLoad extends Effect {
 
 	static {
 		Skript.registerEffect(EffWorldLoad.class,
-				"load [[the] world[s]] %strings% [with environment %-environment%]",
+				"load [the] world[s] %strings% [with environment %-environment%]",
 				"unload [[the] world[s]] %worlds% [:without saving]"
 		);
 	}

src/main/java/ch/njol/skript/expressions/ExprLocationVectorOffset.java

@@ -30,7 +30,7 @@
 public class ExprLocationVectorOffset extends SimpleExpression<Location> {
 
 	static {
-		Skript.registerExpression(ExprLocationVectorOffset.class, Location.class, ExpressionType.COMBINED,
+		Skript.registerExpression(ExprLocationVectorOffset.class, Location.class, ExpressionType.PROPERTY,
 				"%location% offset by [[the] vectors] %vectors%",
 				"%location%[ ]~[~][ ]%vectors%");
 	}

src/main/java/ch/njol/skript/expressions/ExprSortedList.java

@@ -29,7 +29,7 @@
 public class ExprSortedList extends SimpleExpression<Object> {
 
 	static {
-		Skript.registerExpression(ExprSortedList.class, Object.class, ExpressionType.COMBINED, "sorted %objects%");
+		Skript.registerExpression(ExprSortedList.class, Object.class, ExpressionType.PROPERTY, "sorted %objects%");
 	}
 
 	@SuppressWarnings("NotNullFieldNotInitialized")

src/main/java/ch/njol/skript/test/runner/EffRunRunnable.java

@@ -15,7 +15,7 @@ public class EffRunRunnable extends Effect {
 
 	static {
 		if (TestMode.ENABLED)
-			Skript.registerEffect(EffRunRunnable.class, "run %object%");
+			Skript.registerEffect(EffRunRunnable.class, "run runnable %object%");
 	}
 
 	private Expression<?> task;
@@ -38,7 +38,7 @@ protected void execute(Event event) {
 
 	@Override
 	public String toString(Event event, boolean debug) {
-		return "run " + task.toString(event, debug);
+		return "run runnable " + task.toString(event, debug);
 	}
 
 }

src/main/java/org/skriptlang/skript/registration/DefaultSyntaxInfosImpl.java

@@ -43,6 +43,9 @@ public Class<R> returnType() {
 
 		@Override
 		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
 			return other instanceof Expression<?, ?> expression &&
 					super.equals(other) &&
 					returnType() == expression.returnType();
@@ -129,6 +132,9 @@ public NodeType nodeType() {
 
 		@Override
 		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
 			return other instanceof Structure<?> structure &&
 					super.equals(other) &&
 					Objects.equals(entryValidator(), structure.entryValidator()) &&

src/main/java/org/skriptlang/skript/registration/SyntaxRegister.java

@@ -19,8 +19,8 @@ final class SyntaxRegister<I extends SyntaxInfo<?>> {
 			return 0;
 		}
 		int result = a.priority().compareTo(b.priority());
-		// when elements have the same priority, the oldest element comes first
-		return result != 0 ? result : 1;
+		// when elements have the same priority, order by hashcode
+		return result != 0 ? result : Integer.compare(a.hashCode(), b.hashCode());
 	};
 
 	final Set<I> syntaxes = new ConcurrentSkipListSet<>(SET_COMPARATOR);

src/test/java/org/skriptlang/skript/registration/SyntaxRegistryTest.java

@@ -90,4 +90,25 @@ public void testOrdering() {
 		assertArrayEquals(new SyntaxInfo[]{info2, info1, info3}, unmodifiable.syntaxes(key()).toArray());
 	}
 
+	@Test
+	public void testLargeRegistryUnregistration() {
+		final SyntaxRegistry registry = syntaxRegistry();
+		final SyntaxRegistry unmodifiable = registry.unmodifiableView();
+		final var info = info();
+
+		for (int i = 0; i < 25; i++) {
+			registry.register(key(), info.toBuilder().addPattern("pattern" + i).build());
+		}
+		registry.register(key(), info);
+		for (int i = 25; i < 50; i++) {
+			registry.register(key(), info.toBuilder().addPattern("pattern" + i).build());
+		}
+
+		// make sure info can be successfully unregistered
+		registry.unregister(info);
+		assertThrows(UnsupportedOperationException.class, () -> unmodifiable.unregister(info));
+		assertFalse(registry.elements().contains(info));
+		assertFalse(unmodifiable.elements().contains(info));
+	}
+
 }

src/test/skript/tests/misc/expression sections.sk

@@ -5,21 +5,21 @@ test "expression sections":
 
 	assert {_var} is false with "expression section ran too early!"
 
-	run {_runnable}
+	run runnable {_runnable}
 	assert {_var} is true with "expression section didn't run!"
 
 	# try it again in case it stops working for some reason
 	set {_var} to false
-	run {_runnable}
+	run runnable {_runnable}
 	assert {_var} is true with "expression section didn't run again!"
 
 	# section in a section!
 	set {_runnable} to a new runnable:
 		set {_runnable2} to a new runnable:
 			set {_var} to true
-		run {_runnable2}
+		run runnable {_runnable2}
 	set {_var} to false
-	run {_runnable}
+	run runnable {_runnable}
 	assert {_var} is true with "expression section in expression section didn't run"
 
 	# test proper logging behavior

src/test/skript/tests/syntaxes/effects/EffScriptFile.sk

@@ -26,20 +26,20 @@ test "unload + load script":
 
 	set {_script} to script named {_path}
 	assert {_script} exists with "script wasn't found"
-	unload {_script}
+	unload the script within {_script}
 
 	# Unloading no longer disables the script
 	# so the script should be in the same place
 
 	set {EffScriptFile} to false
 	set {_script} to script named {_path}
 	assert {_script} exists with "script moved when unloaded"
-	load {_script}
+	load the script within {_script}
 	# we make sure the script loaded even though it wasn't disabled
 	assert {EffScriptFile} is true with "load event didn't run"
 
 	set {EffScriptFile} to false
-	load {_script}
+	load the script within {_script}
 	# we attempt to load a loaded script
 	# this used to throw an exception, now it should be skipped
 	assert {EffScriptFile} is false with "load ran when already loaded"