Add ExecutionIntent to EffContinue, and fix its toString

Author: UnderscoreTud

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

@@ -23,17 +23,15 @@
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.lang.Effect;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.Literal;
-import ch.njol.skript.lang.LoopSection;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.TriggerItem;
 import ch.njol.util.Kleenean;
 import ch.njol.util.StringUtils;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Name("Continue")
@@ -65,35 +63,56 @@ public class EffContinue extends Effect {
 		);
 	}
 
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private LoopSection loop;
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private List<LoopSection> innerLoops;
+	private @UnknownNullability LoopSection loop;
+	private @UnknownNullability List<LoopSection> innerLoops;
+	private int breakLevels;
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		List<LoopSection> currentLoops = getParser().getCurrentSections(LoopSection.class);
+		List<TriggerSection> sections = getParser().getCurrentSections();
+		innerLoops = new ArrayList<>();
+		int loopLevels = 0;
+		LoopSection lastLoop = null;
 
-		int size = currentLoops.size();
-		if (size == 0) {
-			Skript.error("The 'continue' effect may only be used in loops");
+		int level = matchedPattern == 0 ? -1 : ((Literal<Integer>) exprs[0]).getSingle();
+		if (matchedPattern != 0 && level < 1) {
+			Skript.error("Can't continue the " + StringUtils.fancyOrderNumber(level) + " loop");
 			return false;
 		}
 
-		int level = matchedPattern == 0 ? size : ((Literal<Integer>) exprs[0]).getSingle();
-		if (level < 1) {
-			Skript.error("Can't continue the " + StringUtils.fancyOrderNumber(level) + " loop");
+		for (TriggerSection section : sections) {
+			if (loop != null)
+				breakLevels++;
+            if (!(section instanceof LoopSection loopSection))
+				continue;
+			loopLevels++;
+			if (level == -1) {
+				lastLoop = loopSection;
+			} else if (loopLevels == level) {
+				loop = loopSection;
+				breakLevels++;
+			} else if (loopLevels > level) {
+				innerLoops.add(loopSection);
+			}
+        }
+
+		if (loopLevels == 0) {
+			Skript.error("The 'continue' effect may only be used in loops");
 			return false;
 		}
-		if (level > size) {
+
+		if (level > loopLevels) {
 			Skript.error("Can't continue the " + StringUtils.fancyOrderNumber(level) + " loop as there " +
-				(size == 1 ? "is only 1 loop" : "are only " + size + " loops") + " present");
+				(loopLevels == 1 ? "is only 1 loop" : "are only " + loopLevels + " loops") + " present");
 			return false;
 		}
 
-		loop = currentLoops.get(level - 1);
-		innerLoops = currentLoops.subList(level, size);
+		if (level == -1) {
+			loop = lastLoop;
+			breakLevels++;
+		}
+
 		return true;
 	}
 
@@ -110,9 +129,14 @@ protected TriggerItem walk(Event event) {
 		return loop;
 	}
 
+	@Override
+	public @Nullable ExecutionIntent executionIntent() {
+		return ExecutionIntent.stopSections(breakLevels);
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		return "continue";
+		return "continue" + (loop == null ? "" : " the " + StringUtils.fancyOrderNumber(innerLoops.size() + 1) + " loop");
 	}
 
 }

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

@@ -4,16 +4,18 @@ test "continue effect":
 			continue
 		assert loop-value is not 5 with "continue in loop failed"
 	set {_i} to 0
+
 	while {_i} is smaller than 10:
 		increase {_i} by 1
 		if {_i} is equal to 5:
 			continue
 		assert {_i} is not 5 with "continue in while failed"
+
 	loop integers from 1 to 10:
 		continue this loop if loop-value is 5
-		assert loop-value is not 5 with "leveled continue failed"
+		assert loop-value is not 5 with "leveled continue failed #1"
 		loop integers from 11 to 20:
 			continue 2nd loop if loop-value-2 is 15
-			assert loop-value-2 is not 15 with "leveled continue failed"
+			assert loop-value-2 is not 15 with "leveled continue failed #2"
 			continue 1st loop if loop-value-1 is 10
-		assert loop-value is not 10 with "leveled continue failed"
+		assert loop-value is not 10 with "leveled continue failed #3"