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

 		[self updateLineWrappingMode];
 	// Re-define tab stops for a better editing
 	[self setTabStops];
-	// add NSViewBoundsDidChangeNotification to scrollView
-	[[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];
 	[shColorNormal retain];
+	}
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 	[[self layoutManager] setAllowsNonContiguousLayout:YES];
 #endif
+	// add NSViewBoundsDidChangeNotification to scrollView
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(boundsDidChangeNotification:) name:NSViewBoundsDidChangeNotification object:[scrollView contentView]];
+}
 - (void)dealloc {
 	SLog(@"RScriptEditorTextView: dealloc <%@>", self);
 	// if the user really changed the text
 	if(editedMask != 1) {
 		// For larger text break a running syntax highlighting for user interaction
 		// to make them more responsive (typing and scrolling)
-		if([[theTextStorage string] length] > 120000) {
+		// if([[theTextStorage string] length] > 120000) {
-			breakSyntaxHighlighting = 1;
+		// 	breakSyntaxHighlighting = 1;
-		}
+		// }
 		[self checkSnippets];
+		breakSyntaxHighlighting = 1;
 		// Cancel calling doSyntaxHighlighting
 		[NSObject cancelPreviousPerformRequestsWithTarget:self
 								selector:@selector(doSyntaxHighlighting)
 								object:nil];
 	[self setEditable:oldEditableStatus];
 	[paragraphStyle release];
+}
+- (BOOL)isSyntaxHighlighting
+{
+	return isSyntaxHighlighting;
+}
+- (BOOL)breakSyntaxHighlighting
+{
+	return breakSyntaxHighlighting;
+}
 /**
  * Syntax Highlighting.
+ *
  * (The main bottleneck is the [NSTextStorage addAttribute:value:range:] method - the parsing itself is really fast!)
  * 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)
+		breakSyntaxHighlighting = 0;
 	if (!syntaxHighlightingEnabled || [[self delegate] plain]) return;
 	isSyntaxHighlighting = YES;
 	NSString *selfstr    = [theTextStorage string];
 	NSInteger strlength  = (NSInteger)[selfstr length];
 	// do not highlight if text larger than 10MB
-	if(strlength > 10000000 || !strlength) return;
+	if(strlength > 10000000 || !strlength) {
+		isSyntaxHighlighting = NO;
+		breakSyntaxHighlighting = 0;
+		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 visibleRect];
 	NSRange visibleRange = [[self layoutManager] glyphRangeForBoundingRectWithoutAdditionalLayout:visibleRect inTextContainer:[self textContainer]];
 	if(!visibleRange.length) {
 		isSyntaxHighlighting = NO;
+		breakSyntaxHighlighting = 0;
 		return;
+	}
+	NSInteger breakCounter = 1000;
 	NSInteger start = visibleRange.location - R_SYNTAX_HILITE_BIAS;
 	if (start > 0)
 		while(start > 0) {
+			if(!breakCounter--) break;
 			if(CFStringGetCharacterAtIndex((CFStringRef)selfstr, start)=='\n')
 				break;
 			start--;
+		}
 	if(start < 0) start = 0;
+	breakCounter = 1000;
 	NSInteger end = NSMaxRange(visibleRange) + R_SYNTAX_HILITE_BIAS;
 	if (end > strlength) {
 		end = strlength;
 	} else {
 		while(end < strlength) {
+			if(!breakCounter--) break;
 			if(CFStringGetCharacterAtIndex((CFStringRef)selfstr, end)=='\n')
 				break;
 			end++;
+		}
+	}
 	NSRange textRange = NSMakeRange(start, end-start);
 	// only to be sure that nothing went wrongly
 	textRange = NSIntersectionRange(textRange, NSMakeRange(0, [theTextStorage length]));
-	if (!textRange.length) {
+	if (!textRange.length || textRange.length > 30000) {
 		isSyntaxHighlighting = NO;
+		breakSyntaxHighlighting = 0;
 		return;
+	}
 	[theTextStorage beginEditing];
 					// Cancel calling doSyntaxHighlighting
 					[NSObject cancelPreviousPerformRequestsWithTarget:self
 											selector:@selector(doSyntaxHighlighting)
 											object:nil];
-					[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.15f];
+					[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.08f];
 					breakSyntaxHighlighting = 0;
 					break;
+				}
 				// Cancel calling doSyntaxHighlighting
 				[NSObject cancelPreviousPerformRequestsWithTarget:self
 										selector:@selector(doSyntaxHighlighting)
 										object:nil];
-				[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.2f];
+				[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.08f];
 				breakSyntaxHighlighting = 0;
 				break;
+			}
 		if(c) [typeAttr setObject:c forKey:NSForegroundColorAttributeName];
 		[self setTypingAttributes:typeAttr];
+	}
 	[theTextStorage endEditing];
-	isSyntaxHighlighting = NO;
 	[self setNeedsDisplayInRect:visibleRect];
+	breakSyntaxHighlighting = 0;
+	isSyntaxHighlighting = NO;
+}
 -(void)resetHighlights
+{
 - (void)boundsDidChangeNotification:(NSNotification *)notification
+{
 	if(startListeningToBoundChanges) {
+		breakSyntaxHighlighting = 1;
 		[NSObject cancelPreviousPerformRequestsWithTarget:self
 									selector:@selector(doSyntaxHighlighting)
 									object:nil];
 		if(![theTextStorage changeInLength]) {
 			if([[theTextStorage string] length] > 120000)
 				breakSyntaxHighlighting = 2;
-			[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.05];
+			[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.08];
+		}
 		if(lineNumberingEnabled) {
 			[NSObject cancelPreviousPerformRequestsWithTarget:[[self enclosingScrollView] verticalRulerView]
 										selector:@selector(refresh)
 										object:nil];
 	[theTextStorage ensureAttributesAreFixedInRange:r];
 	if(lineNumberingEnabled)
 		[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
+	breakSyntaxHighlighting = 1;
 	[NSObject cancelPreviousPerformRequestsWithTarget:self
 							selector:@selector(doSyntaxHighlighting)
 							object:nil];
-	[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.0f];
+	[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.01f];
+}
 - (void)refoldLinesInRange:(NSRange)range
+{
 	NSInteger foldId = [theTextStorage registerFoldedRange:range];

The R Project SVN R-packages

(root)/trunk/Mac-GUI/RScriptEditorTextView.m – Rev 6242 → 6245