From 3f20a98a422d5db369a030e5d7dc3176f339ded1 Mon Sep 17 00:00:00 2001 From: "yin.yan" Date: Fri, 1 May 2020 21:54:14 +0900 Subject: [PATCH] Update tokenizer. --- YYText/YYTextView.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/YYText/YYTextView.m b/YYText/YYTextView.m index 5b772cce..34bbba9e 100755 --- a/YYText/YYTextView.m +++ b/YYText/YYTextView.m @@ -1071,10 +1071,10 @@ - (YYTextRange *)_getClosestTokenRangeAtPosition:(YYTextPosition *)position { position = [self _correctedTextPosition:position]; if (!position) return nil; YYTextRange *range = nil; - if (_tokenizer) { - range = (id)[_tokenizer rangeEnclosingPosition:position withGranularity:UITextGranularityWord inDirection:UITextStorageDirectionForward]; + if (self.tokenizer) { + range = (id)[self.tokenizer rangeEnclosingPosition:position withGranularity:UITextGranularityWord inDirection:UITextStorageDirectionForward]; if (range.asRange.length == 0) { - range = (id)[_tokenizer rangeEnclosingPosition:position withGranularity:UITextGranularityWord inDirection:UITextStorageDirectionBackward]; + range = (id)[self.tokenizer rangeEnclosingPosition:position withGranularity:UITextGranularityWord inDirection:UITextStorageDirectionBackward]; } } @@ -1108,9 +1108,9 @@ - (YYTextRange *)_getClosestTokenRangeAtPoint:(CGPoint)point { YYTextRange *touchRange = [_innerLayout closestTextRangeAtPoint:point]; touchRange = [self _correctedTextRange:touchRange]; - if (_tokenizer && touchRange) { - YYTextRange *encEnd = (id)[_tokenizer rangeEnclosingPosition:touchRange.end withGranularity:UITextGranularityWord inDirection:UITextStorageDirectionBackward]; - YYTextRange *encStart = (id)[_tokenizer rangeEnclosingPosition:touchRange.start withGranularity:UITextGranularityWord inDirection:UITextStorageDirectionForward]; + if (self.tokenizer && touchRange) { + YYTextRange *encEnd = (id)[self.tokenizer rangeEnclosingPosition:touchRange.end withGranularity:UITextGranularityWord inDirection:UITextStorageDirectionBackward]; + YYTextRange *encStart = (id)[self.tokenizer rangeEnclosingPosition:touchRange.start withGranularity:UITextGranularityWord inDirection:UITextStorageDirectionForward]; if (encEnd && encStart) { NSArray *arr = [@[encEnd.start, encEnd.end, encStart.start, encStart.end] sortedArrayUsingSelector:@selector(compare:)]; touchRange = [YYTextRange rangeWithStart:arr.firstObject end:arr.lastObject];