Release 0.28.0

github · Nov 5, 2024 · 8353a90 · Bighead9971 · Nov 8, 2024 · 8353a90
1 parent 887f789
commit 8353a90
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift
@@ -281,16 +281,22 @@ public struct WidgetFeature {
                 return .run { send in
                     await send(.updateColorScheme)
                     let stream = AsyncStream<Void> { continuation in
-                        userDefaultsObservers.colorSchemeChangeObserver.onChange = {
+                        userDefaultsObservers.xcodeColorSchemeChangeObserver.onChange = {
                             continuation.yield()
                         }
 
                         userDefaultsObservers.systemColorSchemeChangeObserver.onChange = {
                             continuation.yield()
                         }
 
+                        Task { @MainActor in
+                            Timer.scheduledTimer(withTimeInterval: 60, repeats: true) { _ in
+                                continuation.yield()
+                            }
+                        }
+
                         continuation.onTermination = { _ in
-                            userDefaultsObservers.colorSchemeChangeObserver.onChange = {}
+                            userDefaultsObservers.xcodeColorSchemeChangeObserver.onChange = {}
                             userDefaultsObservers.systemColorSchemeChangeObserver.onChange = {}
                         }
                     }
@@ -301,17 +307,20 @@ public struct WidgetFeature {
                     }
                 }.cancellable(id: CancelID.observeUserDefaults, cancelInFlight: true)
 
+
             case .updateActiveApplication:
                 return .none
 
             case .updateColorScheme:
-                let widgetColorScheme = UserDefaults.shared.value(for: \.widgetColorScheme)
+                let xcodePref = UserDefaults(suiteName: "com.apple.dt.Xcode")!
+                    .value(forKey: "IDEAppearance") as? Int ?? 0
+                let xcodeColorScheme: XcodeColorScheme = .init(rawValue: xcodePref) ?? .system
                 let systemColorScheme: ColorScheme = NSApp.effectiveAppearance.name == .darkAqua
                     ? .dark
                     : .light
 
                 let scheme: ColorScheme = {
-                    switch (widgetColorScheme, systemColorScheme) {
+                    switch (xcodeColorScheme, systemColorScheme) {
                     case (.system, .dark), (.dark, _):
                         return .dark
                     case (.system, .light), (.light, _):

diff --git a/Core/Sources/SuggestionWidget/ModuleDependency.swift b/Core/Sources/SuggestionWidget/ModuleDependency.swift
@@ -25,13 +25,15 @@ public final class WidgetUserDefaultsObservers {
             UserDefaultPreferenceKeys().suggestionPresentationMode.key,
         ], context: nil
     )
-    let colorSchemeChangeObserver = UserDefaultsObserver(
-        object: UserDefaults.shared, forKeyPaths: [
-            UserDefaultPreferenceKeys().widgetColorScheme.key,
-        ], context: nil
+    let xcodeColorSchemeChangeObserver = UserDefaultsObserver(
+        object: UserDefaults(suiteName: "com.apple.dt.Xcode")!,
+        forKeyPaths: ["xcodeColorScheme"],
+        context: nil
     )
     let systemColorSchemeChangeObserver = UserDefaultsObserver(
-        object: UserDefaults.standard, forKeyPaths: ["AppleInterfaceStyle"], context: nil
+        object: UserDefaults.standard,
+        forKeyPaths: ["AppleInterfaceStyle"],
+        context: nil
     )
 
     public init() {}

diff --git a/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift b/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift
@@ -160,6 +160,9 @@ public class GitHubCopilotBaseService {
                 currentDirectoryURL: urls.supportURL
             )
 
+            Logger.gitHubCopilot.info("Starting language server in \(urls.supportURL), \(environment)")
+            Logger.gitHubCopilot.info("Running on Xcode \(xcodeVersion), extension version \(versionNumber)")
+
             let localServer = CopilotLocalProcessServer(executionParameters: executionParams)
             localServer.notificationHandler = { _, respond in
                 respond(.timeout)

diff --git a/Tool/Sources/Preferences/Types/XcodeColorScheme.swift b/Tool/Sources/Preferences/Types/XcodeColorScheme.swift
@@ -0,0 +1,7 @@
+import SwiftUI
+
+public enum XcodeColorScheme: Int, CaseIterable {
+    case system = 0
+    case light = 1
+    case dark = 2
+}