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

+ *
  */
 #import "RScriptEditorTextStorage.h"
 #import "RScriptEditorTypesetter.h"
+#import "RScriptEditorTextView.h"
 #import "FoldingSignTextAttachmentCell.h"
-#import "PreferenceKeys.h"
+#import "RGUI.h"
 @implementation RScriptEditorTextStorage
-@synthesize lineFoldingEnabled = _lineFoldingEnabled;
 static NSTextAttachment *sharedAttachment = nil;
 static SEL _getSel;
 static SEL _setSel;
 static SEL _strSel;
 static SEL _replSel;
 static SEL _editSel;
 static SEL _getlSel;
 + (void)initialize
+{
 	if ([self class] == [RScriptEditorTextStorage class]) {
 		FoldingSignTextAttachmentCell *cell = [[FoldingSignTextAttachmentCell alloc] initImageCell:nil];
 		_replImp = [_attributedString methodForSelector:_replSel];
 		_editImp = [self methodForSelector:_editSel];
 		_getlImp = [_attributedString methodForSelector:_getlSel];
 		foldedCounter = 0;
+		currentMaxFoldedIndex = -1;
 		for(NSInteger i = 0; i < R_MAX_FOLDED_ITEMS; i++) {
 			foldedRanges[i][0] = -1;
 			foldedRanges[i][1] = 0;
+			foldedRanges[i][2] = 0;
+		}
+	}
 	return self;
+}
 - (BOOL)hasFoldedItems
+{
 	return (foldedCounter == 0) ? NO : YES;
+}
+- (BOOL)inFoldedRangeForRange:(NSRange)range
+{
+	if(!foldedCounter) return NO;
+	NSInteger i = 0;
+	NSInteger maxRange = NSMaxRange(range);
+	NSInteger rangeLoc = range.location;
+	for(i = 0; i < currentMaxFoldedIndex+1; i++) {
+		if(rangeLoc > foldedRanges[i][0] && maxRange <= foldedRanges[i][2]) {
+			return YES;
+		}
+	}
+	return NO;
+}
 - (NSInteger)foldedAtIndex:(NSInteger)index
+{
 	if(!foldedCounter) return -1;
 	NSInteger i = 0;
-	for(i = 0; i < R_MAX_FOLDED_ITEMS; i++) {
+	for(i = 0; i < currentMaxFoldedIndex+1; i++) {
-		if(foldedRanges[i][0] <= index && foldedRanges[i][0]+foldedRanges[i][1] > index) {
+		if(foldedRanges[i][2] > index && foldedRanges[i][0] <= index) {
 			return i;
+		}
+	}
 	return -1;
+}
 	if(!foldedCounter) return -1;
 	if(index) {
 		// Folded ranges are stored from { to } but indicator will drawn inside of { and }
+		NSInteger adjIndex = index + 1;
-		for(NSInteger i = 0; i < R_MAX_FOLDED_ITEMS; i++) {
+		for(NSInteger i = 0; i < currentMaxFoldedIndex+1; i++) {
-			if(foldedRanges[i][0] > -1 && foldedRanges[i][0] <= (index-1) && foldedRanges[i][0]+foldedRanges[i][1] > index+1) {
+			if(foldedRanges[i][2] > adjIndex && foldedRanges[i][0] < index) {
 				return i;
+			}
+		}
+	}
 	return -1;
+}
 - (NSInteger)registerFoldedRange:(NSRange)range
+{
+	[[[self delegate] undoManager] disableUndoRegistration];
 	NSInteger index = -1;
 	for(NSInteger i = 0; i < R_MAX_FOLDED_ITEMS; i++) {
 		if(foldedRanges[i][0] == -1) {
 			index = i;
 			foldedRanges[i][0] = (NSInteger)range.location;
 			foldedRanges[i][1] = (NSInteger)range.length;
+			foldedRanges[i][2] = (NSInteger)NSMaxRange(range);
 			foldedCounter++;
+			if(i > currentMaxFoldedIndex) currentMaxFoldedIndex = i;
+			SLog(@"RScriptEditorTextStorage:registerFoldedRange %@ at position %d : max index %d", NSStringFromRange(range), i, currentMaxFoldedIndex);
 			break;
+		}
+	}
+	[[[self delegate] undoManager] enableUndoRegistration];
 	return(index);
+}
-- (BOOL)removeFoldedRangeWithId:(NSNumber*)index
+- (BOOL)removeFoldedRangeWithIndex:(NSInteger)index
+{
+	BOOL exists = NO;
+	NSRange range;
+	SLog(@"RScriptEditorTextStorage:removeFoldedRangeWithIndex %d", i);
-	NSInteger i = [index integerValue];
+	if(index > -1 && index < R_MAX_FOLDED_ITEMS) {
+		if(foldedRanges[index][0] > -1 && foldedRanges[index][1] > 0) {
+			range = NSMakeRange(foldedRanges[index][0], foldedRanges[index][1]);
+			exists = YES;
+		}
+	}
-	if(i < 0 || i >= R_MAX_FOLDED_ITEMS) {
+	if(!exists) {
 		[self removeAllFoldedRanges];
+		NSLog(@"Removing folded text chunk failed. For safety reasons all folded chunks were be unfolded.");
 		return NO;
+	}
 	[[[self delegate] undoManager] disableUndoRegistration];
-	NSRange range = NSMakeRange(foldedRanges[i][0], foldedRanges[i][1]);
-	range = NSIntersectionRange(NSMakeRange(0, [_attributedString length]), range);
+	range = NSIntersectionRange(NSMakeRange(0, [[_attributedString string] length]), range);
 	if(range.length) {
-		[self beginEditing];
-		// [self removeAttribute:foldingAttributeName range:range];
-		[self removeAttribute:foldingAttributeId range:range];
 		[self removeAttribute:NSCursorAttributeName range:range];
 		[self removeAttribute:NSToolTipAttributeName range:range];
-		[self endEditing];
+	}
-	foldedRanges[i][0] = -1;
+	foldedRanges[index][0] = -1;
-	foldedRanges[i][1] = 0;
+	foldedRanges[index][1] = 0;
+	foldedRanges[index][2] = 0;
 	foldedCounter--;
 	if(foldedCounter < 0) foldedCounter = 0;
+	// check folded chunks inside range
+	NSInteger rloc = range.location;
+	NSInteger maxrlen = NSMaxRange(range);
+	NSRange r;
+	for(NSInteger j = currentMaxFoldedIndex; j >= 0; j--) {
+		if(foldedRanges[j][0] > rloc && foldedRanges[j][2] < maxrlen) {
+			r = NSMakeRange(foldedRanges[j][0], foldedRanges[j][1]);
+			foldedRanges[j][0] = -1;
+			foldedRanges[j][1] = 0;
+			foldedRanges[j][2] = 0;
+			[[self delegate] refoldLinesInRange:r];
+		}
+	}
 	[[[self delegate] undoManager] enableUndoRegistration];
+	// update currentMaxFoldedIndex
+	NSInteger maxCount = -1;
+	for(NSInteger i = 0; i < R_MAX_FOLDED_ITEMS; i++) {
+		if(foldedRanges[i][0] > -1) {
+			if(i > maxCount) maxCount = i;
+		}
+	}
+	currentMaxFoldedIndex = maxCount;
+	SLog(@"RScriptEditorTextStorage:removeFoldedRangeWithIndex: done. Max index: %d", currentMaxFoldedIndex);
 	return YES;
+}
 - (void)removeAllFoldedRanges
+{
+	[[[self delegate] undoManager] disableUndoRegistration];
 	for(NSInteger i = 0; i < R_MAX_FOLDED_ITEMS; i++) {
 		foldedRanges[i][0] = -1;
 		foldedRanges[i][1] = 0;
+		foldedRanges[i][2] = 0;
+	}
-	[[[self delegate] undoManager] disableUndoRegistration];
 	NSRange range = NSMakeRange(0, [_attributedString length]);
-	[self beginEditing];
-	// [self removeAttribute:foldingAttributeName range:range];
-	[self removeAttribute:foldingAttributeId range:range];
 	[self removeAttribute:NSCursorAttributeName range:range];
 	[self removeAttribute:NSToolTipAttributeName range:range];
-	[self endEditing];
-	[[[self delegate] undoManager] enableUndoRegistration];
 	foldedCounter = 0;
+	currentMaxFoldedIndex = -1;
+	[[[self delegate] undoManager] enableUndoRegistration];
+}
 - (BOOL)existsFoldedRange:(NSRange)range
+{
 	if(!foldedCounter) return NO;
 	BOOL success = NO;
-	for(NSInteger i = 0; i < R_MAX_FOLDED_ITEMS; i++) {
+	for(NSInteger i = 0; i < currentMaxFoldedIndex+1; i++) {
 		if(foldedRanges[i][0] == range.location && foldedRanges[i][1] == range.length) {
 			success = YES;
 			break;
+		}
+	}
+{
 	if(!foldedCounter || index < 0 || index > R_MAX_FOLDED_ITEMS) return NSMakeRange(NSNotFound, 0);
 	NSInteger loc = foldedRanges[index][0];
 	if(loc == -1) return NSMakeRange(NSNotFound, 0);
 	return NSMakeRange(loc, foldedRanges[index][1]-foldedRanges[index][0]);
+}
+#pragma mark -
+#pragma mark Primitives
-// NSAttributedString primitives
 - (NSString *)string
+{
 	return (*_strImp)(_attributedString, _strSel);
+}
 	// Check if location is inside folded range for drawing indicator
 	NSInteger index = -1;
 	if(location) {
 		// Notes folded ranges are stored from { to } but indicator will drawn inside of { and }
+		NSInteger adjLocation = location + 2;
-		for(NSInteger i = 0; i < R_MAX_FOLDED_ITEMS; i++) {
+		for(NSInteger i = 0; i < currentMaxFoldedIndex+1; i++) {
-			if(foldedRanges[i][0] <= (location-1) && foldedRanges[i][0]+foldedRanges[i][1] > location+2) {
+			if(foldedRanges[i][2] > adjLocation && foldedRanges[i][0] < location) {
 				index = i;
 				break;
+			}
+		}
+	}
 	if (index > -1) {
 		effectiveRange = NSMakeRange(foldedRanges[index][0]+1, foldedRanges[index][1]-2);
-		// We adds NSAttachmentAttributeName if in lineFoldingAttributeName
+		// We adds NSAttachmentAttributeName if location is at beginning of folded range
 		if (location == effectiveRange.location) { // beginning of a folded range
 			NSMutableDictionary *dict = [attributes mutableCopyWithZone:NULL];
 			[dict setObject:sharedAttachment forKey:NSAttachmentAttributeName];
 			attributes = [dict autorelease];
 - (void)edited:(NSUInteger)mask range:(NSRange)oldRange changeInLength:(NSInteger)lengthChange
+{
 	if(foldedCounter && mask == NSTextStorageEditedCharacters) {
-		// update foldedRanges array
+		// update foldedRanges array due to changes
-		NSInteger index = oldRange.location;
+		NSInteger index = oldRange.location-1;
+		NSInteger maxOldRange = NSMaxRange(oldRange) + 1;
-		for(NSInteger i = 0; i < R_MAX_FOLDED_ITEMS; i++) {
+		for(NSInteger i = 0; i < currentMaxFoldedIndex+1; i++) {
 			if(index < foldedRanges[i][0]) {
+				// if change covers the entire folded range -> delete it
-				if(foldedRanges[i][0] >= oldRange.location && foldedRanges[i][0]+foldedRanges[i][1] <= NSMaxRange(oldRange)) {
+				if(foldedRanges[i][2] < maxOldRange && foldedRanges[i][0] > index) {
-					[self removeFoldedRangeWithId:[NSNumber numberWithInt:i]];
+					[self removeFoldedRangeWithIndex:i];
 					continue;
+				}
+				// otherwise correct folded start range and maxrange
 				foldedRanges[i][0] += lengthChange;
+				foldedRanges[i][2] += lengthChange;
+				// for safety delete it if new location is negative
-				if(foldedRanges[i][0] < -1) {
+				if(foldedRanges[i][0] < 0) {
-					[self removeFoldedRangeWithId:[NSNumber numberWithInt:i]];
+					[self removeFoldedRangeWithIndex:i];
+				}
+			}
+		}
+	}

The R Project SVN R-packages

(root)/trunk/Mac-GUI/RScriptEditorTextStorage.m – Rev 6233 → 6238