scope handling fix (wip)

Author: rbri

src/main/java/org/htmlunit/javascript/DebugFrameAdapter.java

@@ -16,6 +16,7 @@
 
 import org.htmlunit.corejs.javascript.Context;
 import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.corejs.javascript.debug.DebugFrame;
 
 /**
@@ -35,7 +36,7 @@ public void onDebuggerStatement(final Context cx) {
 
     /** {@inheritDoc} */
     @Override
-    public void onEnter(final Context cx, final Scriptable activation, final Scriptable thisObj, final Object[] args) {
+    public void onEnter(final Context cx, final VarScope activation, final Scriptable thisObj, final Object[] args) {
         // Empty.
     }
 

src/main/java/org/htmlunit/javascript/DebugFrameImpl.java

@@ -25,6 +25,7 @@
 import org.htmlunit.corejs.javascript.NativeFunction;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.corejs.javascript.debug.DebuggableScript;
 import org.htmlunit.javascript.host.event.Event;
 
@@ -74,7 +75,7 @@ public DebugFrameImpl(final DebuggableScript functionOrScript) {
      * {@inheritDoc}
      */
     @Override
-    public void onEnter(final Context cx, final Scriptable activation, final Scriptable thisObj, final Object[] args) {
+    public void onEnter(final Context cx, final VarScope activation, final Scriptable thisObj, final Object[] args) {
         if (LOG.isTraceEnabled()) {
             final StringBuilder sb = new StringBuilder();
 

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

@@ -1423,6 +1423,8 @@ public void triggerOnError(final ScriptException e) {
             final int line = e.getFailingLineNumber();
             final int column = e.getFailingColumnNumber();
 
+            final VarScope scope = getWebWindow().getTopLevelScope();
+
             Object jsError = e.getMessage();
             if (e.getCause() instanceof JavaScriptException) {
                 msg = "uncaught exception: " + e.getCause().getMessage();
@@ -1431,15 +1433,15 @@ public void triggerOnError(final ScriptException e) {
             else if (e.getCause() instanceof EcmaError ecmaError) {
                 msg = "uncaught " + e.getCause().getMessage();
 
-                final Scriptable err = Context.getCurrentContext().newObject(this, "Error");
+                final Scriptable err = JavaScriptEngine.newObject(scope, "Error", JavaScriptEngine.EMPTY_ARGS);
                 ScriptableObject.putProperty(err, "message", ecmaError.getMessage());
                 ScriptableObject.putProperty(err, "fileName", ecmaError.sourceName());
                 ScriptableObject.putProperty(err, "lineNumber", Integer.valueOf(ecmaError.lineNumber()));
                 jsError = err;
             }
 
             final Object[] args = {msg, url, Integer.valueOf(line), Integer.valueOf(column), jsError};
-            f.call(Context.getCurrentContext(), getWebWindow().getTopLevelScope(), this, args);
+            f.call(Context.getCurrentContext(), scope, this, args);
         }
     }
 

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

@@ -403,7 +403,7 @@ else if (RESPONSE_TYPE_JSON.equals(responseType_)) {
                 }
 
                 try {
-                    return new JsonParser(Context.getCurrentContext(), this).parseValue(content);
+                    return new JsonParser(Context.getCurrentContext(), getParentScope()).parseValue(content);
                 }
                 catch (final ParseException e) {
                     webResponse_ = new NetworkErrorWebResponse(webRequest_, new IOException(e));