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

+}
 - (void)updateLineWrappingMode
+{
-	lineWrappingEnabled = [Preferences flagForKey:enableLineWrappingKey withDefault: YES];
-	NSSize contentSize = [scrollView contentSize];
-	NSTextContainer *textContainer = [self textContainer];
-	// [self setMinSize:contentSize];
-	if (lineWrappingEnabled) {
-		[scrollView setHasHorizontalScroller:YES];
-		[textContainer setContainerSize:NSMakeSize(contentSize.width, CGFLOAT_MAX)];
-		[textContainer setWidthTracksTextView:YES];
-		[self setHorizontallyResizable:NO];
-		[(NoodleLineNumberView*)[[self enclosingScrollView] verticalRulerView] setLineWrappingMode:YES];
-	} else {
-		[scrollView setHasHorizontalScroller:YES];
-		[textContainer setContainerSize:NSMakeSize(CGFLOAT_MAX, CGFLOAT_MAX)];
-		[textContainer setWidthTracksTextView:NO];
-		[self setHorizontallyResizable:YES];
-		[(NoodleLineNumberView*)[[self enclosingScrollView] verticalRulerView] setLineWrappingMode:NO];
-	}
-	[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
-	// NSSize layoutSize;
-	//
 	// lineWrappingEnabled = [Preferences flagForKey:enableLineWrappingKey withDefault: YES];
+	//
+	// NSSize contentSize = [scrollView contentSize];
+	// NSTextContainer *textContainer = [self textContainer];
+	//
-	// [self setHorizontallyResizable:YES];
+	// // [self setMinSize:contentSize];
+	//
-	// if (!lineWrappingEnabled) {
+	// if (lineWrappingEnabled) {
-	// 	layoutSize = NSMakeSize(10e6,10e6);
 	// 	[scrollView setHasHorizontalScroller:YES];
-	// 	[self setMaxSize:layoutSize];
+	// 	[textContainer setContainerSize:NSMakeSize(contentSize.width, CGFLOAT_MAX)];
-	// 	[[self textContainer] setContainerSize:layoutSize];
+	// 	[textContainer setWidthTracksTextView:YES];
-	// 	[[self textContainer] setWidthTracksTextView:NO];
+	// 	[self setHorizontallyResizable:NO];
+	// 	[(NoodleLineNumberView*)[[self enclosingScrollView] verticalRulerView] setLineWrappingMode:YES];
 	// } else {
-	// 	[scrollView setHasHorizontalScroller:NO];
+	// 	[scrollView setHasHorizontalScroller:YES];
-	// 	layoutSize = [self maxSize];
-	// 	[self setMaxSize:layoutSize];
-	// 	[[self textContainer] setContainerSize:layoutSize];
+	// 	[textContainer setContainerSize:NSMakeSize(CGFLOAT_MAX, CGFLOAT_MAX)];
-	// 	[[self textContainer] setWidthTracksTextView:YES];
+	// 	[textContainer setWidthTracksTextView:NO];
-	// 	// Enforce view to be re-layouted correctly
-	// 	[[self undoManager] disableUndoRegistration];
-	// 	[self selectAll:nil];
+	// 	[self setHorizontallyResizable:YES];
-	// 	[self cut:nil];
-	// 	[self paste:nil];
-	// 	[[self undoManager] enableUndoRegistration];
+	// 	[(NoodleLineNumberView*)[[self enclosingScrollView] verticalRulerView] setLineWrappingMode:NO];
 	// }
+	//
+	// [[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
+	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];
+	[[self textContainer] setHeightTracksTextView:NO];
+}
 - (void)drawRect:(NSRect)rect
 			NSMutableAttributedStringAddAttributeValueRange(theTextStorage, NSForegroundColorAttributeName, tokenColor, tokenRange);
 			if(breakSyntaxHighlighting) {
 				// Cancel calling doSyntaxHighlighting
-				// [NSObject cancelPreviousPerformRequestsWithTarget:self
+				[NSObject cancelPreviousPerformRequestsWithTarget:self
-				// 						selector:@selector(doSyntaxHighlighting)
+										selector:@selector(doSyntaxHighlighting)
-				// 						object:nil];
+										object:nil];
-				//
-				// [self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.15f];
+				[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.2f];
 				breakSyntaxHighlighting = 0;
 				break;
+			}
 	NSRange foldRange = NSMakeRange(start, end-start);
 	if(![theTextStorage existsFoldedRange:foldRange]) {
 		// set caret for ▲ line inside {} for scrolling
 		if(foldItem == 2)
 			[self setSelectedRange:NSMakeRange(r.location, 0)];
-		[self foldLinesInRange:foldRange];
+		[self foldLinesInRange:foldRange blockMode:NO];
+	}
+}
 - (IBAction)foldBlockAtLevel:(id)sender
+{
 	NSInteger level = [sender tag];
 	NSInteger bracketCounter = 0;
 	NSInteger start = 0;
 	NSInteger end = 0;
 	CFStringRef str = (CFStringRef)[self string];
 	unichar c;
-	// [self unFoldAllBlocks:self];
+	[[self undoManager] disableUndoRegistration];
 	for(NSInteger i=0; i<[[self string] length]; i++) {
 		c = CFStringGetCharacterAtIndex(str, i);
 		if([self parserContextForPosition:i] != pcExpression) continue;
 		if(c == '{') {
 			if([self foldStatusAtIndex:i] == 2) {
 				if(bracketCounter == level) {
 					end = i;
 					NSRange r = NSMakeRange(start, end - start+1);
 					if(![theTextStorage existsFoldedRange:r])
-						[self foldLinesInRange:r];
+						[self foldLinesInRange:r blockMode:YES];
+				}
 				if(bracketCounter < 0) {
 					NSBeep();
 					return;
+				}
+			}
+		}
+	}
+	[self didChangeText];
+	NSRange r = [[self layoutManager] characterRangeForGlyphRange:[[self layoutManager]
+										glyphRangeForBoundingRect:[scrollView documentVisibleRect]
+												  inTextContainer:[self textContainer]] actualGlyphRange:NULL];
+	[theTextStorage ensureAttributesAreFixedInRange:r];
+	if(lineNumberingEnabled)
+		[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
+	[NSObject cancelPreviousPerformRequestsWithTarget:self
+							selector:@selector(doSyntaxHighlighting)
+							object:nil];
+	[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.02f];
+	[[self undoManager] enableUndoRegistration];
+}
 - (IBAction)unFoldAllBlocks:(id)sender
+{
 	[theTextStorage removeAllFoldedRanges];
 	[theTextStorage addAttribute:NSToolTipAttributeName value:tooltip range:range];
 	[theTextStorage endEditing];
+}
-- (BOOL)foldLinesInRange:(NSRange)range
+- (BOOL)foldLinesInRange:(NSRange)range blockMode:(BOOL)blockMode
+{
 	if(range.length < 5) {
 		return NO;
+	}
 	range.location++;
 	range.length -= 2;
 	if(!range.length) return NO;
+	if(!blockMode) {
-	[[self undoManager] disableUndoRegistration];
+		[[self undoManager] disableUndoRegistration];
-	if(![self shouldChangeTextInRange:range replacementString:nil]) {
+		if(![self shouldChangeTextInRange:range replacementString:nil]) {
+			[[self undoManager] enableUndoRegistration];
+			return NO;
+		}
 		[[self undoManager] enableUndoRegistration];
-		return NO;
+	}
-	[[self undoManager] enableUndoRegistration];
 	NSString *tooltip = nil;
 	if(range.length < 300)
 		tooltip = [[self string] substringWithRange:range];
 	else
 	[theTextStorage beginEditing];
 	[theTextStorage addAttribute:NSCursorAttributeName value:[NSCursor arrowCursor] range:range];
 	[theTextStorage addAttribute:NSToolTipAttributeName value:tooltip range:range];
 	[theTextStorage endEditing];
+	if(!blockMode) {
-	[self didChangeText];
+		[self didChangeText];
-	if(caretWasInsideFoldedRange)
+		if(caretWasInsideFoldedRange)
-		[self scrollRangeToVisible:[self selectedRange]];
+			[self scrollRangeToVisible:[self selectedRange]];
-	NSRange r = [[self layoutManager] characterRangeForGlyphRange:[[self layoutManager]
+		NSRange r = [[self layoutManager] characterRangeForGlyphRange:[[self layoutManager]
-										glyphRangeForBoundingRect:[scrollView documentVisibleRect]
+											glyphRangeForBoundingRect:[scrollView documentVisibleRect]
-												  inTextContainer:[self textContainer]] actualGlyphRange:NULL];
+													  inTextContainer:[self textContainer]] actualGlyphRange:NULL];
-	[theTextStorage ensureAttributesAreFixedInRange:r];
+		[theTextStorage ensureAttributesAreFixedInRange:r];
-	if(lineNumberingEnabled)
+		if(lineNumberingEnabled)
-		[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
+			[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
-	[NSObject cancelPreviousPerformRequestsWithTarget:self
+		[NSObject cancelPreviousPerformRequestsWithTarget:self
-							selector:@selector(doSyntaxHighlighting)
+								selector:@selector(doSyntaxHighlighting)
-							object:nil];
+								object:nil];
-	[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.02f];
+		[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.02f];
+	}
 	return YES;
+}

The R Project SVN R-packages

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