Pass stack to printer when running console.trace().

mozilla · Mar 1, 2022 · 178d18c · 178d18c
1 parent 7d7bded
commit 178d18c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/src/org/mozilla/javascript/NativeConsole.java b/src/org/mozilla/javascript/NativeConsole.java
@@ -37,7 +37,12 @@ public enum Level {
     }
 
     public interface ConsolePrinter extends Serializable {
-        void print(Context cx, Scriptable scope, Level level, Object[] args);
+        void print(
+                Context cx,
+                Scriptable scope,
+                Level level,
+                ScriptStackElement[] stack,
+                Object[] args);
     }
 
     public static void init(Scriptable scope, boolean sealed, ConsolePrinter printer) {
@@ -140,24 +145,28 @@ public Object execIdCall(
                 return "Console";
 
             case Id_trace:
-                printer.print(cx, scope, Level.TRACE, args);
-                break;
+                {
+                    ScriptStackElement[] stack =
+                            new EvaluatorException("[object Object]").getScriptStack();
+                    printer.print(cx, scope, Level.TRACE, stack, args);
+                    break;
+                }
 
             case Id_debug:
-                printer.print(cx, scope, Level.DEBUG, args);
+                printer.print(cx, scope, Level.DEBUG, null, args);
                 break;
 
             case Id_log:
             case Id_info:
-                printer.print(cx, scope, Level.INFO, args);
+                printer.print(cx, scope, Level.INFO, null, args);
                 break;
 
             case Id_warn:
-                printer.print(cx, scope, Level.WARN, args);
+                printer.print(cx, scope, Level.WARN, null, args);
                 break;
 
             case Id_error:
-                printer.print(cx, scope, Level.ERROR, args);
+                printer.print(cx, scope, Level.ERROR, null, args);
                 break;
 
             case Id_assert:
@@ -192,7 +201,7 @@ public Object execIdCall(
     }
 
     private void print(Context cx, Scriptable scope, Level level, String msg) {
-        printer.print(cx, scope, level, new String[] {msg});
+        printer.print(cx, scope, level, null, new String[] {msg});
     }
 
     public static String format(Context cx, Scriptable scope, Object[] args) {

diff --git a/toolsrc/org/mozilla/javascript/tools/shell/ShellConsolePrinter.java b/toolsrc/org/mozilla/javascript/tools/shell/ShellConsolePrinter.java
@@ -8,14 +8,20 @@
 import java.nio.charset.Charset;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.NativeConsole;
+import org.mozilla.javascript.ScriptStackElement;
 import org.mozilla.javascript.Scriptable;
 
 /** Provide a printer use in console API */
 class ShellConsolePrinter implements NativeConsole.ConsolePrinter {
     private static final long serialVersionUID = 5869832740127501857L;
 
     @Override
-    public void print(Context cx, Scriptable scope, NativeConsole.Level level, Object[] args) {
+    public void print(
+            Context cx,
+            Scriptable scope,
+            NativeConsole.Level level,
+            ScriptStackElement[] stack,
+            Object[] args) {
         if (args.length == 0) {
             return;
         }
@@ -24,6 +30,12 @@ public void print(Context cx, Scriptable scope, NativeConsole.Level level, Objec
         ShellConsole console = Main.getGlobal().getConsole(Charset.defaultCharset());
         try {
             console.println(level + " " + msg);
+
+            if (stack != null) {
+                for (ScriptStackElement element : stack) {
+                    console.println(element.toString());
+                }
+            }
         } catch (IOException e) {
             throw Context.reportRuntimeError(e.getMessage());
         }