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

 - (void)awakeFromNib
+{
 	SLog(@"RScriptEditorTextView: awakeFromNib <%@>", self);
+	isSyntaxHighlighting = NO;
 	prefs = [[NSUserDefaults standardUserDefaults] retain];
 	[[Preferences sharedPreferences] addDependent:self];
 	if([prefs objectForKey:highlightCurrentLine] == nil) [prefs setBool:YES forKey:highlightCurrentLine];
 	if([prefs objectForKey:indentNewLines] == nil) [prefs setBool:YES forKey:indentNewLines];
 		[scrollView setRulersVisible:YES];
+	}
 	[self setAllowsDocumentBackgroundColorChange:YES];
 	[self setContinuousSpellCheckingEnabled:NO];
+	if(![Preferences flagForKey:enableLineWrappingKey withDefault: YES])
+		[scrollView setHasHorizontalScroller:YES];
 	// Re-define tab stops for a better editing
 	[self setTabStops];
 	// disabled to get the current text range in textView safer
 	[[self layoutManager] setBackgroundLayoutEnabled:NO];
-	NSSize layoutSize = [self maxSize];
-	[self setHorizontallyResizable:YES];
-	[self setMaxSize: layoutSize];
-	if (!lineWrappingEnabled) {
-		[scrollView setHasHorizontalScroller:YES];
-		[[self textContainer] setWidthTracksTextView:NO];
-	} else {
-		[scrollView setHasHorizontalScroller:NO];
-		[[self textContainer] setWidthTracksTextView:YES];
-	}
-	[[self textContainer] setHeightTracksTextView: NO];
-	[[self textContainer] setContainerSize:layoutSize];
 	// 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];
 		} else {
 			[theTextStorage removeAttribute:NSForegroundColorAttributeName range:NSMakeRange(0, [[theTextStorage string] length])];
+		}
 	} else if ([keyPath isEqualToString:enableLineWrappingKey]) {
-		lineWrappingEnabled = [[change objectForKey:NSKeyValueChangeNewKey] boolValue];
-		NSSize layoutSize = NSMakeSize(10e6,10e6);
-		[self setHorizontallyResizable:YES];
-		[self setMaxSize: layoutSize];
+		[self updateLineWrappingMode];
-		[[self textContainer] setContainerSize:layoutSize];
-		if (!lineWrappingEnabled) {
-			[scrollView setHasHorizontalScroller:YES];
-			[[self textContainer] setWidthTracksTextView:NO];
-		} else {
-			[[self textContainer] setContainerSize:[self bounds].size];
-			[scrollView setHasHorizontalScroller:NO];
-			[[self textContainer] setWidthTracksTextView:YES];
-			// Enforce view to be re-layouted correctly
-			[[self undoManager] disableUndoRegistration];
-			[self selectAll:nil];
-			[self cut:nil];
-			[self paste:nil];
-			[[self undoManager] enableUndoRegistration];
-		}
-		[[self textContainer] setHeightTracksTextView:NO];
-		[[NSNotificationCenter defaultCenter] postNotificationName:NSWindowDidResizeNotification object:[[self delegate] window]];
 	} else if ([keyPath isEqualToString:prefShowArgsHints]) {
 		argsHints = [[change objectForKey:NSKeyValueChangeNewKey] boolValue];
 		if(!argsHints) {
 			[[self delegate] setStatusLineText:@""];
 		} else if ([keyPath isEqualToString:HighlightIntervalKey]) {
 		braceHighlightInterval = [Preferences floatForKey:HighlightIntervalKey withDefault:0.3f];
+	}
+}
+- (void)updateLineWrappingMode
+{
+	NSSize layoutSize;
+	lineWrappingEnabled = [Preferences flagForKey:enableLineWrappingKey withDefault: YES];
+	[self setHorizontallyResizable:YES];
+	if (!lineWrappingEnabled) {
+		layoutSize = NSMakeSize(10e6,10e6);
+		[scrollView setHasHorizontalScroller:YES];
+		[self setMaxSize:layoutSize];
+		[[self textContainer] setContainerSize:layoutSize];
+		[[self textContainer] setWidthTracksTextView:NO];
+	} else {
+		[scrollView setHasHorizontalScroller:NO];
+		layoutSize = [self maxSize];
+		[self setMaxSize:layoutSize];
+		[[self textContainer] setContainerSize:layoutSize];
+		[[self textContainer] setWidthTracksTextView:YES];
+		// Enforce view to be re-layouted correctly
+		[[self undoManager] disableUndoRegistration];
+		[self selectAll:nil];
+		[self cut:nil];
+		[self paste:nil];
+		[[self undoManager] enableUndoRegistration];
+	}
+	[[self textContainer] setHeightTracksTextView:NO];
+	[[NSNotificationCenter defaultCenter] postNotificationName:NSWindowDidResizeNotification object:[[self delegate] window]];
+}
 - (void)drawRect:(NSRect)rect
+{
 	// Draw background only for screen display but not while printing
 	if([NSGraphicsContext currentContextDrawingToScreen]) {
  * 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 (!syntaxHighlightingEnabled || [[self delegate] plain] || [theTextStorage length] > 40000000) return;
+	if (isSyntaxHighlighting || !syntaxHighlightingEnabled || [[self delegate] plain] || [theTextStorage length] > 40000000) return;
-	NSString *selfstr        = [theTextStorage string];
+	NSString *selfstr    = [theTextStorage string];
-	NSUInteger strlength     = [selfstr length];
+	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).
+	// == Do highlighting partly (max R_SYNTAX_HILITE_BIAS*2 around visibleRange
-	// The approach is to take the middle position of the current view port
-	// and highlight only ±R_SYNTAX_HILITE_BIAS of that middle position
-	// considering of line starts resp. ends
+	// 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;
-	// Take roughly the middle position in the current view port
+	NSInteger start = visibleRange.location - R_SYNTAX_HILITE_BIAS;
+	if (start > 0)
+		while(start > 0) {
-	NSUInteger curPos = visibleRange.location+(NSUInteger)(visibleRange.length/2);
+			if(CFStringGetCharacterAtIndex((CFStringRef)selfstr, start)=='\n')
+				break;
+			start--;
+		}
-	// get the last line to parse due to R_SYNTAX_HILITE_BIAS
+	if(start < 0) start = 0;
-	// but look for only R_SYNTAX_HILITE_BIAS chars forwards
-	NSUInteger end = curPos + R_SYNTAX_HILITE_BIAS;
+	NSInteger end = NSMaxRange(visibleRange) + R_SYNTAX_HILITE_BIAS;
-	NSInteger lengthChecker = R_SYNTAX_HILITE_BIAS;
-	if (end > strlength ) {
+	if (end > strlength) {
 		end = strlength;
 	} else {
-		while(end < strlength && lengthChecker > 0) {
+		while(end < strlength) {
 			if(CFStringGetCharacterAtIndex((CFStringRef)selfstr, end)=='\n')
 				break;
 			end++;
-			lengthChecker--;
+		}
+	}
-	if(lengthChecker <= 0)
-		end = curPos + R_SYNTAX_HILITE_BIAS;
-	// get the first line to parse due to R_SYNTAX_HILITE_BIAS
-	// but look for only R_SYNTAX_HILITE_BIAS chars backwards
-	NSUInteger start, start_temp;
-	if(end <= (R_SYNTAX_HILITE_BIAS*2))
-	 	start = 0;
-	else
-	 	start = end - (R_SYNTAX_HILITE_BIAS*2);
-	start_temp = start;
-	lengthChecker = R_SYNTAX_HILITE_BIAS;
-	if (start > 0)
-		while(start>0 && lengthChecker > 0) {
-			if(CFStringGetCharacterAtIndex((CFStringRef)selfstr, start)=='\n')
-				break;
-			start--;
-			lengthChecker--;
-		}
-	if(lengthChecker <= 0)
-		start = start_temp;
 	NSRange textRange = NSMakeRange(start, end-start);
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 	[[self layoutManager] ensureLayoutForCharacterRange:textRange];
 	// only to be sure that nothing went wrongly
 	textRange = NSIntersectionRange(textRange, NSMakeRange(0, [theTextStorage length]));
 	if (!textRange.length)
 		return;
+	isSyntaxHighlighting = YES;
 	[theTextStorage beginEditing];
 	NSColor *tokenColor = nil;
 	size_t tokenEnd, token;
 		// If the current token is marked as SQL keyword, uppercase it if required.
 		tokenEnd = NSMaxRange(tokenRange) - 1;
 		NSMutableAttributedStringAddAttributeValueRange(theTextStorage, NSForegroundColorAttributeName, tokenColor, tokenRange);
-		// if(!allowToCheckForUpperCase) continue;
 		// Add an attribute to be used in the auto-pairing (keyDown:)
 		// to disable auto-pairing if caret is inside of any token found by lex.
 		// For discussion: maybe change it later (only for quotes not keywords?)
 		if(token < 6)
 			NSMutableAttributedStringAddAttributeValueRange(theTextStorage, kLEXToken, kLEXTokenValue, tokenRange);
 		if(c) [typeAttr setObject:c forKey:NSForegroundColorAttributeName];
 		[self setTypingAttributes:typeAttr];
+	}
 	[theTextStorage endEditing];
+	isSyntaxHighlighting = NO;
+}
 -(void)resetHighlights
+{
 	if(startListeningToBoundChanges) {
 		[NSObject cancelPreviousPerformRequestsWithTarget:self
 									selector:@selector(doSyntaxHighlighting)
 									object:nil];
-		if(![theTextStorage changeInLength]) {
+		if(![theTextStorage changeInLength] && ![self selectedRange].length) {
 			[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.05];
+		}
+	}

The R Project SVN R-packages

(root)/trunk/Mac-GUI/RScriptEditorTextView.m – Rev 5741 → 5756