Bug Fix

Author: Manered

src/main/java/dev/manere/inscript/Inscript.java

@@ -95,16 +95,16 @@ private void writeNode(final @NotNull BufferedWriter writer, final @NotNull Insc
                 writeNode(writer, child, depth + 1);
             }
 
-            writer.write(indent + InscriptConstants.SECTION_END + "\n");
+            writer.write(indent + InscriptConstants.SECTION_END.get() + "\n");
         } else if (node instanceof ScalarNode<?> scalar) {
             final Object objectValue = scalar.getValue();
             final Class<?> type = objectValue.getClass();
 
             if (objectValue instanceof List<?> list) {
                 if (list.isEmpty()) {
-                    writer.write(indent + key + " = " + InscriptConstants.LIST_START + InscriptConstants.LIST_END);
+                    writer.write(indent + key + " = " + InscriptConstants.LIST_START.get() + InscriptConstants.LIST_END.get());
                 } else {
-                    writer.write(indent + key + " = " + InscriptConstants.LIST_START + "\n");
+                    writer.write(indent + key + " = " + InscriptConstants.LIST_START.get() + "\n");
 
                     for (int i = 0; i < list.size(); i++) {
                         final Object element = list.get(i);
@@ -127,7 +127,7 @@ private void writeNode(final @NotNull BufferedWriter writer, final @NotNull Insc
                         break;
                     }
 
-                    writer.write(indent + InscriptConstants.LIST_END + "\n");
+                    writer.write(indent + InscriptConstants.LIST_END.get() + "\n");
                 }
             } else {
                 final InlineValue<Object> value = ValueRegistry.REGISTRY.<Object>getInline(type).orElse(null);
@@ -194,8 +194,8 @@ private InscriptNode parseNode(@NotNull String line, final @NotNull BufferedRead
         final String name = parts[0].trim();
 
         final String key = name
-            .replaceAll(InscriptConstants.SECTION_START.get(), "")
-            .replaceAll(InscriptConstants.SECTION_END.get(), "")
+            .replace(InscriptConstants.SECTION_START.get(), "")
+            .replace(InscriptConstants.SECTION_END.get(), "")
             .trim();
 
         if (parts.length == 1) {
@@ -270,6 +270,8 @@ public String getKey() {
                 InlineValue<?> inlineMatched = new StringValue();
 
                 for (final InlineValue<?> inline : ValueRegistry.REGISTRY.getInlineRegistry().values()) {
+                    if (inline.equals(new StringValue())) continue;
+
                     if (inline.matches(value)) {
                         inlineMatched = inline;
                         break;
@@ -297,6 +299,8 @@ public String getKey() {
         InlineValue<?> inlineMatched = new StringValue();
 
         for (final InlineValue<?> inline : ValueRegistry.REGISTRY.getInlineRegistry().values()) {
+            if (inline.equals(new StringValue())) continue;
+
             if (inline.matches(value)) {
                 inlineMatched = inline;
                 break;

src/main/java/dev/manere/inscript/value/ValueRegistry.java

@@ -5,32 +5,34 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class ValueRegistry {
-    public static final ValueRegistry REGISTRY = new ValueRegistry()
-        .register(Boolean.class, new BooleanValue())
-
-        .register(Byte.class, new ByteValue())
-        .register(Short.class, new ShortValue())
-
-        .register(Integer.class, new IntegerValue())
-        .register(Double.class, new DoubleValue())
-        .register(Float.class, new FloatValue())
-        .register(Long.class, new LongValue())
-
-        .register(UUID.class, new UUIDValue())
-
-        .register(Character.class, new CharacterValue())
-        .register(String.class, new StringValue());
+    public static final ValueRegistry REGISTRY;
+
+    static {
+        REGISTRY = new ValueRegistry()
+            .register(Boolean.class, new BooleanValue())
+            .register(Byte.class, new ByteValue())
+            .register(Short.class, new ShortValue())
+            .register(Integer.class, new IntegerValue())
+            .register(Double.class, new DoubleValue())
+            .register(Float.class, new FloatValue())
+            .register(Long.class, new LongValue())
+            .register(UUID.class, new UUIDValue())
+            .register(Character.class, new CharacterValue());
+
+        // Ensure String is always registered last.
+        REGISTRY.register(String.class, new StringValue());
+    }
 
     private ValueRegistry() {}
 
-    private final Map<Class<?>, InlineValue<?>> inlineRegistry = new ConcurrentHashMap<>();
-    private final Map<Class<?>, InscriptValue<?>> inscriptRegistry = new ConcurrentHashMap<>();
+    private final Map<Class<?>, InlineValue<?>> inlineRegistry = new LinkedHashMap<>();
+    private final Map<Class<?>, InscriptValue<?>> inscriptRegistry = new LinkedHashMap<>();
 
     @NotNull
     public <T> Optional<InlineValue<T>> getInline(final @NotNull Class<? extends T> ignoredKey) {
@@ -73,12 +75,12 @@ public <T> ValueRegistry register(final @NotNull Class<? super T> key, final @No
     @NotNull
     @Unmodifiable
     public Map<Class<?>, InlineValue<?>> getInlineRegistry() {
-        return Map.copyOf(inlineRegistry);
+        return new LinkedHashMap<>(inlineRegistry);
     }
 
     @NotNull
     @Unmodifiable
     public Map<Class<?>, InscriptValue<?>> getInscriptRegistry() {
-        return Map.copyOf(inscriptRegistry);
+        return new LinkedHashMap<>(inscriptRegistry);
     }
 }

src/main/java/dev/manere/inscript/value/impl/UUIDValue.java

@@ -9,7 +9,9 @@
 public class UUIDValue implements InlineValue<UUID> {
     @Override
     public boolean matches(final @NotNull String text) {
-        if (!text.startsWith("uuid(") && !text.endsWith(")")) return false;
+        if (!text.startsWith("uuid(") && !text.endsWith(")")) {
+            return false;
+        }
 
         try {
             UUID.fromString(text.replaceAll("uuid\\(", "").replaceAll("\\)", ""));