From 6b7563cab37766a95b09040b64b48acfb03efb97 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 2 Mar 2026 14:00:58 +0200 Subject: [PATCH] Fixed broken null assignments i.e. var npc = null --- .../util/script/interpreter/ScriptDocument.java | 17 +++++++++++++---- .../script/interpreter/type/TypeChecker.java | 4 ++-- .../util/script/interpreter/type/TypeInfo.java | 2 ++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java index d784418c4..14930fcc4 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java @@ -1495,7 +1495,10 @@ public class ScriptDocument { // Priority 2: Infer type from initializer if no JSDoc type if (typeInfo == null && initializer != null && !initializer.isEmpty()) { - typeInfo = resolveExpressionType(initializer, bodyStart + initializerStart); + TypeInfo inferred = resolveExpressionType(initializer, bodyStart + initializerStart); + if (!TypeInfo.NULL.equals(inferred)) { + typeInfo = inferred; + } } // Priority 3: Use "any" type for uninitialized variables @@ -1767,7 +1770,10 @@ public class ScriptDocument { // Priority 2: Infer from initializer if (varType == null && initializer != null && !initializer.isEmpty()) { - varType = resolveExpressionType(initializer, start + initializerStart); + TypeInfo inferred = resolveExpressionType(initializer, start + initializerStart); + if (!TypeInfo.NULL.equals(inferred)) { + varType = inferred; + } } // Priority 3: Use "any" type @@ -2480,7 +2486,10 @@ public class ScriptDocument { // Priority 2: Infer from initializer if no JSDoc type if (typeInfo == null && initializer != null && !initializer.isEmpty()) { - typeInfo = resolveExpressionType(initializer, initializerStart); + TypeInfo inferred = resolveExpressionType(initializer, initializerStart); + if (!TypeInfo.NULL.equals(inferred)) { + typeInfo = inferred; + } } // Priority 3: Use "any" type for uninitialized variables @@ -4849,7 +4858,7 @@ public class ScriptDocument { // Null literal if (expr.equals("null")) { - return TypeInfo.unresolved("null", ""); // null is compatible with any reference type + return TypeInfo.NULL; // null is compatible with any reference type } // Numeric literals with precision checking diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeChecker.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeChecker.java index 2e31a02a8..31616302b 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeChecker.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeChecker.java @@ -37,8 +37,8 @@ public final class TypeChecker { // Handle null literal - null is compatible with any reference type (non-primitive) if ("".equals(actual.getFullName())) { Class expectedClass = expected.getJavaClass(); - if (expectedClass != null && !expectedClass.isPrimitive()) { - return true; // null can be assigned to any reference type + if (expectedClass != null && !expectedClass.isPrimitive() || "".equals(expected.getFullName())) { + return true; // null can be assigned to any reference type and null } // null cannot be assigned to primitive types return false; diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeInfo.java index 0c5fcf2e0..924af3958 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeInfo.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeInfo.java @@ -48,6 +48,8 @@ public class TypeInfo { public static final TypeInfo STRING = TypeInfo.fromClass(String.class); + public static final TypeInfo NULL = TypeInfo.unresolved("null", ""); + /** * Singleton constant for the "any" type (used in JavaScript/TypeScript). * The "any" type is universally compatible - it can be assigned to anything