Combine turn on/off command to toggle command

intitni · intitni · commit ac89238d6477 · 2023-02-09T11:47:47.000+08:00
diff --git a/Copilot for Xcode.xcodeproj/project.pbxproj b/Copilot for Xcode.xcodeproj/project.pbxproj
@@ -7,8 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		C8009BFF2941C551007AA7E8 /* TurnOnRealtimeSuggestionsCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8009BFE2941C551007AA7E8 /* TurnOnRealtimeSuggestionsCommand.swift */; };
-		C8009C012941C56C007AA7E8 /* TurnOffRealtimeSuggestionsCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8009C002941C56C007AA7E8 /* TurnOffRealtimeSuggestionsCommand.swift */; };
+		C8009BFF2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8009BFE2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift */; };
 		C8009C032941C576007AA7E8 /* RealtimeSuggestionCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8009C022941C576007AA7E8 /* RealtimeSuggestionCommand.swift */; };
 		C800DBB1294C624D00B04CAC /* PrefetchSuggestionsCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C800DBB0294C624D00B04CAC /* PrefetchSuggestionsCommand.swift */; };
 		C814588F2939EFDC00135263 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C814588E2939EFDC00135263 /* Cocoa.framework */; };
@@ -149,8 +148,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		C8009BFE2941C551007AA7E8 /* TurnOnRealtimeSuggestionsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TurnOnRealtimeSuggestionsCommand.swift; sourceTree = "<group>"; };
-		C8009C002941C56C007AA7E8 /* TurnOffRealtimeSuggestionsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TurnOffRealtimeSuggestionsCommand.swift; sourceTree = "<group>"; };
+		C8009BFE2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleRealtimeSuggestionsCommand.swift; sourceTree = "<group>"; };
 		C8009C022941C576007AA7E8 /* RealtimeSuggestionCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealtimeSuggestionCommand.swift; sourceTree = "<group>"; };
 		C800DBB0294C624D00B04CAC /* PrefetchSuggestionsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefetchSuggestionsCommand.swift; sourceTree = "<group>"; };
 		C814588C2939EFDC00135263 /* Copilot.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Copilot.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -254,8 +252,7 @@
 				C87B03A6293B261900C77EAE /* RejectSuggestionCommand.swift */,
 				C87B03A8293B262600C77EAE /* NextSuggestionCommand.swift */,
 				C87B03AA293B262E00C77EAE /* PreviousSuggestionCommand.swift */,
-				C8009BFE2941C551007AA7E8 /* TurnOnRealtimeSuggestionsCommand.swift */,
-				C8009C002941C56C007AA7E8 /* TurnOffRealtimeSuggestionsCommand.swift */,
+				C8009BFE2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift */,
 				C8009C022941C576007AA7E8 /* RealtimeSuggestionCommand.swift */,
 				C800DBB0294C624D00B04CAC /* PrefetchSuggestionsCommand.swift */,
 				C81458972939EFDC00135263 /* Info.plist */,
@@ -506,10 +503,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C8009C012941C56C007AA7E8 /* TurnOffRealtimeSuggestionsCommand.swift in Sources */,
 				C81458942939EFDC00135263 /* SourceEditorExtension.swift in Sources */,
 				C8520301293C4D9000460097 /* Helpers.swift in Sources */,
-				C8009BFF2941C551007AA7E8 /* TurnOnRealtimeSuggestionsCommand.swift in Sources */,
+				C8009BFF2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift in Sources */,
 				C87B03A5293B261200C77EAE /* AcceptSuggestionCommand.swift in Sources */,
 				C87B03A9293B262600C77EAE /* NextSuggestionCommand.swift in Sources */,
 				C87B03AB293B262E00C77EAE /* PreviousSuggestionCommand.swift in Sources */,
diff --git a/Core/Sources/Client/AsyncXPCService.swift b/Core/Sources/Client/AsyncXPCService.swift
@@ -149,10 +149,10 @@ public struct AsyncXPCService {
         )
     }
 
-    public func setAutoSuggestion(enabled: Bool) async throws {
+    public func toggleRealtimeSuggestion() async throws {
         try await withXPCServiceConnected(connection: connection) {
             service, continuation in
-            service.setAutoSuggestion(enabled: enabled) { error in
+            service.toggleRealtimeSuggestion { error in
                 if let error {
                     continuation.reject(error)
                     return
diff --git a/Core/Sources/Service/XPCService.swift b/Core/Sources/Service/XPCService.swift
@@ -254,14 +254,14 @@ public class XPCService: NSObject, XPCServiceProtocol {
         Task { @ServiceActor in inflightRealtimeSuggestionsTasks.insert(task) }
     }
 
-    public func setAutoSuggestion(enabled: Bool, withReply reply: @escaping (Error?) -> Void) {
+    public func toggleRealtimeSuggestion(withReply reply: @escaping (Error?) -> Void) {
         guard AXIsProcessTrusted() else {
             reply(NoAccessToAccessibilityAPIError())
             return
         }
         Task { @ServiceActor in
             UserDefaults.shared.set(
-                enabled,
+                !UserDefaults.shared.bool(forKey: SettingsKey.realtimeSuggestionToggle),
                 forKey: SettingsKey.realtimeSuggestionToggle
             )
             reply(nil)
diff --git a/Core/Sources/XPCShared/XPCServiceProtocol.swift b/Core/Sources/XPCShared/XPCServiceProtocol.swift
@@ -37,7 +37,7 @@ public protocol XPCServiceProtocol {
         withReply reply: @escaping (Data?, Error?) -> Void
     )
 
-    func setAutoSuggestion(enabled: Bool, withReply reply: @escaping (Error?) -> Void)
+    func toggleRealtimeSuggestion(withReply reply: @escaping (Error?) -> Void)
 
     func prefetchRealtimeSuggestions(
         editorContent: Data,
diff --git a/EditorExtension/SourceEditorExtension.swift b/EditorExtension/SourceEditorExtension.swift
@@ -9,8 +9,7 @@ class SourceEditorExtension: NSObject, XCSourceEditorExtension {
             RejectSuggestionCommand(),
             NextSuggestionCommand(),
             PreviousSuggestionCommand(),
-            TurnOnRealtimeSuggestionsCommand(),
-            TurnOffRealtimeSuggestionsCommand(),
+            ToggleRealtimeSuggestionsCommand(),
             RealtimeSuggestionsCommand(),
             PrefetchSuggestionsCommand(),
         ].map(makeCommandDefinition)
diff --git a/EditorExtension/ToggleRealtimeSuggestionsCommand.swift b/EditorExtension/ToggleRealtimeSuggestionsCommand.swift
@@ -13,7 +13,7 @@ class ToggleRealtimeSuggestionsCommand: NSObject, XCSourceEditorCommand, Command
         Task {
             do {
                 let service = try getService()
-                try await service.setAutoSuggestion(enabled: true)
+                try await service.toggleRealtimeSuggestion()
                 completionHandler(nil)
             } catch is CancellationError {
                 completionHandler(nil)
diff --git a/EditorExtension/TurnOffRealtimeSuggestionsCommand.swift b/EditorExtension/TurnOffRealtimeSuggestionsCommand.swift

Original file line number	Diff line number	Diff line change
`@@ -149,10 +149,10 @@ public struct AsyncXPCService {`
`149`	`149`	`)`
`150`	`150`	`}`
`151`	`151`
`152`		`- public func setAutoSuggestion(enabled: Bool) async throws {`
	`152`	`+ public func toggleRealtimeSuggestion() async throws {`
`153`	`153`	`try await withXPCServiceConnected(connection: connection) {`
`154`	`154`	`service, continuation in`
`155`		`- service.setAutoSuggestion(enabled: enabled) { error in`
	`155`	`+ service.toggleRealtimeSuggestion { error in`
`156`	`156`	`if let error {`
`157`	`157`	`continuation.reject(error)`
`158`	`158`	`return`
Original file line number	Diff line number	Diff line change
`@@ -254,14 +254,14 @@ public class XPCService: NSObject, XPCServiceProtocol {`
`254`	`254`	`Task { @ServiceActor in inflightRealtimeSuggestionsTasks.insert(task) }`
`255`	`255`	`}`
`256`	`256`
`257`		`- public func setAutoSuggestion(enabled: Bool, withReply reply: @escaping (Error?) -> Void) {`
	`257`	`+ public func toggleRealtimeSuggestion(withReply reply: @escaping (Error?) -> Void) {`
`258`	`258`	`guard AXIsProcessTrusted() else {`
`259`	`259`	`reply(NoAccessToAccessibilityAPIError())`
`260`	`260`	`return`
`261`	`261`	`}`
`262`	`262`	`Task { @ServiceActor in`
`263`	`263`	`UserDefaults.shared.set(`
`264`		`- enabled,`
	`264`	`+ !UserDefaults.shared.bool(forKey: SettingsKey.realtimeSuggestionToggle),`
`265`	`265`	`forKey: SettingsKey.realtimeSuggestionToggle`
`266`	`266`	`)`
`267`	`267`	`reply(nil)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public protocol XPCServiceProtocol {`
`37`	`37`	`withReply reply: @escaping (Data?, Error?) -> Void`
`38`	`38`	`)`
`39`	`39`
`40`		`- func setAutoSuggestion(enabled: Bool, withReply reply: @escaping (Error?) -> Void)`
	`40`	`+ func toggleRealtimeSuggestion(withReply reply: @escaping (Error?) -> Void)`
`41`	`41`
`42`	`42`	`func prefetchRealtimeSuggestions(`
`43`	`43`	`editorContent: Data,`