• text macro logic

- improved highlighting of multi-line snippets (many thanks to jabakobob for this patch!)
- some tiny cosmetics
• error message highlighting in Custom Query Editor
- removed near message length checking to be larger than 2, not necessary 

2 files changed, 31 insertions, 20 deletions

diff --git a/Source/CMTextView.m b/Source/CMTextView.m
index 2bc01fcd..55e6d4e1 100644
--- a/Source/CMTextView.m
+++ b/Source/CMTextView.m
@@ -935,7 +935,12 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
 
 		if(currentSnippetIndex >= 0 && currentSnippetIndex < 20) {
 			if(snippetControlArray[currentSnippetIndex][2] == 0) {
-				[self setSelectedRange:NSMakeRange(snippetControlArray[currentSnippetIndex][0], snippetControlArray[currentSnippetIndex][1])];
+				NSRange r1 = NSMakeRange(snippetControlArray[currentSnippetIndex][0], snippetControlArray[currentSnippetIndex][1]);
+				NSRange r2 = NSIntersectionRange(NSMakeRange(0,[[self string] length]), r1);
+				if(r1.location == r2.location && r1.length == r2.length)
+					[self setSelectedRange:r2];
+				else
+					[self endSnippetSession];
 			}
 		} else { // for safety reasons
 			[self endSnippetSession];
@@ -1104,8 +1109,6 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
 		return NO;
 	}
 
-	[[self textStorage] ensureAttributesAreFixedInRange:[self selectedRange]];
-
 	NSInteger caretPos = [self selectedRange].location;
 	NSInteger i, j;
 	NSInteger foundSnippetIndices[20]; // array to hold nested snippets
@@ -2916,20 +2919,27 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
 		NSInteger i;
 		for(i=0; i<snippetControlMax; i++) {
 			if(snippetControlArray[i][0] > -1) {
-				NSRange glRange = [[self layoutManager] glyphRangeForCharacterRange:NSMakeRange(snippetControlArray[i][0],snippetControlArray[i][1]) actualCharacterRange:NULL];
-				NSRect boundingRect = [[self layoutManager] boundingRectForGlyphRange:glRange inTextContainer:[self textContainer]];
-				if(!glRange.length) boundingRect.size.width = 1;
-				boundingRect = NSInsetRect(boundingRect, -4, 0.2);
-				NSBezierPath *aBezierPath = [NSBezierPath bezierPathWithRoundedRect:boundingRect xRadius:6 yRadius:10];
-				if(i == currentSnippetIndex)
-					[[NSColor colorWithCalibratedRed:1.0 green:0.6 blue:0.0 alpha:0.7] setFill];
-				else
-					[[NSColor colorWithCalibratedRed:1.0 green:1.0 blue:0.0 alpha:0.4] setFill];
-				[aBezierPath fill];
-				boundingRect = NSInsetRect(boundingRect, 1.3, 1.3);
-				aBezierPath = [NSBezierPath bezierPathWithRoundedRect:boundingRect xRadius:6 yRadius:10];
-				[[NSColor colorWithCalibratedRed:1.0 green:1.0 blue:1.0 alpha:0.8] setFill];
-				[aBezierPath fill];
+				NSUInteger rectCount;
+				NSRange snippetRange = NSMakeRange(snippetControlArray[i][0],snippetControlArray[i][1]);
+				NSRectArray snippetRects = [[self layoutManager] rectArrayForCharacterRange: snippetRange
+					withinSelectedCharacterRange: snippetRange
+								 inTextContainer: [self textContainer]
+									   rectCount: &rectCount ];
+				for (NSUInteger j=0; j<rectCount; j++)
+				{
+					NSRect snippetRect = snippetRects[j];
+					snippetRect = NSInsetRect(snippetRect, -4, 0.2);
+					NSBezierPath *aBezierPath = [NSBezierPath bezierPathWithRoundedRect:snippetRect xRadius:6 yRadius:10];
+					if(i == currentSnippetIndex)
+						[[NSColor colorWithCalibratedRed:1.0 green:0.6 blue:0.0 alpha:0.7] setFill];
+					else
+						[[NSColor colorWithCalibratedRed:1.0 green:1.0 blue:0.0 alpha:0.4] setFill];
+					[aBezierPath fill];
+					snippetRect = NSInsetRect(snippetRect, 1.3, 1.3);
+					aBezierPath = [NSBezierPath bezierPathWithRoundedRect:snippetRect xRadius:6 yRadius:10];
+					[[NSColor colorWithCalibratedRed:1.0 green:1.0 blue:1.0 alpha:0.8] setFill];
+					[aBezierPath fill];
+				}
 			}
 		}
 	}
diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m
index 9600d929..4c850bde 100644
--- a/Source/CustomQuery.m
+++ b/Source/CustomQuery.m
@@ -702,11 +702,10 @@
 			// Get the line number
 			NSUInteger errorAtLine = [[errors substringWithRange:errorLineNumberRange] integerValue];
 			NSUInteger lineOffset = [textView getLineNumberForCharacterIndex:[self queryTextRangeForQuery:firstErrorOccuredInQuery startPosition:queryStartPosition].location] - 1;
-			[textView selectLineNumber:errorAtLine+lineOffset ignoreLeadingNewLines:YES];
 
 			// Check for near message
 			NSRange errorNearMessageRange = [errors rangeOfRegex:@"[( ]'(.+)'[ -]" options:(RKLMultiline|RKLDotAll) inRange:NSMakeRange(0, [errors length]) capture:1L error:nil];
-			if(errorNearMessageRange.length > 2) // if a "near message" was found
+			if(errorNearMessageRange.length) // if a "near message" was found
 			{
 				NSUInteger bufferLength = [[textView string] length];
 
@@ -728,6 +727,8 @@
 					[textView setSelectedRange:textNearMessageRange];
 					[textView scrollRangeToVisible:textNearMessageRange];
 				}
+			} else {
+				[textView selectLineNumber:errorAtLine+lineOffset ignoreLeadingNewLines:YES];
 			}
 		} else { // Select first erroneous query entirely
 			
@@ -746,7 +747,7 @@
 				[textView scrollRangeToVisible:queryRange];
 			}
 		}
-		
+
 	} else if ( [errors length] && queryIsTableSorter ) {
 		[errorText setStringValue:NSLocalizedString(@"Couldn't sort column.", @"text shown if an error occured while sorting the result table")];
 		NSBeep();