amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-21 06:33:18 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 3beea562a57fe58bc0ec7f6ec1ea8b43840f6655

Browse Source 
Monotone-Revision: ed0cae805a538abfe1c738e426b04f59baa43949

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-08-22T00:49:23
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-08-22 00:49:23 +00:00
parent 7c129faf3d
commit 514ca96ad4
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/NSString+Utilities.m
+9 -7
View File
@@ -161,12 +161,12 @@ static NSMutableCharacterSet *urlStartChars = nil;
if (!urlNonEndingChars)
{
urlNonEndingChars = [NSMutableCharacterSet new];
[urlNonEndingChars addCharactersInString: @"=,.:;\t \r\n"];
[urlNonEndingChars addCharactersInString: @"=,.:;&\t \r\n"];
}
if (!urlAfterEndingChars)
{
urlAfterEndingChars = [NSMutableCharacterSet new];
[urlAfterEndingChars addCharactersInString: @"&[]\t \r\n"];
[urlAfterEndingChars addCharactersInString: @"[]\t \r\n"];
}
start = refRange.location;
@@ -199,7 +199,7 @@ static NSMutableCharacterSet *urlStartChars = nil;
NSMutableArray *newRanges;
NSRange matchRange, currentUrlRange, rest;
NSString *urlText, *newUrlText, *range;
unsigned int length, matchLength;
unsigned int length, matchLength, offset;
int startLocation;
if (!urlStartChars)
@@ -224,7 +224,6 @@ static NSMutableCharacterSet *urlStartChars = nil;
matchRange.location = startLocation + 1;
currentUrlRange = [selfCopy _rangeOfURLInRange: matchRange];
if ([ranges hasRangeIntersection: currentUrlRange])
rest.location = NSMaxRange(currentUrlRange);
else
@@ -240,18 +239,21 @@ static NSMutableCharacterSet *urlStartChars = nil;
options: 0 range: rest];
}
// Make the substitutions, in reverse order
enumRanges = [newRanges reverseObjectEnumerator];
// Make the substitutions, keep track of the new offset
offset = 0;
enumRanges = [newRanges objectEnumerator];
range = [enumRanges nextObject];
while (range)
{
currentUrlRange = NSRangeFromString(range);
currentUrlRange = NSRangeFromString(range);
currentUrlRange.location += offset;
urlText = [selfCopy substringFromRange: currentUrlRange];
if ([urlText hasPrefix: prefix]) prefix = @"";
newUrlText = [NSString stringWithFormat: @"<a href=\"%@%@\">%@</a>",
prefix, urlText, urlText];
[selfCopy replaceCharactersInRange: currentUrlRange
withString: newUrlText];
offset += ([newUrlText length] - [urlText length]);
// Add range for further substitutions
currentUrlRange = NSMakeRange (currentUrlRange.location, [newUrlText length]);