coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-10-26 19:10:11 +03:00
Code Issues Projects Releases Wiki Activity

Refactor hanging indent calcuration

Browse Source
This commit is contained in:
1024jp 2016-05-13 03:19:55 +09:00
parent 1f20d1467c
commit a39681e1e4
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -5,6 +5,11 @@ Change Log
develop
--------------------------
### Improvements
- Optimize text rendering a bit.
### Fixes
- Fix an issue where the current line highlight didn't update under the specific condition.

33
CotEditor/Sources/CELayoutManager.m
View File

@ -256,11 +256,7 @@ static NSString *HiraginoSansName;
if (editedMask & NSTextStorageEditedCharacters &&
[[NSUserDefaults standardUserDefaults] boolForKey:CEDefaultEnablesHangingIndentKey])
{
// invoke after processEditing so that textStorage can be modified safety
__weak typeof(self) weakSelf = self;
dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf invalidateIndentInRange:newCharRange];
});
[self invalidateIndentInRange:newCharRange];
}
[super textStorage:str edited:editedMask range:newCharRange changeInLength:delta invalidatedRange:invalidatedCharRange];
@ -342,21 +338,12 @@ static NSString *HiraginoSansName;
- (void)invalidateIndentInRange:(NSRange)range
// ------------------------------------------------------
{
// !!!: quick fix avoiding crash on typing Japanese text (2015-10)
// -> text length can be changed while passing run-loop
if (NSMaxRange(range) > [[self textStorage] length]) {
NSUInteger overflow = NSMaxRange(range) - [[self textStorage] length];
if (range.length >= overflow) {
range.length -= overflow;
} else {
// nothing to do about hanging indentation if changed range has already been completely removed
return;
}
}
CGFloat hangingIndent = [self spaceWidth] * [[NSUserDefaults standardUserDefaults] integerForKey:CEDefaultHangingIndentWidthKey];
NSTextStorage *textStorage = [self textStorage];
NSRange lineRange = [[textStorage string] lineRangeForRange:range];
if (lineRange.length == 0) { return; }
CGFloat hangingIndent = [self spaceWidth] * [[NSUserDefaults standardUserDefaults] integerForKey:CEDefaultHangingIndentWidthKey];
NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"^[ \\t]+(?!$)" options:0 error:nil];
// get dummy attributes to make calcuration of indent width the same as CElayoutManager's calcuration (2016-04)
@ -365,6 +352,8 @@ static NSString *HiraginoSansName;
[typingParagraphStyle setHeadIndent:1.0]; // dummy indent value for size calcuration (2016-04)
indentAttributes[NSParagraphStyleAttributeName] = [typingParagraphStyle copy];
NSMutableDictionary<NSString *, NSNumber *> *cache = [NSMutableDictionary dictionary];
// process line by line
[textStorage beginEditing];
[[textStorage string] enumerateSubstringsInRange:lineRange
@ -380,7 +369,13 @@ static NSString *HiraginoSansName;
NSRange baseIndentRange = [regex rangeOfFirstMatchInString:substring options:0 range:NSMakeRange(0, substring.length)];
if (baseIndentRange.location != NSNotFound) {
NSString *indentString = [substring substringWithRange:baseIndentRange];
indent += ceil([indentString sizeWithAttributes:indentAttributes].width);
if (cache[indentString]) {
indent += [cache[indentString] doubleValue];
} else {
CGFloat width = ceil([indentString sizeWithAttributes:indentAttributes].width);
indent += width;
cache[indentString] = @(width);
}
}
// apply new indent only if needed