JS traces return the full path to the file here, while Java traces only return the file * name (the path is not known). */ - public String getFile() { + @Override + public @Nullable String getFile() { return mFile; } @@ -109,7 +115,8 @@ public int getColumn() { *
For JS traces this is different from {@link #getFile()} in that it only returns the file * name, not the full path. For Java traces there is no difference. */ - public String getFileName() { + @Override + public @Nullable String getFileName() { return mFileName; } @@ -119,9 +126,10 @@ public boolean isCollapsed() { /** Convert the stack frame to a JSON representation. */ public JSONObject toJSON() { + String file = getFile(); return new JSONObject( MapBuilder.of( - "file", getFile(), + "file", (file == null) ? "" : file, "methodName", getMethod(), "lineNumber", getLine(), "column", getColumn(), @@ -136,25 +144,33 @@ public JSONObject toJSON() { public static StackFrame[] convertJsStackTrace(@Nullable ReadableArray stack) { int size = stack != null ? stack.size() : 0; StackFrame[] result = new StackFrame[size]; - for (int i = 0; i < size; i++) { - ReadableType type = stack.getType(i); - if (type == ReadableType.Map) { - ReadableMap frame = stack.getMap(i); - String methodName = frame.getString("methodName"); - String fileName = frame.getString("file"); - boolean collapse = - frame.hasKey("collapse") && !frame.isNull("collapse") && frame.getBoolean("collapse"); - int lineNumber = -1; - if (frame.hasKey(LINE_NUMBER_KEY) && !frame.isNull(LINE_NUMBER_KEY)) { - lineNumber = frame.getInt(LINE_NUMBER_KEY); - } - int columnNumber = -1; - if (frame.hasKey(COLUMN_KEY) && !frame.isNull(COLUMN_KEY)) { - columnNumber = frame.getInt(COLUMN_KEY); + if (stack != null) { + for (int i = 0; i < size; i++) { + ReadableType type = stack.getType(i); + if (type == ReadableType.Map) { + ReadableMap frame = stack.getMap(i); + Assertions.assertNotNull(frame); + String methodName = frame.getString("methodName"); + String fileName = frame.getString("file"); + Assertions.assertNotNull(fileName); + Assertions.assertNotNull(methodName); + boolean collapse = + frame.hasKey("collapse") && !frame.isNull("collapse") && frame.getBoolean("collapse"); + int lineNumber = -1; + if (frame.hasKey(LINE_NUMBER_KEY) && !frame.isNull(LINE_NUMBER_KEY)) { + lineNumber = frame.getInt(LINE_NUMBER_KEY); + } + int columnNumber = -1; + if (frame.hasKey(COLUMN_KEY) && !frame.isNull(COLUMN_KEY)) { + columnNumber = frame.getInt(COLUMN_KEY); + } + result[i] = new StackFrameImpl(fileName, methodName, lineNumber, columnNumber, collapse); + } else if (type == ReadableType.String) { + String stackFrame = stack.getString(i); + if (stackFrame != null) { + result[i] = new StackFrameImpl(null, stackFrame, -1, -1); + } } - result[i] = new StackFrameImpl(fileName, methodName, lineNumber, columnNumber, collapse); - } else if (type == ReadableType.String) { - result[i] = new StackFrameImpl(null, stack.getString(i), -1, -1); } } return result; @@ -203,15 +219,22 @@ public static StackFrame[] convertJsStackTrace(String stack) { } else if (matcher1.find()) { matcher = matcher1; } else { - result[i] = new StackFrameImpl(null, stackTrace[i], -1, -1); + String unmatchedStackFrame = stackTrace[i]; + if (unmatchedStackFrame != null) { + result[i] = new StackFrameImpl(null, unmatchedStackFrame, -1, -1); + } + continue; + } + String fileName = matcher.group(2); + String methodName = matcher.group(1) == null ? "(unknown)" : matcher.group(1); + String lineString = matcher.group(3); + String columnString = matcher.group(4); + if (methodName == null || fileName == null || lineString == null || columnString == null) { continue; } result[i] = new StackFrameImpl( - matcher.group(2), - matcher.group(1) == null ? "(unknown)" : matcher.group(1), - Integer.parseInt(matcher.group(3)), - Integer.parseInt(matcher.group(4))); + fileName, methodName, Integer.parseInt(lineString), Integer.parseInt(columnString)); } return result; } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.kt index 47f32567879a0f..8f462ae6171bae 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.kt @@ -20,7 +20,7 @@ public interface StackFrame { public val file: String? /** Get the name of the method this frame points to. */ - public val method: String? + public val method: String /** Get the line number this frame points to in the file returned by [.getFile]. */ public val line: Int @@ -40,5 +40,5 @@ public interface StackFrame { public val isCollapsed: Boolean /** Convert the stack frame to a JSON representation. */ - public fun toJSON(): JSONObject? + public fun toJSON(): JSONObject } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.kt index 9476927d3eba4d..33dcc7e7ba3293 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.kt @@ -47,7 +47,7 @@ class StackTraceHelperTest { fun testParseStackFrameWithInvalidFrame() { val frame = StackTraceHelper.convertJsStackTrace("Test.bundle:ten:twenty").get(0) assertThat(frame.method).isEqualTo("Test.bundle:ten:twenty") - assertThat(frame.fileName).isEqualTo("") + assertThat(frame.fileName).isEqualTo(null) assertThat(frame.line).isEqualTo(-1) assertThat(frame.column).isEqualTo(-1) } @@ -56,7 +56,7 @@ class StackTraceHelperTest { fun testParseStackFrameWithNativeCodeFrame() { val frame = StackTraceHelper.convertJsStackTrace("forEach@[native code]").get(0) assertThat(frame.method).isEqualTo("forEach@[native code]") - assertThat(frame.fileName).isEqualTo("") + assertThat(frame.fileName).isEqualTo(null) assertThat(frame.line).isEqualTo(-1) assertThat(frame.column).isEqualTo(-1) }