修改网址匹配正则

mengyaoyao · mengyaoyao · commit 5fcb5db201c8 · 2017-06-21T17:07:54.000+08:00
diff --git a/MYCoreText_Example/MYCoreTextLabel/MYCoretextResultTool.m b/MYCoreText_Example/MYCoreTextLabel/MYCoretextResultTool.m
@@ -268,7 +268,7 @@ + (MYSubCoretextResult *)lastNorTextResult:(MYSubCoretextResult *)lastEmotionRes
 {
     NSMutableArray *weblinks = [NSMutableArray array];
     //正则匹配超链接
-    NSString *linkRegex = @"((http[s]{0,1}|ftp)://[a-zA-Z0-9\\.\\-]+\\.([a-zA-Z]{2,4})(:\\d+)?(/[a-zA-Z0-9\\.\\-~!@#$%^&*+?:_/=<>]*)?)|(www.[a-zA-Z0-9\\.\\-]+\\.([a-zA-Z]{2,4})(:\\d+)?(/[a-zA-Z0-9\\.\\-~!@#$%^&*+?:_/=<>]*)?)";
+    NSString *linkRegex = @"(http(s)?://)?([\\w-]+\\.)+[\\w-]+(/[\\w- ./?%&#=]*)?";
     NSRegularExpression *linkExpression = [NSRegularExpression regularExpressionWithPattern:linkRegex options:NSRegularExpressionCaseInsensitive error:nil];
     //遍历结果
     [linkExpression enumerateMatchesInString:rangeString options:NSMatchingReportCompletion range:NSMakeRange(0, rangeString.length) usingBlock:^(NSTextCheckingResult * _Nullable result, NSMatchingFlags flags, BOOL * _Nonnull stop) {

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ + (MYSubCoretextResult )lastNorTextResult:(MYSubCoretextResult )lastEmotionRes`
`268`	`268`	`{`
`269`	`269`	`NSMutableArray *weblinks = [NSMutableArray array];`
`270`	`270`	`//正则匹配超链接`
`271`		`- NSString linkRegex = @"((http[s]{0,1}\|ftp)://[a-zA-Z0-9\\.\\-]+\\.([a-zA-Z]{2,4})(:\\d+)?(/[a-zA-Z0-9\\.\\-~!@#$%^&+?:_/=<>])?)\|(www.[a-zA-Z0-9\\.\\-]+\\.([a-zA-Z]{2,4})(:\\d+)?(/[a-zA-Z0-9\\.\\-~!@#$%^&+?:_/=<>]*)?)";`
	`271`	`+ NSString linkRegex = @"(http(s)?://)?([\\w-]+\\.)+[\\w-]+(/[\\w- ./?%&#=])?";`
`272`	`272`	`NSRegularExpression *linkExpression = [NSRegularExpression regularExpressionWithPattern:linkRegex options:NSRegularExpressionCaseInsensitive error:nil];`
`273`	`273`	`//遍历结果`
`274`	`274`	`[linkExpression enumerateMatchesInString:rangeString options:NSMatchingReportCompletion range:NSMakeRange(0, rangeString.length) usingBlock:^(NSTextCheckingResult * _Nullable result, NSMatchingFlags flags, BOOL * _Nonnull stop) {`