Changeset 388 for trunk/ICeCoffEE/ICeCoffEE/TestParser.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/TestParser.m (modified) (5 diffs)

trunk/ICeCoffEE/ICeCoffEE/TestParser.m

@@ -27 +27 @@
 }
 
+static NSString *tc(NSString *s) {
+    NSMutableString *rs = [s mutableCopy];
+    [rs replaceOccurrencesOfString: @"\n" withString: @"\\" options: 0 range: NSMakeRange(0, [s length])];
+    [rs replaceOccurrencesOfString: @"\t" withString: @">" options: 0 range: NSMakeRange(0, [s length])];
+    return [rs autorelease];
+}
+
 NSString *ICCF_ErrString(OSStatus err, NSString *context) {    
     return [NSString stringWithFormat: @"%@ (%d)", context, (int)err];
@@ -42 +49 @@
 
 
+// XXX move elsewhere
+static NSString *ICCF_StringByRemovingCharactersInSet(NSString *s, NSCharacterSet *set) {
+    NSRange range = [s rangeOfCharacterFromSet: set options: 0 range: NSMakeRange(0, [s length])];
+    if (range.location == NSNotFound)
+        return s;
+    
+    NSMutableString *ms = [s mutableCopy];
+    do {
+        [ms deleteCharactersInRange: range];
+        range.length = [ms length] - range.location;
+        range = [ms rangeOfCharacterFromSet: set options: 0 range: range];
+    } while (range.location != NSNotFound);
+    
+    s = [[ms copy] autorelease];
+    [ms release];
+    return s;
+}
+
 static BOOL check_parse(NSString *uri, NSString *text,
                         NSRange delimitedURIRange, NSRange initialSelectionRange) {
@@ -51 +76 @@
     @try {
         enclosingRange = ICCF_URLEnclosingRange(text, initialSelectionRange);
-        parsedURI = [text substringWithRange: enclosingRange];
+        // XXX move trimming elsewhere
+        parsedURI = ICCF_StringByRemovingCharactersInSet([text substringWithRange: enclosingRange], [NSCharacterSet whitespaceAndNewlineCharacterSet]);
     } @catch (NSException *e) {
         parseException = e;
@@ -60 +86 @@
     }
     
-    ps(@"Text       %@", text);
+    ps(@"Text       %@", tc(text));
     pr(@"Available ", delimitedURIRange);
     pr(@"Starting  ", initialSelectionRange);
@@ -68 +94 @@
     } else {
         pr(@"Parsed    ", enclosingRange);
-        ps(@"Parsed     %@", parsedURI);
-        ps(@"Desired    %@", uri);
+        ps(@"Parsed     %@", tc(parsedURI));
+        ps(@"Desired    %@", tc(uri));
     }
     return NO;