Improve local variable tracking

Author: UnderscoreTud

src/main/java/org/skriptlang/reflect/syntax/custom/condition/CustomCondition.java

@@ -54,12 +54,8 @@ public boolean check(Event event) {
 			core.matchedPattern(),
 			core.parseResult()
 		);
+		core.walk(trigger, checkEvent);
 
-		if (core.parseEvent() == null) {
-			Trigger.walk(trigger, checkEvent);
-		} else {
-			Variables.withLocalVariables(core.parseEvent(), checkEvent, () -> Trigger.walk(trigger, checkEvent));
-		}
 		return checkEvent.isMarkedContinue() ^ checkEvent.isNegated() ^ isNegated();
 	}
 

src/main/java/org/skriptlang/reflect/syntax/custom/effect/CustomEffect.java

@@ -4,6 +4,7 @@
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.Trigger;
 import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.variables.Variables;
 import ch.njol.util.Kleenean;
@@ -61,7 +62,8 @@ protected void execute(Event event) {
 	}
 
 	private EffectTriggerEvent invokeEffect(Event event) {
-		assert info.executeTrigger() != null;
+		Trigger trigger = info.executeTrigger();
+		assert trigger != null;
 
 		EffectTriggerEvent triggerEvent = new EffectTriggerEvent(
 			event,
@@ -71,13 +73,8 @@ private EffectTriggerEvent invokeEffect(Event event) {
 			core.parseResult(),
 			getNext()
 		);
+		core.walk(trigger, triggerEvent);
 
-		if (core.parseEvent() == null) {
-			TriggerItem.walk(info.executeTrigger(), triggerEvent);
-			return triggerEvent;
-		}
-		Variables.withLocalVariables(core.parseEvent(), triggerEvent,
-			() -> TriggerItem.walk(info.executeTrigger(), triggerEvent));
 		return triggerEvent;
 	}
 

src/main/java/org/skriptlang/reflect/syntax/custom/event/CustomEvent.java

@@ -5,6 +5,7 @@
 import ch.njol.skript.lang.SkriptEvent;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.Trigger;
+import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.variables.Variables;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
@@ -66,12 +67,8 @@ public boolean check(Event event) {
 			core.matchedPattern(),
 			core.parseResult()
 		);
+		core.walk(checkTrigger, checkEvent);
 
-		if (core.parseEvent() == null) {
-			Trigger.walk(checkTrigger, checkEvent);
-		} else {
-			Variables.withLocalVariables(core.parseEvent(), checkEvent, () -> Trigger.walk(checkTrigger, checkEvent));
-		}
 		return checkEvent.isMarkedContinue();
 	}
 

src/main/java/org/skriptlang/reflect/syntax/custom/expression/CustomExpression.java

@@ -5,7 +5,6 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.Trigger;
-import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
@@ -51,7 +50,7 @@ protected T[] get(Event event) {
 			core.parseResult()
 		);
 
-		TriggerItem.walk(info.getterTrigger(), getEvent);
+		core.walk(info.getterTrigger(), getEvent);
 		//noinspection unchecked
 		return (T[]) getEvent.output();
 	}
@@ -72,7 +71,7 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 			core.parseResult(),
 			delta
 		);
-		Trigger.walk(trigger, changeEvent);
+		core.walk(trigger, changeEvent);
 	}
 
 	@Override

src/main/java/org/skriptlang/reflect/syntax/custom/shared/CustomSyntaxCore.java

@@ -4,19 +4,15 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.SyntaxElement;
-import ch.njol.skript.lang.Trigger;
 import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.util.LiteralUtils;
-import com.btk5h.skriptmirror.util.SkriptMirrorUtil;
+import ch.njol.skript.variables.Variables;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
-import org.skriptlang.skript.lang.script.Script;
-import org.skriptlang.skript.util.Priority;
 
 import java.util.Arrays;
 import java.util.Objects;
-import java.util.function.Predicate;
 
 public class CustomSyntaxCore {
 
@@ -26,7 +22,7 @@ public class CustomSyntaxCore {
 	private int matchedPattern;
 	private ParseResult parseResult;
 	private String usedPattern;
-	private @Nullable SyntaxParseEvent parseEvent;
+	private @Nullable Object localVariables;
 
 	public CustomSyntaxCore(CustomSyntaxInfo<?> info) {
 		this.info = info;
@@ -58,9 +54,12 @@ public boolean init(SyntaxElement self, Expression<?>[] expressions, int matched
 		}
 
 		Class<? extends Event>[] events = ParserInstance.get().getCurrentEvents();
-		parseEvent = new SyntaxParseEvent(self, expressions, matchedPattern, parseResult, events);
+		SyntaxParseEvent parseEvent = new SyntaxParseEvent(self, expressions, matchedPattern, parseResult, events);
 		TriggerItem.walk(info.parseTrigger(), parseEvent);
-		return parseEvent.isMarkedContinue();
+		if (!parseEvent.isMarkedContinue())
+			return false;
+		localVariables = Variables.copyLocalVariables(parseEvent);
+		return true;
 	}
 
 	public Expression<?>[] expressions() {
@@ -79,8 +78,19 @@ public String usedPattern() {
 		return usedPattern;
 	}
 
-	public @Nullable SyntaxParseEvent parseEvent() {
-		return parseEvent;
+	public @Nullable Object localVariables() {
+		return localVariables;
+	}
+
+	public void walk(TriggerItem trigger, Event event) {
+		if (localVariables == null) {
+			TriggerItem.walk(trigger, event);
+			return;
+		}
+
+		Variables.setLocalVariables(event, localVariables);
+		TriggerItem.walk(trigger, event);
+		Variables.removeLocals(event);
 	}
 
 }