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

Change a class method to String extension

Browse Source
This commit is contained in:
1024jp 2018-04-30 12:23:29 +09:00
parent 9fa1fe7600
commit 40af6aa310
1 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
CotEditor/Sources/SyntaxHighlightParseOperation.swift
View File

@ -132,47 +132,22 @@ final class SyntaxHighlightParseOperation: AsynchronousOperation, ProgressReport
// MARK: Private Methods // MARK: Private Methods
/// simply extract ranges of passed-in string
private func ranges(string searchString: String, ignoreCase: Bool = false) -> [NSRange] {
guard !searchString.isEmpty else { return [] }
var ranges = [NSRange]()
let string = self.string!
let options: NSString.CompareOptions = ignoreCase ? [.literal, .caseInsensitive] : .literal
var location = self.parseRange.location
while location != NSNotFound {
let range = (string as NSString).range(of: searchString, options: options,
range: NSRange(location..<self.parseRange.upperBound))
location = range.upperBound
guard range.location != NSNotFound else { break }
guard !string.isCharacterEscaped(at: range.location) else { continue }
ranges.append(range)
}
return ranges
}
/// extract ranges of quoted texts as well as comments in the parse range /// extract ranges of quoted texts as well as comments in the parse range
private func extractCommentsWithQuotes() -> [SyntaxType: [NSRange]] { private func extractCommentsWithQuotes() -> [SyntaxType: [NSRange]] {
var positions = [QuoteCommentItem]() var positions = [QuoteCommentItem]()
if let delimiters = self.blockCommentDelimiters { if let delimiters = self.blockCommentDelimiters {
for range in self.ranges(string: delimiters.begin) { for range in self.string!.ranges(of: delimiters.begin, range: self.parseRange) {
positions.append(QuoteCommentItem(kind: QuoteCommentItem.Kind.blockComment, role: .begin, range: range)) positions.append(QuoteCommentItem(kind: QuoteCommentItem.Kind.blockComment, role: .begin, range: range))
} }
for range in self.ranges(string: delimiters.end) { for range in self.string!.ranges(of: delimiters.end, range: self.parseRange) {
positions.append(QuoteCommentItem(kind: QuoteCommentItem.Kind.blockComment, role: .end, range: range)) positions.append(QuoteCommentItem(kind: QuoteCommentItem.Kind.blockComment, role: .end, range: range))
} }
} }
if let delimiter = self.inlineCommentDelimiter { if let delimiter = self.inlineCommentDelimiter {
for range in self.ranges(string: delimiter) { for range in self.string!.ranges(of: delimiter, range: self.parseRange) {
let lineRange = (self.string! as NSString).lineRange(for: range) let lineRange = (self.string! as NSString).lineRange(for: range)
let endRange = NSRange(location: lineRange.upperBound, length: 0) let endRange = NSRange(location: lineRange.upperBound, length: 0)
@ -182,7 +157,7 @@ final class SyntaxHighlightParseOperation: AsynchronousOperation, ProgressReport
} }
for quote in self.pairedQuoteTypes.keys { for quote in self.pairedQuoteTypes.keys {
for range in self.ranges(string: quote) { for range in self.string!.ranges(of: quote, range: self.parseRange) {
positions.append(QuoteCommentItem(kind: quote, role: [.begin, .end], range: range)) positions.append(QuoteCommentItem(kind: quote, role: [.begin, .end], range: range))
} }
} }
@ -320,12 +295,36 @@ final class SyntaxHighlightParseOperation: AsynchronousOperation, ProgressReport
// MARK: Private Functions // MARK: Private Functions
/** Remove duplicated coloring ranges. private extension String {
This sanitization will reduce performance time of `applyHighlights:highlights:layoutManager:` significantly. /// find and return ranges of passed-in substring with the given range of receiver.
Adding temporary attribute to a layoutManager is quite sluggish, func ranges(of substring: String, range searchRange: NSRange) -> [NSRange] {
so we want to remove useless highlighting ranges as many as possible beforehand.
*/ var ranges = [NSRange]()
var location = searchRange.location
while location != NSNotFound {
let range = (self as NSString).range(of: substring, options: .literal, range: NSRange(location..<searchRange.upperBound))
location = range.upperBound
guard range.location != NSNotFound else { break }
guard !self.isCharacterEscaped(at: range.location) else { continue }
ranges.append(range)
}
return ranges
}
}
/// Remove duplicated coloring ranges.
///
/// This sanitization will reduce performance time of `applyHighlights:highlights:layoutManager:` significantly.
/// Adding temporary attribute to a layoutManager is quite sluggish,
/// so we want to remove useless highlighting ranges as many as possible beforehand.
private func sanitize(highlights: [SyntaxType: [NSRange]]) -> [SyntaxType: [NSRange]] { private func sanitize(highlights: [SyntaxType: [NSRange]]) -> [SyntaxType: [NSRange]] {
var sanitizedHighlights = [SyntaxType: [NSRange]]() var sanitizedHighlights = [SyntaxType: [NSRange]]()
@ -336,15 +335,15 @@ private func sanitize(highlights: [SyntaxType: [NSRange]]) -> [SyntaxType: [NSRa
var sanitizedRanges = [NSRange]() var sanitizedRanges = [NSRange]()
for range in ranges { for range in ranges {
if !highlightedIndexes.contains(in: range) { guard !highlightedIndexes.contains(in: range) else { continue }
sanitizedRanges.append(range)
highlightedIndexes.add(in: range) sanitizedRanges.append(range)
} highlightedIndexes.add(in: range)
} }
if !sanitizedRanges.isEmpty { guard !sanitizedRanges.isEmpty else { continue }
sanitizedHighlights[type] = sanitizedRanges
} sanitizedHighlights[type] = sanitizedRanges
} }
return sanitizedHighlights return sanitizedHighlights