Refactor error presentation in setting lists

coteditor · Mar 2, 2025 · 73e75b4 · 73e75b4
1 parent a35dbf5
commit 73e75b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/CotEditor/Sources/Settings Window/Other Views/SyntaxListViewController.swift b/CotEditor/Sources/Settings Window/Other Views/SyntaxListViewController.swift
@@ -9,7 +9,7 @@
 //  ---------------------------------------------------------------------------
 //
 //  © 2004-2007 nakamuxu
-//  © 2014-2024 1024jp
+//  © 2014-2025 1024jp
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -489,12 +489,9 @@ final class SyntaxListViewController: NSViewController, NSMenuItemValidation, NS
 
             do {
                 try SyntaxManager.shared.removeSetting(name: name)
-
             } catch {
-                alert.window.orderOut(nil)
                 NSSound.beep()
-                await NSAlert(error: error).beginSheetModal(for: window)
-                return
+                return self.presentErrorAsSheet(error)
             }
 
             AudioServicesPlaySystemSound(.moveToTrash)

diff --git a/CotEditor/Sources/Settings Window/Other Views/ThemeListViewController.swift b/CotEditor/Sources/Settings Window/Other Views/ThemeListViewController.swift
@@ -9,7 +9,7 @@
 //  ---------------------------------------------------------------------------
 //
 //  © 2004-2007 nakamuxu
-//  © 2014-2024 1024jp
+//  © 2014-2025 1024jp
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -322,7 +322,7 @@ final class ThemeListViewController: NSViewController, NSMenuItemValidation, NST
             fieldEditor.string = oldName
 
             // show alert
-            NSAlert(error: error).beginSheetModal(for: self.view.window!)
+            self.presentErrorAsSheet(error)
             return false
         }
 
@@ -538,12 +538,9 @@ final class ThemeListViewController: NSViewController, NSMenuItemValidation, NST
 
             do {
                 try ThemeManager.shared.removeSetting(name: name)
-
             } catch {
-                alert.window.orderOut(nil)
                 NSSound.beep()
-                await NSAlert(error: error).beginSheetModal(for: window)
-                return
+                return self.presentErrorAsSheet(error)
             }
 
             AudioServicesPlaySystemSound(.moveToTrash)

diff --git a/CotEditor/Sources/Text Finder/Multiple Replace/Views/MultipleReplaceListViewController.swift b/CotEditor/Sources/Text Finder/Multiple Replace/Views/MultipleReplaceListViewController.swift
@@ -63,7 +63,7 @@ final class MultipleReplaceListViewController: NSViewController, NSMenuItemValid
             do {
                 try ReplacementManager.shared.createUntitledSetting()
             } catch {
-                NSAlert(error: error).beginSheetModal(for: self.view.window!)
+                self.presentErrorAsSheet(error)
             }
         }
 
@@ -365,12 +365,9 @@ final class MultipleReplaceListViewController: NSViewController, NSMenuItemValid
 
             do {
                 try ReplacementManager.shared.removeSetting(name: name)
-
             } catch {
-                alert.window.orderOut(nil)
                 NSSound.beep()
-                await NSAlert(error: error).beginSheetModal(for: window)
-                return
+                return self.presentErrorAsSheet(error)
             }
 
             AudioServicesPlaySystemSound(.moveToTrash)
@@ -598,7 +595,7 @@ extension MultipleReplaceListViewController: NSTextFieldDelegate {
             fieldEditor.string = oldName
 
             // show alert
-            NSAlert(error: error).beginSheetModal(for: self.view.window!)
+            self.presentErrorAsSheet(error)
             return false
         }