Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve log output of Callable's #1213

Merged
merged 2 commits into from
May 3, 2022
Merged

improve log output of Callable's #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1140d1f
improve log output of Callable's
rbri May 1, 2022
c74ce20
log functions without body
rbri May 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion src/org/mozilla/javascript/NativeConsole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,34 @@ private static String formatObj(Context cx, Scriptable scope, Object arg) {
}

try {
Object stringify = NativeJSON.stringify(cx, scope, arg, null, null);
// NativeJSON.stringify outputs Callable's as null, convert to string
// to make the output less confusing
final Callable replacer =
new Callable() {
@Override
public Object call(
Context callCx,
Scriptable callScope,
Scriptable callThisObj,
Object[] callArgs) {
Object value = callArgs[1];
while (value instanceof Delegator) {
value = ((Delegator) value).getDelegee();
}
if (value instanceof BaseFunction) {
StringBuilder sb = new StringBuilder();
sb.append("function ")
.append(((BaseFunction) value).getFunctionName())
.append("() {...}");
return sb.toString();
}
if (value instanceof Callable) {
return ScriptRuntime.toString(value);
}
return value;
}
};
Object stringify = NativeJSON.stringify(cx, scope, arg, replacer, null);
return ScriptRuntime.toString(stringify);
} catch (EcmaError e) {
if ("TypeError".equals(e.getName())) {
Expand Down
16 changes: 16 additions & 0 deletions testsrc/org/mozilla/javascript/tests/NativeConsoleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,22 @@ public void print() {
assertPrintMsg("console.error('abc', 123)", "abc 123");
}

@Test
public void printCallable() {
String js = "function foo() {}\n console.log(foo)";
assertPrintMsg(js, "\"function foo() {...}\"");

// suppress body
js = "function fooo() { var i = 0; }\n console.log(fooo)";
assertPrintMsg(js, "\"function fooo() {...}\"");

js = "console.log(/abc/i)";
assertPrintMsg(js, "\"/abc/i\"");

js = "function foo() {}\n" + "console.log([foo, /abc/])";
assertPrintMsg(js, "[\"function foo() {...}\",\"/abc/\"]");
}

@Test
public void trace() {
assertPrintMsg(
Expand Down