@@ -11,10 +11,13 @@ public final class SuggestionWidgetControllerDependency {
1111 public var suggestionWidgetDataSource : SuggestionWidgetDataSource ?
1212 public var onOpenChatClicked : ( ) -> Void = { }
1313 public var onCustomCommandClicked : ( CustomCommand ) -> Void = { _ in }
14+ public var windows : WidgetWindows = . init( )
15+
16+ public init ( ) { }
1417}
1518
1619@MainActor
17- public final class Windows {
20+ public final class WidgetWindows {
1821 var fullscreenDetector : NSWindow !
1922 var widgetWindow : NSWindow !
2023 var tabWindow : NSWindow !
@@ -34,7 +37,7 @@ public final class Windows {
3437 }
3538}
3639
37- public final class UserDefaultsObservers {
40+ public final class WidgetUserDefaultsObservers {
3841 let presentationModeChangeObserver = UserDefaultsObserver (
3942 object: UserDefaults . shared,
4043 forKeyPaths: [
@@ -49,18 +52,16 @@ public final class UserDefaultsObservers {
4952 let systemColorSchemeChangeObserver = UserDefaultsObserver (
5053 object: UserDefaults . standard, forKeyPaths: [ " AppleInterfaceStyle " ] , context: nil
5154 )
55+
56+ public init ( ) { }
5257}
5358
5459struct SuggestionWidgetControllerDependencyKey : DependencyKey {
5560 static let liveValue = SuggestionWidgetControllerDependency ( )
5661}
5762
58- struct WindowsDependencyKey : DependencyKey {
59- static let liveValue = Windows ( )
60- }
61-
6263struct UserDefaultsDependencyKey : DependencyKey {
63- static let liveValue = UserDefaultsObservers ( )
64+ static let liveValue = WidgetUserDefaultsObservers ( )
6465}
6566
6667struct XcodeInspectorKey : DependencyKey {
@@ -84,26 +85,23 @@ struct ActivatePreviouslyActiveXcodeKey: DependencyKey {
8485struct ActivateExtensionServiceKey : DependencyKey {
8586 static let liveValue = { @MainActor in
8687 try ? await Task . sleep ( nanoseconds: 150_000_000 )
87- await NSApplication . shared. activate ( ignoringOtherApps: true )
88+ NSApplication . shared. activate ( ignoringOtherApps: true )
8889 }
8990}
9091
91- extension DependencyValues {
92+ public extension DependencyValues {
9293 var suggestionWidgetControllerDependency : SuggestionWidgetControllerDependency {
9394 get { self [ SuggestionWidgetControllerDependencyKey . self] }
9495 set { self [ SuggestionWidgetControllerDependencyKey . self] = newValue }
9596 }
9697
97- var windows : Windows {
98- get { self [ WindowsDependencyKey . self] }
99- set { self [ WindowsDependencyKey . self] = newValue }
100- }
101-
102- var userDefaultsObservers : UserDefaultsObservers {
98+ var suggestionWidgetUserDefaultsObservers : WidgetUserDefaultsObservers {
10399 get { self [ UserDefaultsDependencyKey . self] }
104100 set { self [ UserDefaultsDependencyKey . self] = newValue }
105101 }
102+ }
106103
104+ extension DependencyValues {
107105 var xcodeInspector : XcodeInspector {
108106 get { self [ XcodeInspectorKey . self] }
109107 set { self [ XcodeInspectorKey . self] = newValue }
@@ -113,12 +111,12 @@ extension DependencyValues {
113111 get { self [ ActiveApplicationMonitorKey . self] }
114112 set { self [ ActiveApplicationMonitorKey . self] = newValue }
115113 }
116-
114+
117115 var activatePreviouslyActiveXcode : ( ) async -> Void {
118116 get { self [ ActivatePreviouslyActiveXcodeKey . self] }
119117 set { self [ ActivatePreviouslyActiveXcodeKey . self] = newValue }
120118 }
121-
119+
122120 var activateExtensionService : ( ) async -> Void {
123121 get { self [ ActivateExtensionServiceKey . self] }
124122 set { self [ ActivateExtensionServiceKey . self] = newValue }
0 commit comments