The R Project SVN – R-packages – Diff – /trunk/Mac-GUI/RScriptEditorTextView.m

+ *
  */
 #import "RScriptEditorTextView.h"
 #import "RScriptEditorTextStorage.h"
-#import "RScriptEditorTypesetter.h"
+#import "RScriptEditorTypeSetter.h"
 #import "RScriptEditorLayoutManager.h"
 #import "FoldingSignTextAttachmentCell.h"
 #import "RGUI.h"
 extern NSUInteger rdlex();
 typedef struct rd_buffer_state *RD_BUFFER_STATE;
 void rd_switch_to_buffer(RD_BUFFER_STATE);
 RD_BUFFER_STATE rd_scan_string (const char *);
+static SEL _foldedSel;
 #pragma mark -
 #pragma mark attribute definition
 #define kAPlinked      @"Linked" // attribute for a via auto-pair inserted char
 #define kBTQuote       @"BTQuote"
 #define kBTQuoteValue  @"isBTQuoted"
 #pragma mark -
-#define R_SYNTAX_HILITE_BIAS 3000
+#define R_SYNTAX_HILITE_BIAS 2000
 #define R_MAX_TEXT_SIZE_FOR_SYNTAX_HIGHLIGHTING 20000000
 static inline const char* NSStringUTF8String(NSString* self)
+{
 	[super awakeFromNib];
 	SLog(@"RScriptEditorTextView: awakeFromNib <%@>", self);
 	breakSyntaxHighlighting = 0;
+	_foldedSel = @selector(foldedAtIndex:);
 	// Bind scrollView programmatically - if done in RDocument.xib this'd lead to
 	// calling awakeFromNib twice
 	id scrView = (NSScrollView *)self.superview.superview;
 	if ([scrView isKindOfClass:[NSScrollView class]]) {
 		if(scrollView) [scrollView release];
 	theTextStorage = [[RScriptEditorTextStorage alloc] init];
 	// Set self as delegate for the textView's textStorage to enable syntax highlighting,
 	[theTextStorage setDelegate:self];
+	_foldedImp = [theTextStorage methodForSelector:_foldedSel];
 	// <TODO> enable for folding
 	// Make sure using foldingLayoutManager
 	// if (![[self layoutManager] isKindOfClass:[RScriptEditorLayoutManager class]]) {
 	// 	RScriptEditorLayoutManager *layoutManager = [[RScriptEditorLayoutManager alloc] init];
 	// disabled to get the current text range in textView safer
 	[[self layoutManager] setBackgroundLayoutEnabled:NO];
 	[[self layoutManager] replaceTextStorage:theTextStorage];
+	// <TODO> enable for folding
+	// [(RScriptEditorTypeSetter*)[[self layoutManager] typesetter] setTextStorage:theTextStorage];
 	isSyntaxHighlighting = NO;
 	if([prefs objectForKey:highlightCurrentLine] == nil) [prefs setBool:YES forKey:highlightCurrentLine];
 	if([prefs objectForKey:indentNewLines] == nil) [prefs setBool:YES forKey:indentNewLines];
 	size_t token;
 	NSRange tokenRange;
 	// initialise flex
 	yyuoffset = textRange.location; yyuleng = 0;
+	BOOL hasFoldedItems = [theTextStorage hasFoldedItems];
 	if([[self delegate] isRdDocument]) {
 			rd_switch_to_buffer(rd_scan_string(NSStringUTF8String([selfstr substringWithRange:textRange])));
 			// now loop through all the tokens
 			while ((token = rdlex())) {
+				if(hasFoldedItems && (NSInteger)(_foldedImp)(theTextStorage, _foldedSel, yyuoffset) > -1) continue;
 				switch (token) {
 					case RDPT_COMMENT:
 					    tokenColor = shColorComment;
 					    break;
 					case RDPT_SECTION:
 	} else {
 		yy_switch_to_buffer(yy_scan_string(NSStringUTF8String([selfstr substringWithRange:textRange])));
+// NSDate *d1 = [NSDate date];
 		// now loop through all the tokens
 		while ((token = yylex())) {
+			if(hasFoldedItems && (NSInteger)(_foldedImp)(theTextStorage, _foldedSel, yyuoffset) > -1) continue;
 			switch (token) {
 				case RPT_SINGLE_QUOTED_TEXT:
 				case RPT_DOUBLE_QUOTED_TEXT:
 				    tokenColor = shColorString;
 				    break;
 				break;
+			}
+		}
+// NSLog(@"bibiko1 t %f", [[NSDate date] timeIntervalSinceDate:d1]);
+	}
 	// set current textColor to the color of the caret's position - 1
 	// to try to suppress writing in normalColor before syntax highlighting
 	NSUInteger ix = [self selectedRange].location;
+	}
+}
+- (IBAction)undo:(id)sender
+{
+	if([[self undoManager] canUndo]) {
+		[[self undoManager] undo];
+		if(lineNumberingEnabled)
+			[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
+	}
+}
+- (IBAction)redo:(id)sender
+{
+	if([[self undoManager] canRedo]) {
+		[[self undoManager] redo];
+		if(lineNumberingEnabled)
+			[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
+	}
+}
 #pragma mark -
 #pragma mark Folding
-- (void)foldSelectedLines:(id)sender
+- (void)foldLinesInRange:(NSRange)range
+{
+	if(range.length < 2) return;
+	NSInteger foldId = [theTextStorage registerFoldedRange:range];
-	NSRange r = [self selectedRange];
+	NSInteger caretPosition = [self selectedRange].location;
+	BOOL caretWasInsideFoldedRange = NO;
-	if(r.length < 4) return;
+	if(foldId < 0) {
+		NSBeep();
+		return;
+	}
+	if(caretPosition >= range.location && caretPosition < NSMaxRange(range)) {
+		[self setSelectedRange:NSMakeRange(NSMaxRange(range), 0)];
+		caretWasInsideFoldedRange = YES;
+	}
-	unichar s = [[self string] characterAtIndex:r.location];
+	unichar s = [[self string] characterAtIndex:range.location];
-	unichar e = [[self string] characterAtIndex:NSMaxRange(r)-1];
+	unichar e = [[self string] characterAtIndex:NSMaxRange(range)-1];
 	BOOL wrapCheck = NO;
 	if(s == '{' && e == '}') {
-		r.location++;
+		range.location++;
-		r.length -= 2;
+		range.length -= 2;
 		wrapCheck = YES;
 	} else if(s == '(' && e == ')') {
-		r.location++;
+		range.location++;
-		r.length -= 2;
+		range.length -= 2;
 		wrapCheck = YES;
 	} else if(s == '[' && e == ']') {
-		r.location++;
+		range.location++;
-		r.length -= 2;
+		range.length -= 2;
 		wrapCheck = YES;
+	}
-	if(!r.length) return;
+	if(!range.length) return;
+	if(!wrapCheck && [[self string] characterAtIndex:NSMaxRange(range)-1] == '\n')
+		range.length--;
-	if(!wrapCheck && [[self string] characterAtIndex:NSMaxRange(r)-1] == '\n')
-		r.length--;
+	if(!range.length) return;
-	if(!r.length) return;
 	NSString *tooltip = nil;
-	if(r.length < 300)
+	if(range.length < 300)
-		tooltip = [[self string] substringWithRange:r];
+		tooltip = [[self string] substringWithRange:range];
 	else
-		tooltip = [[[self string] substringWithRange:NSMakeRange(r.location, 300)] stringByAppendingString:@"\n…"];
+		tooltip = [[[self string] substringWithRange:NSMakeRange(range.location, 300)] stringByAppendingString:@"\n…"];
 	[theTextStorage beginEditing];
-	[theTextStorage addAttribute:foldingAttributeName value:[NSNumber numberWithBool:YES] range:r];
+	[theTextStorage addAttribute:foldingAttributeId value:[NSNumber numberWithInteger:foldId] range:range];
-	[theTextStorage addAttribute:NSCursorAttributeName value:[NSCursor arrowCursor] range:r];
+	[theTextStorage addAttribute:NSCursorAttributeName value:[NSCursor arrowCursor] range:range];
-	[theTextStorage addAttribute:NSToolTipAttributeName value:tooltip range:r];
+	[theTextStorage addAttribute:NSToolTipAttributeName value:tooltip range:range];
 	[theTextStorage endEditing];
 	[self didChangeText];
-	if(lineNumberingEnabled)
-		[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
-	[self setSelectedRange:NSMakeRange(NSMaxRange(r), 0)];
+	if(caretWasInsideFoldedRange)
-	[self scrollRangeToVisible:[self selectedRange]];
+		[self scrollRangeToVisible:[self selectedRange]];
+	if(lineNumberingEnabled)
+		[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.01f];
+	[NSObject cancelPreviousPerformRequestsWithTarget:self
+							selector:@selector(doSyntaxHighlighting)
+							object:nil];
+	[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.0f];
+}
 - (BOOL)unfoldLinesContainingCharacterAtIndex:(NSUInteger)charIndex
+{
-	NSTextStorage *textStorage = [self textStorage];
+	NSInteger foldIndex = [theTextStorage foldedAtIndex:charIndex];
-	NSRange range;
+	if(foldIndex > -1) {
-	NSNumber *value = [textStorage attribute:foldingAttributeName atIndex:charIndex longestEffectiveRange:&range inRange:NSMakeRange(0, [textStorage length])];
+		[theTextStorage removeFoldedRangeWithId:[theTextStorage attribute:foldingAttributeId atIndex:charIndex effectiveRange:NULL]];
-	if (value && [value boolValue] && [self shouldChangeTextInRange:range replacementString:nil]) {
-		[textStorage removeAttribute:foldingAttributeName range:range];
-		[textStorage removeAttribute:NSCursorAttributeName range:range];
-		[textStorage removeAttribute:NSToolTipAttributeName range:range];
 		[self didChangeText];
-		[self setSelectedRange:NSMakeRange(NSMaxRange(range), 0)];
 		if(lineNumberingEnabled)
-			[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
+			[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.01f];
-		[self scrollRangeToVisible:[self selectedRange]];
+		[NSObject cancelPreviousPerformRequestsWithTarget:self
+								selector:@selector(doSyntaxHighlighting)
+								object:nil];
+		[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.0f];
 		return YES;
+	}
 	return NO;
+}
 - (void)mouseDown:(NSEvent *)event
+{
 	// <TODO> enable for folding
 	[super mouseDown:event];
-// 	if(![theTextStorage isKindOfClass:[RScriptEditorTextStorage class]]) [super mouseDown:event];
+	// if(![theTextStorage isKindOfClass:[RScriptEditorTextStorage class]]) {
+	// 	[super mouseDown:event];
+	// 	return;
+	// }
-//
+	//
-// 	RScriptEditorLayoutManager *layoutManager = (RScriptEditorLayoutManager*)[self layoutManager];
+	// RScriptEditorLayoutManager *layoutManager = (RScriptEditorLayoutManager*)[self layoutManager];
-// 	NSUInteger glyphIndex = [layoutManager glyphIndexForPoint:[self convertPointFromBase:[event locationInWindow]] inTextContainer:[self textContainer]];
+	// NSUInteger glyphIndex = [layoutManager glyphIndexForPoint:[self convertPointFromBase:[event locationInWindow]] inTextContainer:[self textContainer]];
-//
-// 	[theTextStorage setLineFoldingEnabled:YES];
-//
+	//
-// 	// trigger unfolding if inside foldingAttachmentCell
+	// // trigger unfolding if inside foldingAttachmentCell
-// 	if (glyphIndex < [layoutManager numberOfGlyphs]) {
+	// if (glyphIndex < [layoutManager numberOfGlyphs]) {
+	//
-// 		NSUInteger charIndex = [layoutManager characterIndexForGlyphAtIndex:glyphIndex];
+	// 	NSUInteger charIndex = [layoutManager characterIndexForGlyphAtIndex:glyphIndex];
-// 		NSRange range;
-// 		NSNumber *value = [theTextStorage attribute:foldingAttributeName atIndex:charIndex longestEffectiveRange:&range inRange:NSMakeRange(0, [theTextStorage length])];
+	// 	NSInteger foldIndex  = [theTextStorage foldedForIndicatorAtIndex:charIndex];
-//
+	//
-// 		if (value && [value boolValue]) {
+	// 	if (foldIndex > -1) {
+	//
+	// 		NSInteger foldStart = [theTextStorage foldedRangeAtIndex:foldIndex].location+1;
-// 			NSTextAttachment *attachment = [theTextStorage attribute:NSAttachmentAttributeName atIndex:range.location effectiveRange:NULL];
+	// 		NSTextAttachment *attachment = [theTextStorage attribute:NSAttachmentAttributeName atIndex:foldStart effectiveRange:NULL];
-//
+	//
-// 			if (attachment) {
+	// 		if (attachment) {
-// 				NSTextAttachmentCell *cell = (NSTextAttachmentCell *)[attachment attachmentCell];
+	// 			NSTextAttachmentCell *cell = (NSTextAttachmentCell *)[attachment attachmentCell];
-// 				NSRect cellFrame;
+	// 			NSRect cellFrame;
-// 				NSPoint delta;
+	// 			NSPoint delta;
-//
+	//
-// 				glyphIndex = [layoutManager glyphIndexForCharacterAtIndex:range.location];
+	// 			glyphIndex = [layoutManager glyphIndexForCharacterAtIndex:foldStart];
-//
+	//
-// 				cellFrame.origin = [self textContainerOrigin];
+	// 			cellFrame.origin = [self textContainerOrigin];
-// 				cellFrame.size = [layoutManager attachmentSizeForGlyphAtIndex:glyphIndex];
+	// 			cellFrame.size = [layoutManager attachmentSizeForGlyphAtIndex:glyphIndex];
-//
+	//
-// 				delta = [layoutManager lineFragmentRectForGlyphAtIndex:glyphIndex effectiveRange:NULL].origin;
+	// 			delta = [layoutManager lineFragmentRectForGlyphAtIndex:glyphIndex effectiveRange:NULL].origin;
-// 				cellFrame.origin.x += delta.x;
+	// 			cellFrame.origin.x += delta.x;
-// 				cellFrame.origin.y += delta.y;
+	// 			cellFrame.origin.y += delta.y;
-//
+	//
-// 				cellFrame.origin.x += [layoutManager locationForGlyphAtIndex:glyphIndex].x;
+	// 			cellFrame.origin.x += [layoutManager locationForGlyphAtIndex:glyphIndex].x;
-//
+	//
+	// 			if ([cell wantsToTrackMouseForEvent:event inRect:cellFrame ofView:self atCharacterIndex:foldStart]
-// 				if ([cell wantsToTrackMouseForEvent:event inRect:cellFrame ofView:self atCharacterIndex:range.location] && [cell trackMouse:event inRect:cellFrame ofView:self atCharacterIndex:range.location untilMouseUp:YES]) return;
+	// 					&& [cell trackMouse:event inRect:cellFrame ofView:self atCharacterIndex:foldStart untilMouseUp:YES]) return;
-// 			}
-// 		}
+	// 		}
-// 	}
+	// 	}
-//
+	// }
-// 	[theTextStorage setLineFoldingEnabled:NO];
-//
+	//
-// 	[super mouseDown:event];
+	// [super mouseDown:event];
-// }
+}
-//
 // - (void)setSelectedRanges:(NSArray *)ranges affinity:(NSSelectionAffinity)affinity stillSelecting:(BOOL)stillSelectingFlag
 // {
 //
 // 	if(!stillSelectingFlag) {
 //
 // 			}
 // 		}
 // 	}
 //
 // 	[super setSelectedRanges:ranges affinity:affinity stillSelecting:stillSelectingFlag];
+//
-}
+// }
+//
 - (void)setTypingAttributes:(NSDictionary *)attrs
+{
-	// we don't want to store foldingAttributeName as a typing attribute
+	// we don't want to store foldingAttributeId as a typing attribute
-	if ([attrs objectForKey:foldingAttributeName]) {
+	if ([attrs objectForKey:foldingAttributeId]) {
 		NSMutableDictionary *copy = [[attrs mutableCopyWithZone:NULL] autorelease];
-		[copy removeObjectForKey:foldingAttributeName];
+		[copy removeObjectForKey:foldingAttributeId];
 		attrs = copy;
+	}
 	[super setTypingAttributes:attrs];
+}

The R Project SVN R-packages

(root)/trunk/Mac-GUI/RScriptEditorTextView.m @ 6232 – Rev 6232 → 6233