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

Reduce implict unwrapping

Browse Source
This commit is contained in:
1024jp 2016-10-15 15:05:09 +09:00
parent 566fdfea44
commit 13515f4067
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ develop
- Fix a possible crash on application termination.
- Fix a possible crash on opening document.
- Fix error message of syntax style valitation.
- Improve general stability.

8
CotEditor/Sources/EditorTextView+LineProcessing.swift
View File

@ -48,7 +48,9 @@ extension EditorTextView {
let selectedRanges = self.selectedRanges as [NSRange]
// register redo for text selection
(self.undoManager?.prepare(withInvocationTarget: self) as! NSTextView).setSelectedRangesWithUndo(self.selectedRanges as [NSRange])
if let undoClient = self.undoManager?.prepare(withInvocationTarget: self) as? NSTextView {
undoClient.setSelectedRangesWithUndo(self.selectedRanges as [NSRange])
}
var newSelectedRanges = [NSRange]()
@ -115,7 +117,9 @@ extension EditorTextView {
let selectedRanges = self.selectedRanges as [NSRange]
// register redo for text selection
(self.undoManager?.prepare(withInvocationTarget: self) as! NSTextView).setSelectedRangesWithUndo(self.selectedRanges as [NSRange])
if let undoClient = self.undoManager?.prepare(withInvocationTarget: self) as? NSTextView {
undoClient.setSelectedRangesWithUndo(self.selectedRanges as [NSRange])
}
var newSelectedRanges = [NSRange]()

12
CotEditor/Sources/NSTextView+TextReplacement.swift
View File

@ -54,7 +54,9 @@ extension NSTextView {
guard !strings.isEmpty, let textStorage = self.textStorage else { return false }
// register redo for text selection
(self.undoManager?.prepare(withInvocationTarget: self) as! NSTextView).setSelectedRangesWithUndo(self.selectedRanges as [NSRange])
if let undoClient = self.undoManager?.prepare(withInvocationTarget: self) as? NSTextView {
undoClient.setSelectedRangesWithUndo(self.selectedRanges as [NSRange])
}
// tell textEditor about beginning of the text processing
guard self.shouldChangeText(inRanges: ranges as [NSValue], replacementStrings: strings) else { return false }
@ -88,8 +90,12 @@ extension NSTextView {
/// undoable selection change
@objc func setSelectedRangesWithUndo(_ ranges: [NSRange]) {
self.selectedRanges = ranges as [NSValue]
(self.undoManager?.prepare(withInvocationTarget: self) as! NSTextView).setSelectedRangesWithUndo(ranges)
guard let undoClient = self.undoManager?.prepare(withInvocationTarget: self) as? NSTextView else {
assertionFailure("failed preparing undo.")
return
}
undoClient.setSelectedRangesWithUndo(ranges as [NSRange])
}

3
CotEditor/Sources/TextFinder.swift
View File

@ -244,12 +244,11 @@ final class TextFinder: NSResponder, TextFinderSettingsProvider {
let integerFormatter = self.integerFormatter
let findString = self.sanitizedFindString
let regex = self.regex()!
let scopeRanges = self.scopeRanges
self.busyTextViews.insert(textView)
let numberOfGroups = regex.numberOfCaptureGroups
let numberOfGroups = self.regex()?.numberOfCaptureGroups ?? 0
let highlightColors = self.highlightColor.decomposite(into: numberOfGroups + 1)
let lineRegex = try! NSRegularExpression(pattern: "\n")