Merge branch 'feature/esc-to-dismiss-suggestion' into develop

Author: intitni

Core/Sources/HostApp/FeatureSettings/SuggestionSettingsView.swift

@@ -54,6 +54,8 @@ struct SuggestionSettingsView: View {
         var suggestionDisplayCompactMode
         @AppStorage(\.acceptSuggestionWithTab)
         var acceptSuggestionWithTab
+        @AppStorage(\.dismissSuggestionWithEsc)
+        var dismissSuggestionWithEsc
         @AppStorage(\.isSuggestionSenseEnabled)
         var isSuggestionSenseEnabled
 
@@ -185,6 +187,10 @@ struct SuggestionSettingsView: View {
                     Text("Accept Suggestion with Tab")
                 }
             }
+            
+            Toggle(isOn: $settings.dismissSuggestionWithEsc) {
+                Text("Dismiss Suggestion with ESC")
+            }
             #endif
 
             HStack {

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -50,6 +50,13 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
                             await handler.acceptSuggestion()
                             NSWorkspace.activatePreviousActiveXcode()
                         }
+                    },
+                    onDismissSuggestionTapped: {
+                        Task {
+                            let handler = PseudoCommandHandler()
+                            await handler.dismissSuggestion()
+                            NSWorkspace.activatePreviousActiveXcode()
+                        }
                     }
                 )
             }

Core/Sources/Service/Service.swift

@@ -47,13 +47,14 @@ public final class Service {
         globalShortcutManager = .init(guiController: guiController)
 
         #if canImport(ProService)
-        proService = withDependencies { dependencyValues in
-            dependencyValues.proServiceAcceptSuggestion = {
+        proService = ProService(
+            acceptSuggestion: {
                 Task { await PseudoCommandHandler().acceptSuggestion() }
+            },
+            dismissSuggestion: {
+                Task { await PseudoCommandHandler().dismissSuggestion() }
             }
-        } operation: {
-            ProService()
-        }
+        )
         #endif
 
         scheduledCleaner.service = self
@@ -92,7 +93,7 @@ public extension Service {
             reply(nil, error)
             return
         }
-        
+
         reply(nil, XPCRequestNotHandledError())
     }
 }

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -241,6 +241,15 @@ struct PseudoCommandHandler {
             }
         }
     }
+    
+    func dismissSuggestion() async {
+        guard let documentURL = XcodeInspector.shared.activeDocumentURL else { return }
+        guard let (_, filespace) = try? await Service.shared.workspacePool
+            .fetchOrCreateWorkspaceAndFilespace(fileURL: documentURL) else { return }
+        
+        await filespace.reset()
+        PresentInWindowSuggestionPresenter().discardSuggestion(fileURL: documentURL)
+    }
 }
 
 extension PseudoCommandHandler {

Core/Sources/SuggestionWidget/Providers/CodeSuggestionProvider.swift

@@ -18,6 +18,7 @@ public final class CodeSuggestionProvider: ObservableObject, Equatable {
     public var onSelectNextSuggestionTapped: () -> Void
     public var onRejectSuggestionTapped: () -> Void
     public var onAcceptSuggestionTapped: () -> Void
+    public var onDismissSuggestionTapped: () -> Void
 
     public init(
         code: String = "",
@@ -28,7 +29,8 @@ public final class CodeSuggestionProvider: ObservableObject, Equatable {
         onSelectPreviousSuggestionTapped: @escaping () -> Void = {},
         onSelectNextSuggestionTapped: @escaping () -> Void = {},
         onRejectSuggestionTapped: @escaping () -> Void = {},
-        onAcceptSuggestionTapped: @escaping () -> Void = {}
+        onAcceptSuggestionTapped: @escaping () -> Void = {},
+        onDismissSuggestionTapped: @escaping () -> Void = {}
     ) {
         self.code = code
         self.language = language
@@ -39,11 +41,13 @@ public final class CodeSuggestionProvider: ObservableObject, Equatable {
         self.onSelectNextSuggestionTapped = onSelectNextSuggestionTapped
         self.onRejectSuggestionTapped = onRejectSuggestionTapped
         self.onAcceptSuggestionTapped = onAcceptSuggestionTapped
+        self.onDismissSuggestionTapped = onDismissSuggestionTapped
     }
 
     func selectPreviousSuggestion() { onSelectPreviousSuggestionTapped() }
     func selectNextSuggestion() { onSelectNextSuggestionTapped() }
     func rejectSuggestion() { onRejectSuggestionTapped() }
     func acceptSuggestion() { onAcceptSuggestionTapped() }
+    func dismissSuggestion() { onDismissSuggestionTapped() }
 }
 

Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlockSuggestionPanel.swift

@@ -74,7 +74,7 @@ struct CodeBlockSuggestionPanel: View {
                 Spacer()
 
                 Button(action: {
-                    suggestion.rejectSuggestion()
+                    suggestion.dismissSuggestion()
                 }) {
                     Image(systemName: "xmark")
                 }.buttonStyle(.plain)

Pro

@@ -334,6 +334,10 @@ public extension UserDefaultPreferenceKeys {
         .init(defaultValue: true, key: "AcceptSuggestionWithTab")
     }
 
+    var dismissSuggestionWithEsc: PreferenceKey<Bool> {
+        .init(defaultValue: true, key: "DismissSuggestionWithEsc")
+    }
+    
     var isSuggestionSenseEnabled: PreferenceKey<Bool> {
         .init(defaultValue: false, key: "IsSuggestionSenseEnabled")
     }