kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-05-22 19:39:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Redo error handling on iOS

Browse Source 
Reviewed By: danzimm

Differential Revision: D5969343

fbshipit-source-id: 376984a6e959349260c54884c0b0b719f4c353d6
This commit is contained in:
Adam Ernst
2017-10-05 13:17:07 -07:00
committed by Facebook Github Bot
parent 1e3a8e2ed4
commit e87904cea5
5 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
React/Base/RCTJSStackFrame.m
View File

@@ -18,7 +18,7 @@ static NSRegularExpression *RCTJSStackFrameRegex()
static NSRegularExpression *_regex;
dispatch_once(&onceToken, ^{
NSError *regexError;
_regex = [NSRegularExpression regularExpressionWithPattern:@"^([^@]+)@(.*):(\\d+):(\\d+)$" options:0 error:&regexError];
_regex = [NSRegularExpression regularExpressionWithPattern:@"^(?:([^@]+)@)?(.*):(\\d+):(\\d+)$" options:0 error:&regexError];
if (regexError) {
RCTLogError(@"Failed to build regex: %@", [regexError localizedDescription]);
}
@@ -56,7 +56,9 @@ static NSRegularExpression *RCTJSStackFrameRegex()
return nil;
}
NSString *methodName = [line substringWithRange:[match rangeAtIndex:1]];
// methodName may not be present for e.g. anonymous functions
const NSRange methodNameRange = [match rangeAtIndex:1];
NSString *methodName = methodNameRange.location == NSNotFound ? nil : [line substringWithRange:methodNameRange];
NSString *file = [line substringWithRange:[match rangeAtIndex:2]];
NSString *lineNumber = [line substringWithRange:[match rangeAtIndex:3]];
NSString *column = [line substringWithRange:[match rangeAtIndex:4]];
@@ -69,7 +71,7 @@ static NSRegularExpression *RCTJSStackFrameRegex()
+ (instancetype)stackFrameWithDictionary:(NSDictionary *)dict
{
return [[self alloc] initWithMethodName:dict[@"methodName"]
return [[self alloc] initWithMethodName:RCTNilIfNull(dict[@"methodName"])
file:dict[@"file"]
lineNumber:[RCTNilIfNull(dict[@"lineNumber"]) integerValue]
column:[RCTNilIfNull(dict[@"column"]) integerValue]];