mirror of
https://github.com/coteditor/CotEditor.git
synced 2024-10-26 19:10:11 +03:00
Beautify CESyntaxParser a bit
This commit is contained in:
parent
b897be8935
commit
b8dcf7d6bb
@ -68,7 +68,7 @@ typedef NS_ENUM(NSUInteger, QCStartEndType) {
|
||||
@property (atomic, copy) NSDictionary *coloringDictionary;
|
||||
@property (atomic, copy) NSDictionary *simpleWordsCharacterSets;
|
||||
@property (atomic, copy) NSDictionary *pairedQuoteTypes; // dict for quote pair to extract with comment
|
||||
@property (atomic, copy) NSArray *cacheColorings; // extracting results cache of the last whole string coloring
|
||||
@property (atomic, copy) NSArray *cacheColorings; // extracted results cache of the last whole string coloring
|
||||
@property (atomic, copy) NSString *cacheHash; // MD5 hash
|
||||
|
||||
@property (atomic) CEIndicatorSheetController *indicatorController;
|
||||
@ -214,7 +214,7 @@ static CGFloat kPerCompoIncrement;
|
||||
[charSet removeCharactersInString:@"\n\t "]; // 改行、タブ、スペースは無視
|
||||
|
||||
characterSets[key] = charSet;
|
||||
} // ==== end-autoreleasepool
|
||||
}
|
||||
}
|
||||
_simpleWordsCharacterSets = characterSets;
|
||||
}
|
||||
@ -285,6 +285,7 @@ static CGFloat kPerCompoIncrement;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ------------------------------------------------------
|
||||
/// 表示されている部分をカラーリング
|
||||
- (void)colorVisibleRange:(NSRange)range wholeString:(NSString *)wholeString
|
||||
@ -926,9 +927,10 @@ static CGFloat kPerCompoIncrement;
|
||||
- (void)colorString:(NSString *)wholeString range:(NSRange)coloringRange
|
||||
// ------------------------------------------------------
|
||||
{
|
||||
if (coloringRange.length == 0) { return; }
|
||||
|
||||
// カラーリング対象の文字列
|
||||
NSString *coloringString = [wholeString substringWithRange:coloringRange];
|
||||
if ([coloringString length] == 0) { return; }
|
||||
|
||||
// カラーリング不要なら不可視文字のカラーリングだけして戻る
|
||||
if (![self hasSyntaxHighlighting]) {
|
||||
|
Loading…
Reference in New Issue
Block a user