From af9d522c70877412e2b28bed0575cc394909b5ff Mon Sep 17 00:00:00 2001 From: 1024jp <1024jp@wolfrosch.com> Date: Tue, 12 Mar 2024 07:10:05 +0900 Subject: [PATCH] Add @MainActor to some view methods --- CotEditor/Sources/FindPanelResultView.swift | 4 ++-- CotEditor/Sources/SyntaxEditView.swift | 6 +++--- CotEditor/Sources/ValueRange.swift | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CotEditor/Sources/FindPanelResultView.swift b/CotEditor/Sources/FindPanelResultView.swift index 85841c346..d37637572 100644 --- a/CotEditor/Sources/FindPanelResultView.swift +++ b/CotEditor/Sources/FindPanelResultView.swift @@ -59,7 +59,7 @@ struct FindPanelResultView: View { typealias Match = TextFindAllResult.Match - final class Model: ObservableObject { + @MainActor final class Model: ObservableObject { @Published var matches: [Match] = [] @Published var findString: String = "" @@ -153,7 +153,7 @@ struct FindPanelResultView: View { } - private var message: String { + @MainActor private var message: String { let documentName = self.model.target?.documentName ?? "Unknown" // This should never be nil. diff --git a/CotEditor/Sources/SyntaxEditView.swift b/CotEditor/Sources/SyntaxEditView.swift index 9fb466f1e..5ebf55e11 100644 --- a/CotEditor/Sources/SyntaxEditView.swift +++ b/CotEditor/Sources/SyntaxEditView.swift @@ -180,7 +180,7 @@ struct SyntaxEditView: View { } - @ViewBuilder private var detailView: some View { + @MainActor @ViewBuilder private var detailView: some View { switch self.pane { case .keywords: @@ -220,7 +220,7 @@ struct SyntaxEditView: View { // MARK: Private Methods /// Submits the syntax if it is valid. - private func submit() { + @MainActor private func submit() { // syntax name validation self.name = self.name.trimmingCharacters(in: .whitespacesAndNewlines) @@ -249,7 +249,7 @@ struct SyntaxEditView: View { /// Restores the current settings in editor to the user default. - private func restore() { + @MainActor private func restore() { guard self.isBundled, diff --git a/CotEditor/Sources/ValueRange.swift b/CotEditor/Sources/ValueRange.swift index 8db46b322..f54f9c342 100644 --- a/CotEditor/Sources/ValueRange.swift +++ b/CotEditor/Sources/ValueRange.swift @@ -55,6 +55,7 @@ struct ValueRange { extension ValueRange: Equatable where Value: Equatable { } extension ValueRange: Hashable where Value: Hashable { } +extension ValueRange: Sendable where Value: Sendable { } extension ValueRange: Identifiable where Self: Hashable {