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

Timestamp:

06/11/07 01:21:55 (17 years ago)

Author:

Nicholas Riley

Message:

VERSION: Starting with 1.5d1.

ICeCoffEEKeyEquivalents.m: Support "collision font" for displaying key
equivalent conflicts.

ICeCoffEE.m: Increase debug ICCF_MAX_URL_LEN to 120 for testing. Set
icons in ICCF_ConsolidateServicesMenu (needs better caching).

ICeCoffEEServicePrefController.m: Display icons, proper key
equivalents (instead of #, what was I thinking?!) and conflicts. Fix
a dumb bug in ICCF_PropagateServiceStateChange. Ellipsize long menu
items rather than chopping them off. Fix key equivalent column
getting moved when expanding disclosure triangles.

ICeCoffEELabeledIconCell.[hm]: An IconRef-displaying text cell.

Info-APE Module.plist: Update version to 1.5d1.

ICeCoffEE.xcodeproj: Added files, no significant changes.

English.lproj/InfoPlist.strings: Update version to 1.5d1.

English.lproj/APEInfo.rtfd/TXT.rtf: Some overdue documentation
updates.

ICeCoffEEShared.[hm]: Enable debugging; we're now using
kICServiceShortcut (though not yet for customizable shortcuts) so
define its data type.

ICeCoffEETerminal.m: Remove some useless code to "extend to beginning
of string" which seems to have been stolen from the NSTextView
implementation and not well understood. Handle common uses of
parentheses in URLs; still need to do this for NSTextView.

ICeCoffEESetServicesMenu.[hm]: Needs renaming; now with icon
extraction functionality and semi-working code to create a service
info dictionary.

Info-APEManagerPrefPane.plist: Update version to 1.5d1.

File:

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

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m

@@ -300 +300 @@
             selRange = [ICeCoffEETerminalRange rangeWithTerminal: self];
         } else { // select something
+            // XXX test this next line, it may be what's causing a Terminal bug to exhibit itself
             [storage selectWordAtLine: ICCF_line offset: ICCF_col];
             selRange = [ICeCoffEETerminalRange rangeWithTerminal: self];
@@ -312 +313 @@
 
         termRange = [ICeCoffEETerminalRange rangeWithTerminal: self pt0: [selRange pt0] pt1: [selRange pt0]];
-        // add 1 to range to trap delimiters that are on the edge of the selection (i.e., <...)
-        [termRange growForwardByLength: 1];
         [termRange growBackwardByLength: ICCF_MAX_URL_LEN]; // potentially too big
-        s = [termRange stringFromRange];
+        
+expandFront:
+        s = [termRange stringFromRange];
         ICLog(@"front %@", termRange);
         delimiterRange = [s rangeOfCharacterFromSet: urlLeftDelimiters
@@ -321 +322 @@
         if (delimiterRange.location == NSNotFound) {
             // extend to beginning of string (as much as possible)
-            [selRange growBackwardByLength: [s length] - 1];
+            [selRange growBackwardByLength: [s length]];
         } else {
             NSCAssert(delimiterRange.length == 1, @"Internal error: delimiter matched range is not of length 1");
-            [selRange growBackwardByLength: [s length] - delimiterRange.location - 2];
+            [selRange growBackwardByLength: [s length] - delimiterRange.location - 1];
+            // in https://www-s.acm.uiuc.edu/wiki/space/(user)njriley - handle clicking inside or after (user).
+            if ([s characterAtIndex: delimiterRange.location] == '(') {
+                s = [selRange stringFromRange];
+                if ([s rangeOfString: @")"].location != NSNotFound ||
+                    [s rangeOfCharacterFromSet: [NSCharacterSet characterSetWithCharactersInString: @"/."]].location == NSNotFound) {
+                    [selRange growBackwardByLength: 1];
+                    ICLog(@"expanding past (, now %@", selRange);
+                    [termRange shrinkBackByLength: [[termRange stringFromRange] length] - delimiterRange.location];
+                    goto expandFront;
+                }
+            }
         }
 
@@ -330 +342 @@
 
         termRange = [ICeCoffEETerminalRange rangeWithTerminal: self pt0: [selRange pt1] pt1: [selRange pt1]];
-        // subtract 1 from range to trap delimiters that are on the edge of the selection (i.e., ...>)
-        [termRange growBackwardByLength: 1];
         [termRange growForwardByLength: ICCF_MAX_URL_LEN]; // potentially too big
-        s = [termRange stringFromRange];
+        
+expandBack:
+        s = [termRange stringFromRange];
         ICLog(@"back %@", termRange);
         delimiterRange = [s rangeOfCharacterFromSet: urlRightDelimiters
@@ -339 +351 @@
         if (delimiterRange.location == NSNotFound) {
             // extend to end of string
-            [selRange growForwardByLength: [s length] - 1];
+            [selRange growForwardByLength: [s length]];
         } else {
             NSCAssert(delimiterRange.length == 1, @"Internal error: delimiter matched range is not of length 1");
-            [selRange growForwardByLength: delimiterRange.location - 1];
+            [selRange growForwardByLength: delimiterRange.location];
+            // URL may look like "https://www-s.acm.uiuc.edu/wiki/space/(user" now; expand if so
+            if ([s characterAtIndex: delimiterRange.location] == ')' &&
+                [[selRange stringFromRange] rangeOfString: @"("].location != NSNotFound) {
+                [selRange growForwardByLength: 1];
+                ICLog(@"expanding past ), now %@", selRange);
+                [termRange shrinkFrontByLength: delimiterRange.location + 1];
+                goto expandBack;
+            }
         }