Merge branch 'feature/accept-suggestion-auto-fallback' into develop

Author: intitni

Core/Sources/Environment/Environment.swift

@@ -163,6 +163,8 @@ public enum Environment {
                         Logger.service
                             .error("Trigger command \(name) failed: \(error.localizedDescription)")
                         throw error
+                    } else {
+                        return
                     }
                 }
             } else if let commandMenu = app.menuBar?.child(title: bundleName),
@@ -173,17 +175,18 @@ public enum Environment {
                     Logger.service
                         .error("Trigger command \(name) failed: \(error.localizedDescription)")
                     throw error
+                } else {
+                    return
                 }
-            } else {
-                struct CantRunCommand: Error, LocalizedError {
-                    let name: String
-                    var errorDescription: String? {
-                        "Can't run command \(name)."
-                    }
+            }
+            struct CantRunCommand: Error, LocalizedError {
+                let name: String
+                var errorDescription: String? {
+                    "Can't run command \(name)."
                 }
-
-                throw CantRunCommand(name: name)
             }
+
+            throw CantRunCommand(name: name)
         } else {
             /// check if menu is open, if not, click the menu item.
             let appleScript = """

Core/Sources/HostApp/FeatureSettings/PromptToCodeSettingsView.swift

@@ -6,8 +6,6 @@ struct PromptToCodeSettingsView: View {
         var hideCommonPrecedingSpacesInSuggestion
         @AppStorage(\.suggestionCodeFontSize)
         var suggestionCodeFontSize
-        @AppStorage(\.acceptSuggestionWithAccessibilityAPI)
-        var acceptSuggestionWithAccessibilityAPI
         @AppStorage(\.promptToCodeGenerateDescription)
         var promptToCodeGenerateDescription
         @AppStorage(\.promptToCodeGenerateDescriptionInUserPreferredLanguage)
@@ -57,12 +55,6 @@ struct PromptToCodeSettingsView: View {
 
                     Text("pt")
                 }.disabled(true)
-
-                Divider()
-
-                Toggle(isOn: $settings.acceptSuggestionWithAccessibilityAPI) {
-                    Text("Use accessibility API to accept suggestion in widget")
-                }.disabled(true)
             }
         }
     }

Core/Sources/HostApp/FeatureSettings/SuggestionSettingsView.swift

@@ -9,8 +9,6 @@ struct SuggestionSettingsView: View {
         var realtimeSuggestionDebounce
         @AppStorage(\.suggestionPresentationMode)
         var suggestionPresentationMode
-        @AppStorage(\.acceptSuggestionWithAccessibilityAPI)
-        var acceptSuggestionWithAccessibilityAPI
         @AppStorage(\.disableSuggestionFeatureGlobally)
         var disableSuggestionFeatureGlobally
         @AppStorage(\.suggestionFeatureEnabledProjectList)
@@ -125,16 +123,6 @@ struct SuggestionSettingsView: View {
                 }
                 Divider()
             }
-
-            Group {
-                Toggle(isOn: $settings.acceptSuggestionWithAccessibilityAPI) {
-                    Text("Use accessibility API to accept suggestion in widget")
-                }
-
-                Text("You can turn it on if the accept button is not working for you.")
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-            }
         }
     }
 }

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -136,14 +136,21 @@ struct PseudoCommandHandler {
     }
 
     func acceptSuggestion() async {
-        if UserDefaults.shared.value(for: \.acceptSuggestionWithAccessibilityAPI) {
+        do {
+            try await Environment.triggerAction("Accept Suggestion")
+        } catch {
             guard let xcode = ActiveApplicationMonitor.activeXcode ?? ActiveApplicationMonitor
                 .latestXcode 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(sourceEditor: nil)
+            guard let (
+                content,
+                lines,
+                _,
+                cursorPosition
+            ) = await getFileContent(sourceEditor: nil)
             else {
                 PresentInWindowSuggestionPresenter()
                     .presentErrorMessage("Unable to get file content.")
@@ -199,21 +206,15 @@ struct PseudoCommandHandler {
                     }
                 }
 
-                if let oldScrollPosition, let scrollBar = focusElement.parent?.verticalScrollBar {
+                if let oldScrollPosition,
+                   let scrollBar = focusElement.parent?.verticalScrollBar
+                {
                     AXUIElementSetAttributeValue(
                         scrollBar,
                         kAXValueAttribute as CFString,
                         oldScrollPosition as CFTypeRef
                     )
                 }
-
-            } catch {
-                PresentInWindowSuggestionPresenter().presentError(error)
-            }
-        } else {
-            do {
-                try await Environment.triggerAction("Accept Suggestion")
-                return
             } catch {
                 PresentInWindowSuggestionPresenter().presentError(error)
             }

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -161,7 +161,6 @@ struct WidgetView: View {
 struct WidgetContextMenu: View {
     @AppStorage(\.useGlobalChat) var useGlobalChat
     @AppStorage(\.realtimeSuggestionToggle) var realtimeSuggestionToggle
-    @AppStorage(\.acceptSuggestionWithAccessibilityAPI) var acceptSuggestionWithAccessibilityAPI
     @AppStorage(\.hideCommonPrecedingSpacesInSuggestion) var hideCommonPrecedingSpacesInSuggestion
     @AppStorage(\.disableSuggestionFeatureGlobally) var disableSuggestionFeatureGlobally
     @AppStorage(\.suggestionFeatureEnabledProjectList) var suggestionFeatureEnabledProjectList
@@ -227,15 +226,6 @@ struct WidgetContextMenu: View {
                     }
                 }
 
-                Button(action: {
-                    acceptSuggestionWithAccessibilityAPI.toggle()
-                }, label: {
-                    Text("Accept Suggestion with Accessibility API")
-                    if acceptSuggestionWithAccessibilityAPI {
-                        Image(systemName: "checkmark")
-                    }
-                })
-
                 Button(action: {
                     hideCommonPrecedingSpacesInSuggestion.toggle()
                 }, label: {

Tool/Sources/Preferences/Keys.swift

@@ -206,10 +206,6 @@ public extension UserDefaultPreferenceKeys {
         .init(defaultValue: true, key: "HideCommonPrecedingSpacesInSuggestion")
     }
 
-    var acceptSuggestionWithAccessibilityAPI: PreferenceKey<Bool> {
-        .init(defaultValue: false, key: "AcceptSuggestionWithAccessibilityAPI")
-    }
-
     var suggestionPresentationMode: PreferenceKey<PresentationMode> {
         .init(defaultValue: .floatingWidget, key: "SuggestionPresentationMode")
     }