Merge branch 'main' into caleb/fix/variadic

Author: philippedistributive

python/pythonmonkey/builtin_modules/console.js

@@ -98,11 +98,14 @@ class Console
       const header = args.length > 0
         ? `Trace: ${format(...args)}\n`
         : 'Trace\n';
-      const stacks = new Error().stack
-        .split('\n')
-        .filter(s => s !== '') // filter out empty lines
-        .map(s => '    '+s)    // add indent
-        .join('\n');
+
+      let stacks = new Error().stack
+            .split('\n')
+      stacks.shift();              // skip the first line which is this.trace itself
+      stacks = stacks
+            .filter(s => s !== '') // filter out empty lines
+            .map(s => '    '+s)    // add indent
+            .join('\n');
       return this.debug(header + stacks);
     };
 

tests/js/console-methods.simple

@@ -73,6 +73,7 @@ expectOutput('stderr', /^Assertion failed: abc undefined$/m, (console) => consol
 expectOutput('stdout', /^Trace\n/, (console) => console.trace());
 expectOutput('stdout', /^Trace: \x1b\[90mundefined\x1b\[39m\n/, (console) => console.trace(undefined));
 expectOutput('stdout', /^Trace: \x1b\[33m123\x1b\[39m\n/, (console) => console.trace(123));
+expectOutput('stdout', /^((?!console\.js)[\s\S])*$/, (console) => console.trace());  // implementation details should not show up in the trace
 
 // console.count()
 let keptConsole;