From 4fa7a73704d5dc7acea7fe81f2f94133556170db Mon Sep 17 00:00:00 2001
From: bigguy345 <monkeybar3200@gmail.com>
Date: Mon, 2 Mar 2026 13:47:08 +0200
Subject: [PATCH] Fixed JS func expressions/lambda fields broken scope logic +
 fixed another statement line separation logic

---
 .../script/interpreter/ScriptDocument.java    | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 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 e5a4fbb5d..d784418c4 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
@@ -1456,6 +1456,15 @@ public class ScriptDocument {
                 while (m.find()) {
                     int absPos = bodyStart + m.start(2);
                     if (isExcluded(absPos)) continue;
+
+                    boolean insideInner = false;
+                    for (InnerCallableScope scope : innerScopes) {
+                        if (scope.containsPosition(absPos)) {
+                            insideInner = true;
+                            break;
+                        }
+                    }
+                    if (insideInner) continue;
                     
                     String kind = m.group(1);
                     String varName = m.group(2);
@@ -2433,6 +2442,15 @@ public class ScriptDocument {
                     }
                 }
                 if (insideMethod) continue;
+
+                boolean insideInner = false;
+                for (InnerCallableScope scope : innerScopes) {
+                    if (scope.containsPosition(position)) {
+                        insideInner = true;
+                        break;
+                    }
+                }
+                if (insideInner) continue;
                 
                 String varName = m.group(1);
                 String initializer = null;
@@ -6510,9 +6528,20 @@ public class ScriptDocument {
                 stmtStart++;
             }
             
-            // Find the end of this statement (next ;)
-            int stmtEnd = text.indexOf(';', equalsPos);
-            if (stmtEnd < 0) stmtEnd = text.length();
+            int stmtEnd;
+            if (isJavaScript()) {
+                int rhsBoundaryStart = equalsPos + 1;
+                while (rhsBoundaryStart < text.length() && Character.isWhitespace(text.charAt(rhsBoundaryStart))) {
+                    rhsBoundaryStart++;
+                }
+                stmtEnd = findJsInitializerEnd(text, rhsBoundaryStart);
+                if (stmtEnd < equalsPos + 1) {
+                    stmtEnd = equalsPos + 1;
+                }
+            } else {
+                stmtEnd = text.indexOf(';', equalsPos);
+                if (stmtEnd < 0) stmtEnd = text.length();
+            }
             
             // Extract LHS (before =) and RHS (after =)
             String lhsRaw = text.substring(stmtStart, equalsPos).trim();