Repair correct closing order of configuration tree.

Author: Moderocky

hello.csk

@@ -12,6 +12,7 @@
 import org.byteskript.skript.compiler.structure.*;
 import org.byteskript.skript.error.ScriptCompileError;
 import org.byteskript.skript.lang.handler.StandardHandlers;
+import org.byteskript.skript.runtime.data.ScriptData;
 import org.byteskript.skript.runtime.internal.CompiledScript;
 
 import java.lang.reflect.Method;
@@ -42,6 +43,7 @@ public class FileContext extends Context {
     protected ClassBuilder writer;
     protected FieldBuilder field;
     protected MethodBuilder method;
+    protected String sourceFile;
     LanguageElement expected;
     SyntaxElement currentEffect;
     private HandlerType mode = StandardHandlers.GET;
@@ -52,6 +54,7 @@ public FileContext(Type type) {
 
     public FileContext(Type type, int computation) {
         this.type = type;
+        this.sourceFile = type.getTypeName().replace('.', '/') + ".bsk";
         this.state = CompileState.ROOT;
         this.writer = new ClassBuilder(type, SkriptLangSpec.JAVA_VERSION)
             .addModifiers(Modifier.PUBLIC)
@@ -81,6 +84,7 @@ public List<ProgrammaticSplitTree> getTrees() {
     }
 
     public PostCompileClass[] compile() {
+        this.writer.addAnnotation(ScriptData.class).addValue("sourceFile", sourceFile);
         for (List<PropertyAccessGenerator> value : usedProperties.values()) {
             for (PropertyAccessGenerator generator : value) {
                 generator.compile(this);

src/main/java/org/byteskript/skript/compiler/FileContext.java

@@ -43,6 +43,7 @@ public void branch(Context context) {
     public void close(Context context) {
         if (end.uses.size() > 0)
             context.getMethod().writeCode(end.instruction());
+        context.removeTree(this);
     }
 
     @Override

src/main/java/org/byteskript/skript/compiler/structure/BasicTree.java

@@ -90,13 +90,16 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
 
     @Override
     public void onSectionExit(Context context, SectionMeta meta) {
-        final ConfigTree tree = context.findTree(ConfigTree.class);
+        final ConfigTree current;
+        if (context.getTree(context.getSection()) instanceof ConfigTree found) current = found;
+        else if (context.getCurrentTree() instanceof ConfigTree found) current = found;
+        else return;
         final MethodBuilder method = context.getMethod();
-        if (tree == null) return;
-        final int slot = context.slotOf(tree.variable);
+        final int slot = context.slotOf(current.variable);
         method.writeCode(WriteInstruction.loadObject(slot));
         final Method target = this.findMethod(ConfigMap.class, "save");
         method.writeCode(WriteInstruction.invoke(target));
+        current.close(context);
     }
 
     @Override

src/main/java/org/byteskript/skript/lang/syntax/config/ConfigFile.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 ByteSkript org (Moderocky)
+ * View the full licence information and permissions:
+ * https://github.com/Moderocky/ByteSkript/blob/master/LICENSE
+ */
+
+package org.byteskript.skript.runtime.data;
+
+import mx.kenzie.autodoc.api.note.Ignore;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Ignore
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ScriptData {
+    
+    String sourceFile();
+    
+}

src/main/java/org/byteskript/skript/runtime/data/ScriptData.java

@@ -7,6 +7,8 @@
 package org.byteskript.skript.runtime.threading;
 
 import org.byteskript.skript.error.ScriptParseError;
+import org.byteskript.skript.runtime.Skript;
+import org.byteskript.skript.runtime.data.ScriptData;
 
 import static org.byteskript.skript.runtime.internal.ConsoleColour.*;
 
@@ -88,7 +90,12 @@ public void uncaughtException(Thread source, Throwable throwable) {
 
     private String getScriptName(final StackTraceElement element) {
         final String location = element.getClassName();
-        return location.replace('.', '/') + ".bsk";
+        try {
+            final Class<?> owner = Skript.localInstance().getClass(location);
+            return owner.getAnnotation(ScriptData.class).sourceFile();
+        } catch (Throwable ex) {
+            return location.replace('.', '/') + ".bsk";
+        }
     }
 
 }