scope handling fix (wip)

rbri · rbri · commit 83e3af5963d2 · 2026-04-19T08:55:23.000+02:00
diff --git a/src/test/java/org/htmlunit/javascript/JavaScriptEngineTest.java b/src/test/java/org/htmlunit/javascript/JavaScriptEngineTest.java
@@ -42,6 +42,7 @@
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.Script;
 import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.html.HtmlButtonInput;
 import org.htmlunit.html.HtmlElement;
@@ -859,22 +860,22 @@ protected CountingJavaScriptEngine(final WebClient client) {
         /** {@inheritDoc} */
         @Override
         public Object execute(
-                final HtmlPage page, final Scriptable scope,
+                final HtmlPage page, final VarScope scope,
                 final String sourceCode, final String sourceName, final int startLine) {
             scriptExecutionCount_++;
             return super.execute(page, scope, sourceCode, sourceName, startLine);
         }
 
         /** {@inheritDoc} */
         @Override
-        public Object execute(final HtmlPage page, final Scriptable scope, final Script script) {
+        public Object execute(final HtmlPage page, final VarScope scope, final Script script) {
             scriptExecuteScriptCount_++;
             return super.execute(page, scope, script);
         }
 
         /** {@inheritDoc} */
         @Override
-        public Script compile(final HtmlPage page, final Scriptable scope,
+        public Script compile(final HtmlPage page, final VarScope scope,
                 final String sourceCode, final String sourceName, final int startLine) {
             scriptCompileCount_++;
             return super.compile(page, scope, sourceCode, sourceName, startLine);
@@ -1029,7 +1030,7 @@ private HtmlPage loadPageAndCollectScripts(final String html, final List<String>
         final WebClient client = getWebClient();
         client.setJavaScriptEngine(new JavaScriptEngine(client) {
             @Override
-            public Object execute(final HtmlPage htmlPage, final Scriptable scope,
+            public Object execute(final HtmlPage htmlPage, final VarScope scope,
                     final String sourceCode, final String sourceName, final int startLine) {
                 collectedScripts.add(sourceCode);
                 return null;
diff --git a/src/test/java/org/htmlunit/javascript/host/WindowConcurrencyTest.java b/src/test/java/org/htmlunit/javascript/host/WindowConcurrencyTest.java
@@ -29,6 +29,7 @@
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.html.HtmlDivision;
 import org.htmlunit.html.HtmlElement;
@@ -348,7 +349,7 @@ private void doTestClearX_threadInterrupt(final String x) throws Exception {
         final HtmlPage page = loadPage(client_, html, collectedAlerts);
         final Function mySpecialFunction = new BaseFunction() {
             @Override
-            public Object call(final Context cx, final Scriptable scope,
+            public Object call(final Context cx, final VarScope scope,
                     final Scriptable thisObj, final Object[] args) {
                 if (Thread.currentThread().isInterrupted()) {
                     throw new RuntimeException("My thread is already interrupted");
