Add settings to host app

intitni · intitni · commit d6e0166e7a30 · 2023-02-09T15:11:16.000+08:00
diff --git a/Copilot for Xcode.xcodeproj/project.pbxproj b/Copilot for Xcode.xcodeproj/project.pbxproj
@@ -30,6 +30,7 @@
 		C83B2B7E293DA0CA00C5ACCD /* AppInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C83B2B7D293DA0CA00C5ACCD /* AppInfoView.swift */; };
 		C83B2B80293DA1B600C5ACCD /* InstructionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C83B2B7F293DA1B600C5ACCD /* InstructionView.swift */; };
 		C83B2B82293DC38400C5ACCD /* LaunchAgentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C83B2B81293DC38400C5ACCD /* LaunchAgentView.swift */; };
+		C841BB242994CAD400B0B336 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C841BB232994CAD400B0B336 /* SettingsView.swift */; };
 		C8520301293C4D9000460097 /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8520300293C4D9000460097 /* Helpers.swift */; };
 		C8520307293CF13600460097 /* CopilotForXcodeXPCService in Embed XPCService */ = {isa = PBXBuildFile; fileRef = C81458B5293A015C00135263 /* CopilotForXcodeXPCService */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		C87B03A5293B261200C77EAE /* AcceptSuggestionCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C87B03A4293B261200C77EAE /* AcceptSuggestionCommand.swift */; };
@@ -180,6 +181,7 @@
 		C83B2B7D293DA0CA00C5ACCD /* AppInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppInfoView.swift; sourceTree = "<group>"; };
 		C83B2B7F293DA1B600C5ACCD /* InstructionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstructionView.swift; sourceTree = "<group>"; };
 		C83B2B81293DC38400C5ACCD /* LaunchAgentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchAgentView.swift; sourceTree = "<group>"; };
+		C841BB232994CAD400B0B336 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		C848181C293A017300966BB2 /* XPCService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = XPCService.entitlements; sourceTree = "<group>"; };
 		C8520300293C4D9000460097 /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = "<group>"; };
 		C8520308293D805800460097 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -315,6 +317,7 @@
 				C83B2B7B293D9FB400C5ACCD /* CopilotView.swift */,
 				C83B2B7D293DA0CA00C5ACCD /* AppInfoView.swift */,
 				C83B2B7F293DA1B600C5ACCD /* InstructionView.swift */,
+				C841BB232994CAD400B0B336 /* SettingsView.swift */,
 				C87F3E61293DD004008523E8 /* Styles.swift */,
 				C8189B1D2938973000C9DCDA /* Assets.xcassets */,
 				C8189B222938973000C9DCDA /* Copilot_for_Xcode.entitlements */,
@@ -535,6 +538,7 @@
 				C87F3E62293DD004008523E8 /* Styles.swift in Sources */,
 				C83B2B82293DC38400C5ACCD /* LaunchAgentView.swift in Sources */,
 				C83B2B7E293DA0CA00C5ACCD /* AppInfoView.swift in Sources */,
+				C841BB242994CAD400B0B336 /* SettingsView.swift in Sources */,
 				C83B2B80293DA1B600C5ACCD /* InstructionView.swift in Sources */,
 				C83B2B7C293D9FB400C5ACCD /* CopilotView.swift in Sources */,
 				C83B2B7A293D9C8C00C5ACCD /* LaunchAgentManager.swift in Sources */,
diff --git a/Copilot for Xcode/App.swift b/Copilot for Xcode/App.swift
@@ -5,7 +5,8 @@ struct CopilotForXcodeApp: App {
     var body: some Scene {
         WindowGroup {
             ContentView()
-                .frame(minWidth: 500, maxWidth: .infinity, minHeight: 700)
+                .frame(minWidth: 500, minHeight: 700)
+                .preferredColorScheme(.dark)
         }
         .windowStyle(.hiddenTitleBar)
     }
diff --git a/Copilot for Xcode/ContentView.swift b/Copilot for Xcode/ContentView.swift
@@ -15,6 +15,7 @@ struct ContentView: View {
                 AppInfoView()
                 LaunchAgentView()
                 CopilotView()
+                SettingsView()
                 InstructionView()
                 Spacer()
             }
diff --git a/Copilot for Xcode/LaunchAgentView.swift b/Copilot for Xcode/LaunchAgentView.swift
@@ -23,7 +23,7 @@ struct LaunchAgentView: View {
                             }
                         }
                     }) {
-                        Text("Set Up Launch Agent for XPC Service")
+                        Text("Set Up Launch Agent")
                     }
                     .alert(isPresented: $isDidSetupLaunchAgentAlertPresented) {
                         .init(
diff --git a/Copilot for Xcode/SettingsView.swift b/Copilot for Xcode/SettingsView.swift
@@ -0,0 +1,56 @@
+import LaunchAgentManager
+import SwiftUI
+import XPCShared
+
+struct SettingsView: View {
+    @AppStorage(SettingsKey.quitXPCServiceOnXcodeAndAppQuit, store: .shared)
+    var quitXPCServiceOnXcodeAndAppQuit: Bool = false
+    @AppStorage(SettingsKey.realtimeSuggestionToggle, store: .shared)
+    var realtimeSuggestionToggle: Bool = false
+    @AppStorage(SettingsKey.realtimeSuggestionDebounce, store: .shared)
+    var realtimeSuggestionDebounce: Double = 0.7
+    @State var editingRealtimeSuggestionDebounce: Double = UserDefaults.shared
+        .value(forKey: SettingsKey.realtimeSuggestionDebounce) as? Double ?? 0.7
+
+    var body: some View {
+        Section {
+            Form {
+                Toggle(isOn: $quitXPCServiceOnXcodeAndAppQuit) {
+                    Text("Quit service when Xcode and host app are terminated")
+                }
+                .toggleStyle(.switch)
+                Toggle(isOn: $realtimeSuggestionToggle) {
+                    Text("Real-time suggestion")
+                }
+                .toggleStyle(.switch)
+
+                HStack {
+                    Slider(value: $editingRealtimeSuggestionDebounce, in: 0...2, step: 0.1) {
+                        Text("Real-time suggestion fetch debounce")
+                    } onEditingChanged: { _ in
+                        realtimeSuggestionDebounce = editingRealtimeSuggestionDebounce
+                    }
+
+                    Text(
+                        "\(editingRealtimeSuggestionDebounce.formatted(.number.precision(.fractionLength(2))))s"
+                    )
+                    .font(.body)
+                    .monospacedDigit()
+                    .padding(.vertical, 2)
+                    .padding(.horizontal, 6)
+                    .background(
+                        RoundedRectangle(cornerRadius: 4, style: .continuous)
+                            .fill(Color.white.opacity(0.2))
+                    )
+                }
+            }
+        }.buttonStyle(.copilot)
+    }
+}
+
+struct SettingsView_Preview: PreviewProvider {
+    static var previews: some View {
+        SettingsView()
+            .background(.purple)
+    }
+}
diff --git a/Core/Sources/Service/RealtimeSuggestionController.swift b/Core/Sources/Service/RealtimeSuggestionController.swift
@@ -129,11 +129,11 @@ public actor RealtimeSuggestionController {
         guard shouldTrigger else { return }
 
         inflightPrefetchTask = Task { @ServiceActor in
-            try? await Task.sleep(nanoseconds: UInt64(
+            try? await Task.sleep(nanoseconds: UInt64((
                 UserDefaults.shared
-                    .value(forKey: SettingsKey.realtimeSuggestionDebounce) as? Int
-                    ?? 800_000_000
-            ))
+                    .value(forKey: SettingsKey.realtimeSuggestionDebounce) as? Double
+                    ?? 0.7
+            ) * 1_000_000_000))
             guard UserDefaults.shared.bool(forKey: SettingsKey.realtimeSuggestionToggle)
             else { return }
             if Task.isCancelled { return }
diff --git a/XPCService/AppDelegate.swift b/XPCService/AppDelegate.swift
@@ -72,12 +72,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
                 break
             }
         }
-        UserDefaults.shared.addObserver(
-            userDefaultsObserver,
-            forKeyPath: SettingsKey.realtimeSuggestionToggle,
-            options: .new,
-            context: nil
-        )
     }
 
     @objc func quit() {
@@ -188,6 +182,15 @@ private class UserDefaultsObserver: NSObject {
     ) {
         onChange?(keyPath)
     }
+
+    override init() {
+        super.init()
+        observe(keyPath: SettingsKey.realtimeSuggestionToggle)
+    }
+
+    func observe(keyPath: String) {
+        UserDefaults.shared.addObserver(self, forKeyPath: keyPath, options: .new, context: nil)
+    }
 }
 
 extension NSRunningApplication {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@ struct CopilotForXcodeApp: App {`
`5`	`5`	`var body: some Scene {`
`6`	`6`	`WindowGroup {`
`7`	`7`	`ContentView()`
`8`		`- .frame(minWidth: 500, maxWidth: .infinity, minHeight: 700)`
	`8`	`+ .frame(minWidth: 500, minHeight: 700)`
	`9`	`+ .preferredColorScheme(.dark)`
`9`	`10`	`}`
`10`	`11`	`.windowStyle(.hiddenTitleBar)`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ struct ContentView: View {`
`15`	`15`	`AppInfoView()`
`16`	`16`	`LaunchAgentView()`
`17`	`17`	`CopilotView()`
	`18`	`+ SettingsView()`
`18`	`19`	`InstructionView()`
`19`	`20`	`Spacer()`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ struct LaunchAgentView: View {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`}) {`
`26`		`- Text("Set Up Launch Agent for XPC Service")`
	`26`	`+ Text("Set Up Launch Agent")`
`27`	`27`	`}`
`28`	`28`	`.alert(isPresented: $isDidSetupLaunchAgentAlertPresented) {`
`29`	`29`	`.init(`
Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {`
`72`	`72`	`break`
`73`	`73`	`}`
`74`	`74`	`}`
`75`		`- UserDefaults.shared.addObserver(`
`76`		`- userDefaultsObserver,`
`77`		`- forKeyPath: SettingsKey.realtimeSuggestionToggle,`
`78`		`- options: .new,`
`79`		`- context: nil`
`80`		`- )`
`81`	`75`	`}`
`82`	`76`
`83`	`77`	`@objc func quit() {`
`@@ -188,6 +182,15 @@ private class UserDefaultsObserver: NSObject {`
`188`	`182`	`) {`
`189`	`183`	`onChange?(keyPath)`
`190`	`184`	`}`
	`185`	`+`
	`186`	`+ override init() {`
	`187`	`+ super.init()`
	`188`	`+ observe(keyPath: SettingsKey.realtimeSuggestionToggle)`
	`189`	`+ }`
	`190`	`+`
	`191`	`+ func observe(keyPath: String) {`
	`192`	`+ UserDefaults.shared.addObserver(self, forKeyPath: keyPath, options: .new, context: nil)`
	`193`	`+ }`
`191`	`194`	`}`
`192`	`195`
`193`	`196`	`extension NSRunningApplication {`