From e1afe9afb2f0f0a5f7b4b4ee0ff4997fafdcf071 Mon Sep 17 00:00:00 2001
From: bigguy345 <monkeybar3200@gmail.com>
Date: Mon, 9 Mar 2026 03:47:04 +0200
Subject: [PATCH] Properly highlighted ClassTypeInfo constructor calls i.e var
 IntArray = Java.type("int[]");     var array = new IntArray() // this

---
 .../script/interpreter/ScriptDocument.java    | 22 ++++++++++++-------
 .../interpreter/method/MethodCallInfo.java    |  6 ++++-
 2 files changed, 19 insertions(+), 9 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 b1a75f719..382509aae 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
@@ -8407,16 +8407,17 @@ public class ScriptDocument {
 
             // Try to resolve the class
             TypeInfo info = resolveType(className);
-            boolean isVariableHoldingClass = false;
-            
+            boolean isClassTypeInfo = false;
+            ClassTypeInfo classRef = null;
+            FieldInfo varInfo = null;
             // If not a class name, check if it's a variable holding a ClassTypeInfo
             if ((info == null || !info.isResolved()) && isJavaScript()) {
-                FieldInfo varInfo = resolveVariable(className, start);
+                varInfo = resolveVariable(className, start);
                 if (varInfo != null && varInfo.getTypeInfo() instanceof ClassTypeInfo) {
                     // Variable holds a class reference (like var File = Java.type("java.io.File"))
-                    ClassTypeInfo classRef = (ClassTypeInfo) varInfo.getTypeInfo();
+                    classRef = (ClassTypeInfo) varInfo.getTypeInfo();
                     info = classRef.getInstanceType();
-                    isVariableHoldingClass = true;
+                    isClassTypeInfo = true;
                 }
             }
             
@@ -8463,17 +8464,18 @@ public class ScriptDocument {
                             // Create MethodCallInfo for constructor
                             // Use the actual variable name (className) for variables, not the class's simple name
                             MethodCallInfo ctorCall;
-                            if (isVariableHoldingClass) {
+                            if (isClassTypeInfo) {
                                 // Use constructor directly with variable name
                                 ctorCall = new MethodCallInfo(
                                     className,           // Use variable name, not class name
                                     start, end,
                                     openParen, closeParen,
                                     arguments,
-                                    info,                // The actual class type
+                                        classRef,                // The actual class type
                                     constructor,
                                     false
                                 ).setConstructor(true);
+                                ctorCall.isClassTypeAccess = true;
                             } else {
                                 // Use factory method for regular types
                                 ctorCall = MethodCallInfo.constructor(
@@ -8483,7 +8485,11 @@ public class ScriptDocument {
                             
                             ctorCall.validate();
                             methodCalls.add(ctorCall);  // Add to methodCalls list for error tracking
-                            marks.add(new ScriptLine.Mark(start, end, info.getTokenType(), ctorCall));
+
+
+                            TokenType type = isClassTypeInfo ? varInfo.isGlobal() ? TokenType.GLOBAL_FIELD
+                                    : TokenType.LOCAL_FIELD : info.getTokenType();
+                            marks.add(new ScriptLine.Mark(start, end, type, isClassTypeInfo ? varInfo : ctorCall));
                             continue;
                         }
                     }
diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/method/MethodCallInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/method/MethodCallInfo.java
index a0005efa0..9b4716ec9 100644
--- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/method/MethodCallInfo.java
+++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/method/MethodCallInfo.java
@@ -104,6 +104,10 @@ public class MethodCallInfo {
     
     private boolean isConstructor;
 
+    // For Java.type() ClassTypeInfo constructor access
+    // i.e var IntArray = Java.type("int[]"); var array = new IntArray() 
+    public boolean isClassTypeAccess;
+    
     public MethodCallInfo(String methodName, int methodNameStart, int methodNameEnd,
                           int openParenOffset, int closeParenOffset,
                           List<Argument> arguments, TypeInfo receiverType,
@@ -333,7 +337,7 @@ public class MethodCallInfo {
             if (resolvedMethod == null) {
                 // Don't report missing JS constructors as unresolved method error, since they may be created dynamically at runtime
                 boolean isJSType = receiverType != null && receiverType.isJSType();
-                if (!isJSType) {
+                if (!isJSType && !isClassTypeAccess) {
                     if (receiverType != null && receiverType.hasConstructors()) {
                         setError(ErrorType.WRONG_ARG_COUNT, 
                                 "No constructor in '" + receiverType.getSimpleName() + "' matches " + arguments.size() + " argument(s)");