Add toggle "Use accessibility API to accept suggestion in widget"

Author: intitni

Copilot for Xcode/SettingsView.swift

@@ -15,6 +15,8 @@ final class Settings: ObservableObject {
     var suggestionWidgetPositionMode: SuggestionWidgetPositionMode
     @AppStorage(\.widgetColorScheme)
     var widgetColorScheme: WidgetColorScheme
+    @AppStorage(\.acceptSuggestionWithAccessibilityAPI)
+    var acceptSuggestionWithAccessibilityAPI: Bool
     init() {}
 }
 
@@ -107,6 +109,11 @@ struct SettingsView: View {
                             .fill(Color.white.opacity(0.2))
                     )
                 }
+                
+                Toggle(isOn: $settings.acceptSuggestionWithAccessibilityAPI) {
+                    Text("Use accessibility API to accept suggestion in widget")
+                }
+                .toggleStyle(.switch)
             }
         }.buttonStyle(.copilot)
     }

Core/Sources/Preferences/Keys.swift

@@ -100,6 +100,15 @@ public struct UserDefaultPreferenceKeys {
 
     public var chatGPTLanguage: ChatGPTLanguage { .init() }
 
+    public struct AcceptSuggestionWithAccessibilityAPI: UserDefaultPreferenceKey {
+        public let defaultValue = false
+        public let key = "AcceptSuggestionWithAccessibilityAPI"
+    }
+
+    public var acceptSuggestionWithAccessibilityAPI: AcceptSuggestionWithAccessibilityAPI {
+        .init()
+    }
+
     public var disableLazyVStack: FeatureFlags.DisableLazyVStack { .init() }
 }
 

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -70,63 +70,67 @@ struct PseudoCommandHandler {
     }
 
     func acceptSuggestion() async {
-        do {
-            try await Environment.triggerAction("Accept Suggestion")
-            return
-        } catch {
-            PresentInWindowSuggestionPresenter().presentError(error)
-        }
-        guard let xcode = ActiveApplicationMonitor.activeXcode else { return }
-        let application = AXUIElementCreateApplication(xcode.processIdentifier)
-        guard let focusElement = application.focusedElement,
-              focusElement.description == "Source Editor"
-        else { return }
-        guard let (content, lines, cursorPosition) = await getFileContent() else {
-            PresentInWindowSuggestionPresenter().presentErrorMessage("Unable to get file content.")
-            return
-        }
-        let handler = CommentBaseCommandHandler()
-        do {
-            guard let result = try await handler.acceptSuggestion(editor: .init(
-                content: content,
-                lines: lines,
-                uti: "",
-                cursorPosition: cursorPosition,
-                selections: [],
-                tabSize: 0,
-                indentSize: 0,
-                usesTabsForIndentation: false
-            )) else { return }
-
-            let oldPosition = focusElement.selectedTextRange
-
-            let error = AXUIElementSetAttributeValue(
-                focusElement,
-                kAXValueAttribute as CFString,
-                result.content as CFTypeRef
-            )
-
-            if error != AXError.success {
+        if UserDefaults.shared.value(for: \.acceptSuggestionWithAccessibilityAPI) {
+            guard let xcode = ActiveApplicationMonitor.activeXcode else { return }
+            let application = AXUIElementCreateApplication(xcode.processIdentifier)
+            guard let focusElement = application.focusedElement,
+                  focusElement.description == "Source Editor"
+            else { return }
+            guard let (content, lines, cursorPosition) = await getFileContent() else {
                 PresentInWindowSuggestionPresenter()
-                    .presentErrorMessage("Fail to set editor content.")
+                    .presentErrorMessage("Unable to get file content.")
+                return
             }
+            let handler = CommentBaseCommandHandler()
+            do {
+                guard let result = try await handler.acceptSuggestion(editor: .init(
+                    content: content,
+                    lines: lines,
+                    uti: "",
+                    cursorPosition: cursorPosition,
+                    selections: [],
+                    tabSize: 0,
+                    indentSize: 0,
+                    usesTabsForIndentation: false
+                )) else { return }
+
+                let oldPosition = focusElement.selectedTextRange
 
-            if let oldPosition {
-                var range = CFRange(
-                    location: oldPosition.lowerBound,
-                    length: oldPosition.upperBound
+                let error = AXUIElementSetAttributeValue(
+                    focusElement,
+                    kAXValueAttribute as CFString,
+                    result.content as CFTypeRef
                 )
-                if let value = AXValueCreate(.cfRange, &range) {
-                    AXUIElementSetAttributeValue(
-                        focusElement,
-                        kAXSelectedTextRangeAttribute as CFString,
-                        value
+
+                if error != AXError.success {
+                    PresentInWindowSuggestionPresenter()
+                        .presentErrorMessage("Fail to set editor content.")
+                }
+
+                if let oldPosition {
+                    var range = CFRange(
+                        location: oldPosition.lowerBound,
+                        length: 0
                     )
+                    if let value = AXValueCreate(.cfRange, &range) {
+                        AXUIElementSetAttributeValue(
+                            focusElement,
+                            kAXSelectedTextRangeAttribute as CFString,
+                            value
+                        )
+                    }
                 }
-            }
 
-        } catch {
-            PresentInWindowSuggestionPresenter().presentError(error)
+            } catch {
+                PresentInWindowSuggestionPresenter().presentError(error)
+            }
+        } else {
+            do {
+                try await Environment.triggerAction("Accept Suggestion")
+                return
+            } catch {
+                PresentInWindowSuggestionPresenter().presentError(error)
+            }
         }
     }
 }