Changeset 320 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m

Timestamp:

06/15/07 05:15:03 (17 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE.m: I was wrong in [319] about the selection extension stuff
being dumb; explain why in code, even though it's not fixed.
Implement some of the same parens support I did in Terminal. Update
for more robust service info dictionary format.

ICeCoffEEServicePrefController.m: Update for more robust service info
dictionary format.

ICeCoffEEServices.[hm]: Renamed from ICeCoffEESetServicesMenu.[hm],
since we do more now. Service info dictionary-creating code now makes
more sense and no longer has naming collision issues.

ICeCoffEEWebKit.m: Some preliminary Safari 3 compatibility stuff, not
quite working yet. An outstanding question - is it better to rely on
"public" WebCore API or private WebKit API? So far it seems the
latter is more stable.

English.lproj/APEInfo.rtfd: The Bored Zo has a name: use it. Remove
now-erroneous reference to SimpleText since TextEdit support is gone.

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m (modified) (3 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m

@@ -326 +326 @@
             NSCAssert(delimiterRange.length == 1, @"Internal error: delimiter matched range is not of length 1");
             [selRange growBackwardByLength: [s length] - delimiterRange.location - 1];
-            // in https://www-s.acm.uiuc.edu/wiki/space/(user)njriley - handle clicking inside or after (user).
+            
+            // in url/(parens)stuff, handle clicking inside or after (parens).
             if ([s characterAtIndex: delimiterRange.location] == '(') {
                 s = [selRange stringFromRange];
@@ -332 +333 @@
                     [s rangeOfCharacterFromSet: [NSCharacterSet characterSetWithCharactersInString: @"/."]].location == NSNotFound) {
                     [selRange growBackwardByLength: 1];
-                    ICLog(@"expanding past (, now %@", selRange);
+                    ICLog(@"expanding past (, now |%@|", selRange);
                     [termRange shrinkBackByLength: [[termRange stringFromRange] length] - delimiterRange.location];
                     goto expandFront;
@@ -355 +356 @@
             NSCAssert(delimiterRange.length == 1, @"Internal error: delimiter matched range is not of length 1");
             [selRange growForwardByLength: delimiterRange.location];
-            // URL may look like "https://www-s.acm.uiuc.edu/wiki/space/(user" now; expand if so
+            
+            // grow URL past closing paren if we've seen an open paren
             if ([s characterAtIndex: delimiterRange.location] == ')' &&
                 [[selRange stringFromRange] rangeOfString: @"("].location != NSNotFound) {
                 [selRange growForwardByLength: 1];
-                ICLog(@"expanding past ), now %@", selRange);
+                ICLog(@"expanding past ), now |%@|", selRange);
                 [termRange shrinkFrontByLength: delimiterRange.location + 1];
                 goto expandBack;