upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 23:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly highlighted ClassTypeInfo constructor calls

Browse Source 
i.e var IntArray = Java.type("int[]");
    var array = new IntArray() // this
This commit is contained in:
bigguy345 committed 2026-03-09 03:47:04 +02:00
1 parent 44dfec6283
commit e1afe9afb2
2 files changed
+19 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java
+14 -8
View File
@@ -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;
}
}
src/main/java/noppes/npcs/client/gui/util/script/interpreter/method/MethodCallInfo.java
+5 -1
View File
@@ -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)");