Skip to content

Commit

Permalink
Major refactor
Browse files Browse the repository at this point in the history
Switch to REConsumer, create RE and ErrorSource classes, use new config reload event.
  • Loading branch information
sovdeeth committed Dec 17, 2024
1 parent 86b539f commit 2d8fcd3
Show file tree
Hide file tree
Showing 11 changed files with 287 additions and 218 deletions.
7 changes: 4 additions & 3 deletions src/main/java/ch/njol/skript/Skript.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
import org.skriptlang.skript.lang.converter.Converter;
import org.skriptlang.skript.lang.converter.Converters;
import org.skriptlang.skript.lang.entry.EntryValidator;
import org.skriptlang.skript.lang.errors.RuntimeErrorManager;
import org.skriptlang.skript.log.runtime.RuntimeErrorManager;
import org.skriptlang.skript.lang.experiment.ExperimentRegistry;
import org.skriptlang.skript.lang.script.Script;
import org.skriptlang.skript.lang.structure.Structure;
Expand Down Expand Up @@ -512,6 +512,9 @@ public void onEnable() {
}
}

// Register config load events.
SkriptConfig.eventRegistry().register(SkriptConfig.ReloadEvent.class, RuntimeErrorManager::refresh);

// Config must be loaded after Java and Skript classes are parseable
// ... but also before platform check, because there is a config option to ignore some errors
SkriptConfig.load();
Expand Down Expand Up @@ -568,8 +571,6 @@ public void onEnable() {

Commands.registerListeners();

RuntimeErrorManager.refresh();

if (logNormal())
info(" " + Language.get("skript.copyright"));

Expand Down
9 changes: 1 addition & 8 deletions src/main/java/ch/njol/skript/SkriptCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,12 @@
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.lang.errors.RuntimeErrorManager;
import org.skriptlang.skript.lang.script.Script;

import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.logging.Level;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -159,7 +154,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
if (args[1].equalsIgnoreCase("all")) {
reloading(sender, "config, aliases and scripts", logHandler);
SkriptConfig.load();
RuntimeErrorManager.refresh();
Aliases.clear();
Aliases.loadAsync().thenRun(() -> {
ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
Expand All @@ -183,7 +177,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
} else if (args[1].equalsIgnoreCase("config")) {
reloading(sender, "main config", logHandler);
SkriptConfig.load();
RuntimeErrorManager.refresh();
reloaded(sender, logHandler, timingLogHandler, "main config");
} else if (args[1].equalsIgnoreCase("aliases")) {
reloading(sender, "aliases", logHandler);
Expand Down
14 changes: 5 additions & 9 deletions src/main/java/ch/njol/skript/config/Node.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,14 @@
*/
package ch.njol.skript.config;

import java.io.PrintWriter;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import ch.njol.skript.SkriptConfig;
import org.jetbrains.annotations.Nullable;

import ch.njol.skript.Skript;
import ch.njol.skript.log.SkriptLogger;
import ch.njol.util.NonNullPair;
import ch.njol.util.StringUtils;
import org.jetbrains.annotations.Nullable;

import java.io.PrintWriter;
import java.util.concurrent.atomic.AtomicBoolean;

/**
* @author Peter Güttinger
Expand Down Expand Up @@ -94,7 +90,7 @@ protected Node(final String key, final String comment, final SectionNode parent,
public String getKey() {
return key;
}

public final Config getConfig() {
return config;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import ch.njol.util.Kleenean;
import org.bukkit.event.Event;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.lang.errors.RuntimeErrorProducer;
import org.skriptlang.skript.log.runtime.RuntimeErrorProducer;

/**
* A base class for property expressions that requires only few overridden methods
Expand Down

This file was deleted.

49 changes: 49 additions & 0 deletions src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package org.skriptlang.skript.log.runtime;

import ch.njol.skript.config.Node;
import ch.njol.skript.doc.Name;
import ch.njol.skript.lang.SyntaxElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

/**
* A more versatile set of information about the source of an error.
* Aims to avoid relying specifically on {@link Node}s for information.
* <br>
* Hashing is specifically based on line number and script name alone.
*
* @param syntaxType A string representing the type of syntax. See {@link SyntaxElement#getSyntaxTypeName()}.
* @param syntaxName The name of the syntax emitting the error.
* @param lineNumber The line number of the syntax emitting the error.
* @param lineText The raw code of the line.
* @param script The name of the script in which the line exists.
*/
public record ErrorSource(
String syntaxType,
String syntaxName,
int lineNumber,
String lineText,
String script
) {

/**
* Creates an error source using information from a given node and syntax element.
* @param node The node to use for line, line number, and script name.
* @param element The element to use for the type and name.
* @return A new error source.
*/
public static @NotNull ErrorSource fromNodeAndElement(@Nullable Node node, @NotNull SyntaxElement element) {
String elementName = element.getClass().getAnnotation(Name.class).value().trim().replaceAll("\n", "");
if (node == null) {
return new ErrorSource(element.getSyntaxTypeName(), elementName, 0, "-unknown-", "-effect command-");
}
String code = node.save().trim().replaceAll("§", "&");
return new ErrorSource(element.getSyntaxTypeName(), elementName, node.getLine(), code, node.getConfig().getFileName());
}

@Override
public int hashCode() {
return 13 * lineNumber + 17 * script.hashCode();
}

}
Loading

0 comments on commit 2d8fcd3

Please sign in to comment.