Revision: 29355
http://sourceforge.net/p/bibdesk/svn/29355
Author: hofman
Date: 2025-07-24 16:01:03 +0000 (Thu, 24 Jul 2025)
Log Message:
-----------
simplify
Modified Paths:
--------------
trunk/bibdesk/NSString_BDSKExtensions.m
Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m 2025-07-24 15:55:56 UTC (rev
29354)
+++ trunk/bibdesk/NSString_BDSKExtensions.m 2025-07-24 16:01:03 UTC (rev
29355)
@@ -989,23 +989,22 @@
- (NSRange)rangeOfWord:(NSString *)searchString
nonWordCharacters:(NSCharacterSet *)nonWordCharacters
ptions:(NSStringCompareOptions)mask range:(NSRange)searchRange {
NSRange range = [self rangeOfString:searchString options:mask
range:searchRange];
- if (range.location != NSNotFound) {
- if ((range.location == 0 || [nonWordCharacters characterIsMember:[self
characterAtIndex:range.location]]) && (NSMaxRange(range) == [self length] ||
[nonWordCharacters characterIsMember:[self
characterAtIndex:NSMaxRange(range)]]))
- return range;
- if ((mask & NSAnchoredSearch))
+ if (range.location == NSNotFound)
+ return range;
+ if ((range.location == 0 || [nonWordCharacters characterIsMember:[self
characterAtIndex:range.location]]) && (NSMaxRange(range) == [self length] ||
[nonWordCharacters characterIsMember:[self
characterAtIndex:NSMaxRange(range)]]))
+ return range;
+ if ((mask & NSAnchoredSearch))
+ return NSMakeRange(NSNotFound, 0);
+ if ((mask & NSBackwardsSearch) == 0) {
+ if (NSMaxRange(searchRange) <= NSMaxRange(range) + [searchString
length])
return NSMakeRange(NSNotFound, 0);
- if ((mask & NSBackwardsSearch) == 0) {
- if (NSMaxRange(searchRange) <= NSMaxRange(range) + [searchString
length])
- return NSMakeRange(NSNotFound, 0);
- searchRange = NSMakeRange(NSMaxRange(range) + 1,
NSMaxRange(searchRange) - NSMaxRange(range) - 1);
- } else {
- if (range.location >= searchRange.location + [searchString length])
- return NSMakeRange(NSNotFound, 0);
- searchRange = NSMakeRange(searchRange.location, range.location -
searchRange.location - 1);
- }
- return [self rangeOfWord:searchString
nonWordCharacters:nonWordCharacters ptions:mask range:searchRange];
+ searchRange = NSMakeRange(NSMaxRange(range) + 1,
NSMaxRange(searchRange) - NSMaxRange(range) - 1);
+ } else {
+ if (range.location >= searchRange.location + [searchString length])
+ return NSMakeRange(NSNotFound, 0);
+ searchRange.length = range.location - 1 - searchRange.location;
}
- return range;
+ return [self rangeOfWord:searchString nonWordCharacters:nonWordCharacters
ptions:mask range:searchRange];
}
- (NSRange)rangeOfWord:(NSString *)searchString
nonWordCharacters:(NSCharacterSet *)nonWordCharacters
ptions:(NSStringCompareOptions)mask {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
