From 5be3d934b78470f18457400573376c86ae4392a9 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Fri, 2 Jan 2026 22:08:53 +0200 Subject: [PATCH] Marked global variables for script types --- .../script/interpreter/ScriptDocument.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 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 bf33d11af..5b57beffc 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 @@ -1857,7 +1857,7 @@ public class ScriptDocument { int typeNameStart = m.start(1); int typeNameEnd = m.end(1); - if (isExcluded(typeNameStart)) { + if (isExcluded(typeNameStart) || isInImportOrPackage(typeNameStart)) { searchFrom = m.end(); continue; } @@ -3703,10 +3703,26 @@ public class ScriptDocument { // Check global fields if (globalFields.containsKey(name)) { FieldInfo fieldInfo = globalFields.get(name); - Object metadata = callInfo != null ? new FieldInfo.ArgInfo(fieldInfo, callInfo) : fieldInfo; - marks.add(new ScriptLine.Mark(m.start(1), m.end(1), TokenType.GLOBAL_FIELD, metadata)); - continue; + if (fieldInfo.getDeclarationOffset() == position) { + Object metadata = callInfo != null ? new FieldInfo.ArgInfo(fieldInfo, callInfo) : fieldInfo; + marks.add(new ScriptLine.Mark(m.start(1), m.end(1), TokenType.GLOBAL_FIELD, metadata)); + continue; + } } + + for (ScriptTypeInfo scriptType : scriptTypes.values()) { + if (scriptType.hasField(name)) { + FieldInfo fieldInfo = scriptType.getFieldInfo(name); + if (fieldInfo.getDeclarationOffset() == position) { + + Object metadata = callInfo != null ? new FieldInfo.ArgInfo(fieldInfo, + callInfo) : fieldInfo; + marks.add(new ScriptLine.Mark(m.start(1), m.end(1), TokenType.GLOBAL_FIELD, metadata)); + continue; + } + } + } + // Skip uppercase if not a known field - type handling will deal with it if (isUppercase)