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

Refactor TextFinder

Browse Source
This commit is contained in:
1024jp 2024-06-28 16:54:42 +09:00
parent a4cd524783
commit a24ea5b21f
2 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CotEditor/Sources/NSTextView+MultipleReplace.swift
View File

@ -44,20 +44,20 @@ extension NSTextView {
let string = self.string.immutable
let selectedRanges = self.selectedRanges.map(\.rangeValue)
// setup progress sheet
let progress = FindProgress(scope: 0..<definition.replacements.count)
let task = Task.detached(priority: .userInitiated) {
try definition.find(string: string, ranges: selectedRanges, inSelection: inSelection, progress: progress)
.sorted(\.location)
}
// setup progress sheet
let indicatorView = FindProgressView(String(localized: "Highlight All", table: "TextFind"), progress: progress, unit: .find)
let indicator = NSHostingController(rootView: indicatorView)
indicator.rootView.parent = indicator
self.viewControllerForSheet?.presentAsSheet(indicator)
// find in background thread
let ranges = try await Task.detached(priority: .userInitiated) {
try definition.find(string: string, ranges: selectedRanges, inSelection: inSelection, progress: progress)
.sorted(\.location)
}.value
self.isEditable = true
// perform
let ranges = try await task.value
if progress.count > 0 {
// apply to the text view
@ -101,19 +101,19 @@ extension NSTextView {
let string = self.string.immutable
let selectedRanges = self.selectedRanges.map(\.rangeValue)
// setup progress sheet
let progress = FindProgress(scope: 0..<definition.replacements.count)
let task = Task.detached(priority: .userInitiated) {
try definition.replace(string: string, ranges: selectedRanges, inSelection: inSelection, progress: progress)
}
// setup progress sheet
let indicatorView = FindProgressView(String(localized: "Replace All", table: "TextFind"), progress: progress, unit: .replacement)
let indicator = NSHostingController(rootView: indicatorView)
indicator.rootView.parent = indicator
self.viewControllerForSheet?.presentAsSheet(indicator)
// find in background thread
let result = try await Task.detached(priority: .userInitiated) {
try definition.replace(string: string, ranges: selectedRanges, inSelection: inSelection, progress: progress)
}.value
self.isEditable = true
// perform
let result = try await task.value
if progress.count > 0 {
// apply to the text view

48
CotEditor/Sources/TextFinder.swift
View File

@ -460,13 +460,15 @@ struct TextFindAllResult {
guard let textFind = self.prepareTextFind(presentsError: !isIncremental) else { return }
let client = self.client!
let wraps = TextFinderSettings.shared.isWrap
// find in background thread
let (matches, result) = try await Task.detached(priority: .userInitiated) {
let task = Task.detached(priority: .userInitiated) {
let matches = try textFind.matches
let result = textFind.find(in: matches, forward: forward, includingSelection: isIncremental, wraps: await TextFinderSettings.shared.isWrap)
let result = textFind.find(in: matches, forward: forward, includingSelection: isIncremental, wraps: wraps)
return (matches, result)
}.value
}
let (matches, result) = try await task.value
// mark all matches
if isIncremental, let layoutManager = client.layoutManager {
@ -537,18 +539,13 @@ struct TextFindAllResult {
let client = self.client!
client.isEditable = false
defer { client.isEditable = true }
let highlightColors = NSColor.textHighlighterColor.decompose(into: textFind.numberOfCaptureGroups + 1)
let lineCounter = LineCounter(textFind.string as NSString)
// setup progress sheet
let progress = FindProgress(scope: textFind.scopeRange)
let indicatorView = FindProgressView(actionName, progress: progress, unit: .find)
let indicator = NSHostingController(rootView: indicatorView)
indicator.rootView.parent = indicator
client.viewControllerForSheet?.presentAsSheet(indicator)
let (highlights, matches) = await Task.detached(priority: .userInitiated) {
let task = Task.detached(priority: .userInitiated) {
var highlights: [ValueRange<NSColor>] = []
var resultMatches: [TextFindAllResult.Match] = [] // not used if showsList is false
@ -584,9 +581,16 @@ struct TextFindAllResult {
}
return (highlights, resultMatches)
}.value
}
client.isEditable = true
// setup progress sheet
let indicatorView = FindProgressView(actionName, progress: progress, unit: .find)
let indicator = NSHostingController(rootView: indicatorView)
indicator.rootView.parent = indicator
client.viewControllerForSheet?.presentAsSheet(indicator)
// perform
let (highlights, matches) = await task.value
guard progress.state != .cancelled else { return }
@ -625,17 +629,12 @@ struct TextFindAllResult {
let client = self.client!
client.isEditable = false
defer { client.isEditable = true }
let replacementString = TextFinderSettings.shared.replacementString
// setup progress sheet
let progress = FindProgress(scope: textFind.scopeRange)
let indicatorView = FindProgressView(String(localized: "Replace All", table: "TextFind"), progress: progress, unit: .replacement)
let indicator = NSHostingController(rootView: indicatorView)
indicator.rootView.parent = indicator
client.viewControllerForSheet?.presentAsSheet(indicator)
let (replacementItems, selectedRanges) = await Task.detached(priority: .userInitiated) {
let task = Task.detached(priority: .userInitiated) {
textFind.replaceAll(with: replacementString) { (range, count, stop) in
guard progress.state != .cancelled else {
stop = true
@ -645,9 +644,16 @@ struct TextFindAllResult {
progress.updateCompletedUnit(to: range.upperBound)
progress.incrementCount(by: count)
}
}.value
}
client.isEditable = true
// setup progress sheet
let indicatorView = FindProgressView(String(localized: "Replace All", table: "TextFind"), progress: progress, unit: .replacement)
let indicator = NSHostingController(rootView: indicatorView)
indicator.rootView.parent = indicator
client.viewControllerForSheet?.presentAsSheet(indicator)
// perform
let (replacementItems, selectedRanges) = await task.value
guard progress.state != .cancelled else { return }