Changeset 388 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEParser.m

Timestamp:

02/22/08 19:53:07 (16 years ago)

Author:

Nicholas Riley

Message:

APEMain.m: Note missing Xcode 3 support. Add Terminal 2.0 support.

English.lproj/APE Manager plugin.nib:

English.lproj/APEInfo.rtfd:

ICeCoffEE.[hm]: Bring triggering window and app to front if error
dialog displayed in ICCF_HandleException. Remove initial word
selection. Launch preexisting selection if present. Remove 10.3
support. Update for new ICeCoffEETrigger API. Rename downEvent
parameter for consistency.

ICeCoffEE.xcodeproj: Added files.

ICeCoffEEParser.m: Handle multiline URLs.

ICeCoffEETTView.[hm]: Terminal 2.0 support (thank you for having a
usable NSTextInput implementation!)

ICeCoffEETTViewTrigger.[hm]: ICeCoffEETrigger implementation for
TTView. Can't set range as we do for NSTextView because you can't
have an arbitrary empty selection range in Terminal, so we pass it
directly to ICCF_LaunchURLFromTTView.

ICeCoffEETerminal.[hm]: Fix capitalization on ICeCoffEETermSubviewSuper.
Pass downEvent to ICCF_HandleException so it can bring the triggering
window to the front.

ICeCoffEETextViewTrigger.[hm]: Moved from ICeCoffEETrigger.

ICeCoffEETrigger.[hm]: Now an abstract superclass. Replace direct
access to ICCF_sharedTrigger with +cancel. Create 0-character range
(if click outside selectedRange) or save selectedRange. Move
debugging logs here from ICeCoffEE.m. Add description method.

ICeCoffEEWebKit.m: Pass downEvent to ICCF_HandleException so it can
bring the triggering window to the front.

Installer components/ui/ui.plist: Updated for 1.5d3.

TestParser.m: Handle multiline URLs; newlines are printed as \ and
tabs as >. Implement ICCF_StringByRemovingCharactersInSet, which will
move elsewhere once Internet Config support is removed.

VERSION.xcconfig: Updated for 1.5d3.

urls.plist: Test for multiline URLs.

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEParser.m (modified) (4 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEParser.m

@@ -115 +115 @@
 
 static BOOL ICCF_StringIncludesCharacter(NSString *s, unichar character, NSRange range) {
-    return ([s rangeOfCharacterFromSet: [NSCharacterSet characterSetWithCharactersInString:
+    NSRange result = [s rangeOfCharacterFromSet: [NSCharacterSet characterSetWithCharactersInString:
                                          [NSString stringWithCharacters: &character length: 1]]
-                               options: NSLiteralSearch range: range].location != NSNotFound);
+                                        options: NSLiteralSearch range: range];
+    return (result.location != NSNotFound);
 }
 
@@ -135 +136 @@
     NSRange delimiterRange;
     unsigned extraLen;
+    BOOL multiLine = NO;
     
     ICCF_CheckRange(range);
@@ -161 +163 @@
     } else {
         NSCAssert(delimiterRange.length == 1, @"Internal error: delimiter matched range is not of length 1");
+        if ([s characterAtIndex: delimiterRange.location] == '<') { // XXX move to expandBoth to handle clicking in middle
+            multiLine = YES;
+            urlRightDelimiters = [NSCharacterSet characterSetWithCharactersInString: @">"];
+        }
         range.length += range.location - delimiterRange.location - 1;
         range.location = delimiterRange.location + 1;
     }
     
+
 expandBack:
     // XXX instead of length of string, make this stop at the max URL length to prevent protracted searches
@@ -182 +189 @@
         extraLen = [s length] - NSMaxRange(range);
 
+        unichar opening, closing = [s characterAtIndex: delimiterRange.location];
+        if (closing == '>' && !multiLine && ICCF_StringIncludesCharacter(s, '<', NSMakeRange(0, range.location))) {
+            urlLeftDelimiters = [NSCharacterSet characterSetWithCharactersInString: @"<"];
+            goto expandFront; // XXX move to expandBoth to handle clicking in middle
+        }
         // grow URL past closing paren/brace/bracket if we've seen an open paren/brace/bracket
-        unichar opening, closing = [s characterAtIndex: delimiterRange.location];
         if (closing == ')') opening = '(';
         else if (closing == '}') opening = '{';