| Line 568... |
Line 568... |
| 568 |
// Highlightes the current line if set in the Pref
|
568 |
// Highlightes the current line if set in the Pref
|
| 569 |
// and if nothing is selected in the text view
|
569 |
// and if nothing is selected in the text view
|
| 570 |
if ([prefs boolForKey:highlightCurrentLine] && ![self selectedRange].length && ![self isSnippetMode]) {
|
570 |
if ([prefs boolForKey:highlightCurrentLine] && ![self selectedRange].length && ![self isSnippetMode]) {
|
| 571 |
NSUInteger rectCount;
|
571 |
NSUInteger rectCount;
|
| 572 |
NSRange curLineRange = [[self string] lineRangeForRange:[self selectedRange]];
|
572 |
NSRange curLineRange = [[self string] lineRangeForRange:[self selectedRange]];
|
| 573 |
[theTextStorage ensureAttributesAreFixedInRange:curLineRange];
|
573 |
// [theTextStorage ensureAttributesAreFixedInRange:curLineRange];
|
| 574 |
NSRectArray queryRects = [[self layoutManager] rectArrayForCharacterRange: curLineRange
|
574 |
NSRectArray queryRects = [[self layoutManager] rectArrayForCharacterRange: curLineRange
|
| 575 |
withinSelectedCharacterRange: curLineRange
|
575 |
withinSelectedCharacterRange: curLineRange
|
| 576 |
inTextContainer: [self textContainer]
|
576 |
inTextContainer: [self textContainer]
|
| 577 |
rectCount: &rectCount ];
|
577 |
rectCount: &rectCount ];
|
| 578 |
[shColorCurrentLine setFill];
|
578 |
[shColorCurrentLine setFill];
|
| Line 1236... |
Line 1236... |
| 1236 |
}
|
1236 |
}
|
| 1237 |
}
|
1237 |
}
|
| 1238 |
|
1238 |
|
| 1239 |
[self didChangeText];
|
1239 |
[self didChangeText];
|
| 1240 |
|
1240 |
|
| 1241 |
NSRange r = [[self layoutManager] characterRangeForGlyphRange:[[self layoutManager]
|
1241 |
// NSRange r = [[self layoutManager] characterRangeForGlyphRange:[[self layoutManager]
|
| 1242 |
glyphRangeForBoundingRect:[scrollView documentVisibleRect]
|
1242 |
// glyphRangeForBoundingRect:[scrollView documentVisibleRect]
|
| 1243 |
inTextContainer:[self textContainer]] actualGlyphRange:NULL];
|
1243 |
// inTextContainer:[self textContainer]] actualGlyphRange:NULL];
|
| 1244 |
|
1244 |
//
|
| 1245 |
[theTextStorage ensureAttributesAreFixedInRange:r];
|
1245 |
// [theTextStorage ensureAttributesAreFixedInRange:r];
|
| 1246 |
|
1246 |
|
| 1247 |
if(lineNumberingEnabled)
|
1247 |
if(lineNumberingEnabled)
|
| 1248 |
[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
|
1248 |
[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
|
| 1249 |
|
1249 |
|
| 1250 |
[NSObject cancelPreviousPerformRequestsWithTarget:self
|
1250 |
[NSObject cancelPreviousPerformRequestsWithTarget:self
|
| Line 1260... |
Line 1260... |
| 1260 |
{
|
1260 |
{
|
| 1261 |
[theTextStorage removeAllFoldedRanges];
|
1261 |
[theTextStorage removeAllFoldedRanges];
|
| 1262 |
|
1262 |
|
| 1263 |
[self didChangeText];
|
1263 |
[self didChangeText];
|
| 1264 |
|
1264 |
|
| 1265 |
NSRange r = NSMakeRange(0, [[self string] length]);
|
1265 |
// NSRange r = NSMakeRange(0, [[self string] length]);
|
| 1266 |
|
1266 |
|
| 1267 |
[theTextStorage fixAttributesInRange:r];
|
1267 |
// [theTextStorage fixAttributesInRange:r];
|
| 1268 |
[theTextStorage fixAttachmentAttributeInRange:r];
|
1268 |
// [theTextStorage fixAttachmentAttributeInRange:r];
|
| 1269 |
[theTextStorage ensureAttributesAreFixedInRange:r];
|
1269 |
// [theTextStorage ensureAttributesAreFixedInRange:r];
|
| 1270 |
|
1270 |
|
| 1271 |
|
1271 |
|
| 1272 |
if(lineNumberingEnabled)
|
1272 |
if(lineNumberingEnabled)
|
| 1273 |
[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
|
1273 |
[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
|
| 1274 |
|
1274 |
|
| Line 1390... |
Line 1390... |
| 1390 |
[self didChangeText];
|
1390 |
[self didChangeText];
|
| 1391 |
|
1391 |
|
| 1392 |
if(caretWasInsideFoldedRange)
|
1392 |
if(caretWasInsideFoldedRange)
|
| 1393 |
[self scrollRangeToVisible:[self selectedRange]];
|
1393 |
[self scrollRangeToVisible:[self selectedRange]];
|
| 1394 |
|
1394 |
|
| 1395 |
NSRange r = [[self layoutManager] characterRangeForGlyphRange:[[self layoutManager]
|
1395 |
// NSRange r = [[self layoutManager] characterRangeForGlyphRange:[[self layoutManager]
|
| 1396 |
glyphRangeForBoundingRect:[scrollView documentVisibleRect]
|
1396 |
// glyphRangeForBoundingRect:[scrollView documentVisibleRect]
|
| 1397 |
inTextContainer:[self textContainer]] actualGlyphRange:NULL];
|
1397 |
// inTextContainer:[self textContainer]] actualGlyphRange:NULL];
|
| 1398 |
|
1398 |
|
| 1399 |
[theTextStorage ensureAttributesAreFixedInRange:r];
|
1399 |
// [theTextStorage ensureAttributesAreFixedInRange:r];
|
| 1400 |
|
1400 |
|
| 1401 |
if(lineNumberingEnabled)
|
1401 |
if(lineNumberingEnabled)
|
| 1402 |
[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
|
1402 |
[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
|
| 1403 |
|
1403 |
|
| 1404 |
[NSObject cancelPreviousPerformRequestsWithTarget:self
|
1404 |
[NSObject cancelPreviousPerformRequestsWithTarget:self
|
| Line 1516... |
Line 1516... |
| 1516 |
|
1516 |
|
| 1517 |
[NSObject cancelPreviousPerformRequestsWithTarget:self
|
1517 |
[NSObject cancelPreviousPerformRequestsWithTarget:self
|
| 1518 |
selector:@selector(doSyntaxHighlighting)
|
1518 |
selector:@selector(doSyntaxHighlighting)
|
| 1519 |
object:nil];
|
1519 |
object:nil];
|
| 1520 |
|
1520 |
|
| 1521 |
NSRange r = [[self layoutManager] characterRangeForGlyphRange:[[self layoutManager]
|
1521 |
// NSRange r = [[self layoutManager] characterRangeForGlyphRange:[[self layoutManager]
|
| 1522 |
glyphRangeForBoundingRect:[scrollView documentVisibleRect]
|
1522 |
// glyphRangeForBoundingRect:[scrollView documentVisibleRect]
|
| 1523 |
inTextContainer:[self textContainer]] actualGlyphRange:NULL];
|
1523 |
// inTextContainer:[self textContainer]] actualGlyphRange:NULL];
|
| 1524 |
|
1524 |
//
|
| 1525 |
[theTextStorage ensureAttributesAreFixedInRange:r];
|
1525 |
// [theTextStorage ensureAttributesAreFixedInRange:r];
|
| 1526 |
|
1526 |
|
| 1527 |
if(lineNumberingEnabled)
|
1527 |
if(lineNumberingEnabled)
|
| 1528 |
[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
|
1528 |
[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
|
| 1529 |
|
1529 |
|
| 1530 |
[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.02f];
|
1530 |
[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.02f];
|
The R Project SVN
R-packages