From c041b9f40f092d981fdfa01cd5dc3cbe6e874b5e Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Mon, 8 Apr 2024 19:36:04 -0700 Subject: [PATCH] Refactor: JsErrorHandler: Rename handleJsError to handleFatalError (#43957) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/43957 Right now, JsErrorHandler is only used to handle fatal exceptions. So, let's just scope handleJsError down to handleFatalError. Changelog: [General][Breaking] - JsErrorHandler: Rename handleJsError to handleFatalError Reviewed By: cortinico Differential Revision: D55547901 fbshipit-source-id: 261e0c8fea2852bc95e53c688d90d012d4abea34 --- .../ReactCommon/jserrorhandler/JsErrorHandler.cpp | 8 +++----- .../ReactCommon/jserrorhandler/JsErrorHandler.h | 2 +- .../ReactCommon/react/runtime/ReactInstance.cpp | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp index 1c00b15dc95..d70a4463761 100644 --- a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp +++ b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp @@ -97,13 +97,11 @@ JsErrorHandler::JsErrorHandler( JsErrorHandler::~JsErrorHandler() {} -void JsErrorHandler::handleJsError(const jsi::JSError& error, bool isFatal) { +void JsErrorHandler::handleFatalError(const jsi::JSError& error) { // TODO: Current error parsing works and is stable. Can investigate using // REGEX_HERMES to get additional Hermes data, though it requires JS setup. - if (isFatal) { - _hasHandledFatalError = true; - } - ParsedError parsedError = parseErrorStack(error, isFatal, false); + _hasHandledFatalError = true; + ParsedError parsedError = parseErrorStack(error, true, false); _jsErrorHandlingFunc(parsedError); } diff --git a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h index d7e16eb9e6b..53a03367989 100644 --- a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h +++ b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h @@ -32,7 +32,7 @@ class JsErrorHandler { explicit JsErrorHandler(JsErrorHandlingFunc jsErrorHandlingFunc); ~JsErrorHandler(); - void handleJsError(const jsi::JSError& error, bool isFatal); + void handleFatalError(const jsi::JSError& error); bool hasHandledFatalError(); private: diff --git a/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp b/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp index 1984ab3c3f1..440e9f5de57 100644 --- a/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp +++ b/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp @@ -222,7 +222,7 @@ void ReactInstance::loadScript( strongBufferedRuntimeExecuter->flush(); } } catch (jsi::JSError& error) { - jsErrorHandler_->handleJsError(error, true); + jsErrorHandler_->handleFatalError(error); } }); }