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

 #define kBTQuote       @"BTQuote"
 #define kBTQuoteValue  @"isBTQuoted"
 #pragma mark -
-#define R_SYNTAX_HILITE_BIAS 2000
+#define R_SYNTAX_HILITE_BIAS 3000
 #define R_MAX_TEXT_SIZE_FOR_SYNTAX_HIGHLIGHTING 20000000
 static inline const char* NSStringUTF8String(NSString* self)
+{
 	[[self textStorage] setDelegate:self];
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 	[[self layoutManager] setAllowsNonContiguousLayout:YES];
 #endif
 	// Set defaults for general usage
 	braceHighlightInterval = [Preferences floatForKey:HighlightIntervalKey withDefault:0.3f];
 	lineNumberingEnabled = [Preferences flagForKey:showLineNumbersKey withDefault:NO];
 	argsHints = [Preferences flagForKey:prefShowArgsHints withDefault:YES];
 	lineWrappingEnabled = [Preferences flagForKey:enableLineWrappingKey withDefault:YES];
 	[self setContinuousSpellCheckingEnabled:NO];
 	if(![Preferences flagForKey:enableLineWrappingKey withDefault: YES])
 		[scrollView setHasHorizontalScroller:YES];
+	if(!lineWrappingEnabled)
+		[self updateLineWrappingMode];
 	// Re-define tab stops for a better editing
 	[self setTabStops];
 	// disabled to get the current text range in textView safer
 	[[self layoutManager] setBackgroundLayoutEnabled:NO];
 	// add NSViewBoundsDidChangeNotification to scrollView
-	[scrollView setPostsBoundsChangedNotifications:YES];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(boundsDidChangeNotification:) name:NSViewBoundsDidChangeNotification object:[scrollView contentView]];
 	NSColor *c = [Preferences unarchivedObjectForKey:normalSyntaxColorKey withDefault:nil];
 	if (c) shColorNormal = c;
 	else shColorNormal=[NSColor colorWithDeviceRed:0.025 green:0.085 blue:0.600 alpha:1.0];
 	[prefs addObserver:self forKeyPath:prefShowArgsHints options:NSKeyValueObservingOptionNew context:NULL];
 	[prefs addObserver:self forKeyPath:enableLineWrappingKey options:NSKeyValueObservingOptionNew context:NULL];
 	[prefs addObserver:self forKeyPath:RScriptEditorDefaultFont options:NSKeyValueObservingOptionNew context:NULL];
 	[prefs addObserver:self forKeyPath:HighlightIntervalKey options:NSKeyValueObservingOptionNew context:NULL];
 	[prefs addObserver:self forKeyPath:highlightCurrentLine options:NSKeyValueObservingOptionNew context:NULL];
+	[prefs addObserver:self forKeyPath:showLineNumbersKey options:NSKeyValueObservingOptionNew context:NULL];
 	theTextStorage = [self textStorage];
+}
 - (void)dealloc {
 	SLog(@"RScriptEditorTextView: dealloc <%@>", self);
 	if(editorToolbar) [editorToolbar release];
 	if(highlightColorAttr) [highlightColorAttr release];
 	if(shColorNormal) [shColorNormal release];
 			[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.1];
 	} else if ([keyPath isEqualToString:editorCursorColorKey]) {
 		if(shColorCursor) [shColorCursor release];
 		shColorCursor = [[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]] retain];
 		[self setInsertionPointColor:shColorCursor];
-		[self setNeedsDisplay:YES];
+		[self setNeedsDisplayInRect:[self bounds]];
 	} else if ([keyPath isEqualToString:identifierSyntaxColorKey]) {
 		if(shColorIdentifier) [shColorIdentifier release];
 		shColorIdentifier = [[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]] retain];
 		if([self isEditable])
 			[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.1];
 	} else if ([keyPath isEqualToString:editorBackgroundColorKey]) {
 		if(shColorBackground) [shColorBackground release];
 		shColorBackground = [[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]] retain];
-		[self setNeedsDisplay:YES];
+		[self setNeedsDisplayInRect:[self bounds]];
 	} else if ([keyPath isEqualToString:editorCurrentLineBackgroundColorKey]) {
 		if(shColorCurrentLine) [shColorCurrentLine release];
 		shColorCurrentLine = [[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]] retain];
-		[self setNeedsDisplay:YES];
+		[self setNeedsDisplayInRect:[self bounds]];
 	} else if ([keyPath isEqualToString:showSyntaxColoringKey]) {
 		syntaxHighlightingEnabled = [[change objectForKey:NSKeyValueChangeNewKey] boolValue];
 		if(syntaxHighlightingEnabled) {
 			[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.1];
+		}
 	} else if ([keyPath isEqualToString:enableLineWrappingKey]) {
 		[self updateLineWrappingMode];
+	} else if ([keyPath isEqualToString:showLineNumbersKey]) {
+		lineNumberingEnabled = [[change objectForKey:NSKeyValueChangeNewKey] boolValue];
+		//TODO implement
+		if(lineNumberingEnabled) {
+			if(!theRulerView) {
+				theRulerView = [[NoodleLineNumberView alloc] initWithScrollView:scrollView];
+				[scrollView setVerticalRulerView:theRulerView];
+			}
+			[scrollView setHasHorizontalRuler:NO];
+			[scrollView setHasVerticalRuler:YES];
+			[scrollView setRulersVisible:YES];
+		} else {
+			[theRulerView release];
+			theRulerView = nil;
+			[scrollView setHasHorizontalRuler:NO];
+			[scrollView setHasVerticalRuler:NO];
+			[scrollView setRulersVisible:NO];
+		}
+		[self setNeedsDisplay:YES];
 	} else if ([keyPath isEqualToString:prefShowArgsHints]) {
 		argsHints = [[change objectForKey:NSKeyValueChangeNewKey] boolValue];
 		if(!argsHints) {
 			[[self delegate] setStatusLineText:@""];
 		} else {
 			[self currentFunctionHint];
+		}
 	} else if ([keyPath isEqualToString:highlightCurrentLine]) {
-		[self setNeedsDisplay:YES];
+		[self setNeedsDisplayInRect:[self bounds]];
 	} else if ([keyPath isEqualToString:RScriptEditorDefaultFont] && ![[[[self window] windowController] document] isRTF] && ![self selectedRange].length) {
 			[self setFont:[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]]];
-			[self setNeedsDisplay:YES];
+			[self setNeedsDisplayInRect:[self bounds]];
 		} else if ([keyPath isEqualToString:HighlightIntervalKey]) {
 		braceHighlightInterval = [Preferences floatForKey:HighlightIntervalKey withDefault:0.3f];
+	}
+}
 		// Cancel setting undo break point
 		[NSObject cancelPreviousPerformRequestsWithTarget:self
 								selector:@selector(breakUndoCoalescing)
 								object:nil];
-		// Cancel calling doSyntaxHighlighting
+		// Cancel calling functionRescan
 		[NSObject cancelPreviousPerformRequestsWithTarget:[self delegate]
 								selector:@selector(functionRescan)
 								object:nil];
 		// Improve undo behaviour, i.e. it depends how fast the user types
+}
 #pragma mark -
+- (BOOL)lineNumberingEnabled
+{
+	return lineNumberingEnabled;
+}
 - (void)setDeleteBackward:(BOOL)delBack
+{
 	deleteBackward = delBack;
+}
  * Some sample code from Andrew Choi ( http://members.shaw.ca/akochoi-old/blog/2003/11-09/index.html#3 ) has been reused.
  */
 - (void)doSyntaxHighlighting
+{
-	if (isSyntaxHighlighting || !syntaxHighlightingEnabled || [[self delegate] plain] || [theTextStorage length] > 40000000) return;
+	if (!syntaxHighlightingEnabled || [[self delegate] plain]) return;
+	isSyntaxHighlighting = YES;
 	NSString *selfstr    = [theTextStorage string];
 	NSInteger strlength  = (NSInteger)[selfstr length];
-	// Avoid syntax highlighting of a big change but re-trigger it for highlighting it partly
-	if([theTextStorage editedRange].length > (int)(R_SYNTAX_HILITE_BIAS * 4)) {
-		[self insertText:@""];
-		// remove inserting action from undo manager is keep edit status
-		[[self undoManager] undo];
-		return;
-	}
 	// == Do highlighting partly (max R_SYNTAX_HILITE_BIAS*2 around visibleRange
 	// by considering entire lines).
 	// Get the text range currently displayed in the view port
 	NSRect visibleRect = [[[self enclosingScrollView] contentView] documentVisibleRect];
 	NSRange visibleRange = [[self layoutManager] glyphRangeForBoundingRectWithoutAdditionalLayout:visibleRect inTextContainer:[self textContainer]];
-	if(!visibleRange.length) return;
+	if(!visibleRange.length) {
+		isSyntaxHighlighting = NO;
+		return;
+	}
 	NSInteger start = visibleRange.location - R_SYNTAX_HILITE_BIAS;
 	if (start > 0)
 		while(start > 0) {
 			if(CFStringGetCharacterAtIndex((CFStringRef)selfstr, start)=='\n')
 #endif
 	// only to be sure that nothing went wrongly
 	textRange = NSIntersectionRange(textRange, NSMakeRange(0, [theTextStorage length]));
-	if (!textRange.length)
+	if (!textRange.length) {
+		isSyntaxHighlighting = NO;
 		return;
-	isSyntaxHighlighting = YES;
+	}
 	[theTextStorage beginEditing];
 	NSColor *tokenColor = nil;
 	size_t tokenEnd, token;
+	}
 	[theTextStorage endEditing];
 	isSyntaxHighlighting = NO;
+	[self setNeedsDisplay:YES];
+}
 -(void)resetHighlights
+{
 	SLog(@"RScriptEditorTextView: resetHighlights with current highlite %d", currentHighlight);
  */
 - (void)boundsDidChangeNotification:(NSNotification *)notification
+{
 	if(startListeningToBoundChanges) {
 		[NSObject cancelPreviousPerformRequestsWithTarget:self
 									selector:@selector(doSyntaxHighlighting)
 									object:nil];
-		if(![theTextStorage changeInLength] && ![self selectedRange].length) {
+		if(![theTextStorage changeInLength]) {
 			[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.05];
+		}
+	}
+}
 #pragma mark -

The R Project SVN R-packages

(root)/trunk/Mac-GUI/RScriptEditorTextView.m – Rev 5770 → 5805