scope handling fix (wip)

Author: rbri

src/main/java/org/htmlunit/WebConsole.java

@@ -25,7 +25,7 @@
 import org.htmlunit.corejs.javascript.NativeConsole.ConsolePrinter;
 import org.htmlunit.corejs.javascript.NativeConsole.Level;
 import org.htmlunit.corejs.javascript.ScriptStackElement;
-import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.VarScope;
 
 /**
  * This class can be used to print messages to the logger. The first parameter
@@ -157,7 +157,7 @@ public Logger getLogger() {
     }
 
     @Override
-    public void print(final Context cx, final Scriptable scope, final Level level,
+    public void print(final Context cx, final VarScope scope, final Level level,
             final Object[] args, final ScriptStackElement[] stack) {
         switch (level) {
             case TRACE:
@@ -205,7 +205,7 @@ public void print(final Context cx, final Scriptable scope, final Level level,
         }
     }
 
-    private static String format(final Context cx, final Scriptable scope, final Object[] args) {
+    private static String format(final Context cx, final VarScope scope, final Object[] args) {
         String msg = NativeConsole.format(cx, scope, args);
         msg = msg.replaceAll("\\r?\\n", "\n");
         return msg;

src/main/java/org/htmlunit/javascript/host/URLSearchParams.java

@@ -118,12 +118,12 @@ public String getClassName() {
         }
 
         @Override
-        protected boolean isDone(final Context cx, final Scriptable scope) {
+        protected boolean isDone(final Context cx, final VarScope scope) {
             return !iterator_.hasNext();
         }
 
         @Override
-        protected Object nextValue(final Context cx, final Scriptable scope) {
+        protected Object nextValue(final Context cx, final VarScope scope) {
             final NameValuePair e = iterator_.next();
             return switch (type_) {
                 case KEYS -> e.getName();

src/main/java/org/htmlunit/javascript/host/dom/AbstractList.java

@@ -25,6 +25,7 @@
 
 import org.htmlunit.corejs.javascript.ExternalArrayData;
 import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.html.DomChangeEvent;
 import org.htmlunit.html.DomChangeListener;
 import org.htmlunit.html.DomElement;
@@ -471,7 +472,7 @@ protected Scriptable getScriptableForElement(final Object object) {
      * {@inheritDoc}
      */
     @Override
-    public void defineProperty(final Scriptable scope,
+    public void defineProperty(final VarScope scope,
             final String propertyName, final Object delegateTo,
             final Method getter, final Method setter, final int attributes) {
         // length is defined on the prototype, don't define it again

src/main/java/org/htmlunit/javascript/host/dom/NodeList.java

@@ -89,7 +89,7 @@ public NodeList(final DomNode domNode, final List<DomNode> initialElements) {
      * Creates an instance.
      * @param parentScope the parent scope
      */
-    NodeList(final Scriptable parentScope) {
+    NodeList(final VarScope parentScope) {
         super();
         setParentScope(parentScope);
         setPrototype(getPrototype(getClass()));
@@ -103,7 +103,7 @@ public NodeList(final DomNode domNode, final List<DomNode> initialElements) {
      * @param elements the elements
      * @return an empty collection
      */
-    public static NodeList staticNodeList(final Scriptable parentScope, final List<DomNode> elements) {
+    public static NodeList staticNodeList(final VarScope parentScope, final List<DomNode> elements) {
         return new NodeList(parentScope) {
             @Override
             public List<DomNode> getElements() {

src/main/java/org/htmlunit/javascript/host/xml/FormData.java

@@ -26,6 +26,7 @@
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.TopLevel;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.configuration.JsxClass;
@@ -117,15 +118,15 @@ public String getClassName() {
          * {@inheritDoc}
          */
         @Override
-        protected boolean isDone(final Context cx, final Scriptable scope) {
+        protected boolean isDone(final Context cx, final VarScope scope) {
             return index_ >= nameValuePairList_.size();
         }
 
         /**
          * {@inheritDoc}
          */
         @Override
-        protected Object nextValue(final Context cx, final Scriptable scope) {
+        protected Object nextValue(final Context cx, final VarScope scope) {
             if (isDone(cx, scope)) {
                 return Context.getUndefinedValue();
             }