Fix that suggestion from another file may be presented

Author: intitni

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -70,6 +70,7 @@ public final class SuggestionWidgetController {
     private var windowChangeObservationTask: Task<Void, Error>?
     private var activeApplicationMonitorTask: Task<Void, Error>?
     private var suggestionForFiles: [URL: Suggestion] = [:]
+    private var currentFileURL: URL?
 
     public var onAcceptButtonTapped: (() -> Void)? {
         get { suggestionPanelViewModel.onAcceptButtonTapped }
@@ -147,11 +148,13 @@ public final class SuggestionWidgetController {
         suggestionCount: Int
     ) {
         withAnimation(.easeInOut(duration: 0.2)) {
-            suggestionPanelViewModel.suggestion = highlighted(code: code, language: language)
-            suggestionPanelViewModel.startLineIndex = startLineIndex
-            suggestionPanelViewModel.isPanelDisplayed = true
-            suggestionPanelViewModel.currentSuggestionIndex = currentSuggestionIndex
-            suggestionPanelViewModel.suggestionCount = suggestionCount
+            if fileURL == currentFileURL || currentFileURL == nil {
+                suggestionPanelViewModel.suggestion = highlighted(code: code, language: language)
+                suggestionPanelViewModel.startLineIndex = startLineIndex
+                suggestionPanelViewModel.isPanelDisplayed = true
+                suggestionPanelViewModel.currentSuggestionIndex = currentSuggestionIndex
+                suggestionPanelViewModel.suggestionCount = suggestionCount
+            }
             suggestionForFiles[fileURL] = .code(
                 code,
                 language: language,
@@ -166,11 +169,13 @@ public final class SuggestionWidgetController {
     public func discardSuggestion(fileURL: URL) {
         withAnimation(.easeInOut(duration: 0.2)) {
             suggestionForFiles[fileURL] = nil
-            suggestionPanelViewModel.suggestion = []
-            suggestionPanelViewModel.startLineIndex = 0
-            suggestionPanelViewModel.currentSuggestionIndex = 0
-            suggestionPanelViewModel.suggestionCount = 0
-            suggestionPanelViewModel.isPanelDisplayed = false
+            if fileURL == currentFileURL || currentFileURL == nil {
+                suggestionPanelViewModel.suggestion = []
+                suggestionPanelViewModel.startLineIndex = 0
+                suggestionPanelViewModel.currentSuggestionIndex = 0
+                suggestionPanelViewModel.suggestionCount = 0
+                suggestionPanelViewModel.isPanelDisplayed = false
+            }
             widgetViewModel.isProcessing = false
         }
     }
@@ -195,10 +200,14 @@ public final class SuggestionWidgetController {
                 guard let self else { return }
                 try Task.checkCancellation()
                 self.updateWindowLocation(animated: false)
-
+                
                 if notification.name == kAXFocusedUIElementChangedNotification {
-                    guard let fileURL = try? await Environment.fetchCurrentFileURL(),
-                          let suggestion = suggestionForFiles[fileURL]
+                    guard let fileURL = try? await Environment.fetchCurrentFileURL() else {
+                        suggestionPanelViewModel.suggestion = []
+                        continue
+                    }
+                    currentFileURL = fileURL
+                    guard let suggestion = suggestionForFiles[fileURL]
                     else {
                         suggestionPanelViewModel.suggestion = []
                         continue

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -68,22 +68,25 @@ struct WidgetView: View {
                     }
                 }
             }
-            .onChange(of: viewModel.isProcessing) { isProcessing in
-                Task {
-                    await Task.yield()
-                    if isProcessing {
-                        processingProgress = 1 - processingProgress
-                    } else {
-                        processingProgress = panelViewModel.suggestion.isEmpty ? 0 : 1
-                    }
-                }
-            }
+            .onChange(of: viewModel.isProcessing) { _ in refreshRing() }
+            .onChange(of: panelViewModel.suggestion.isEmpty) { _ in refreshRing() }
             .onHover { yes in
                 withAnimation(.easeInOut(duration: 0.2)) {
                     isHovering = yes
                 }
             }
     }
+    
+    func refreshRing() {
+        Task {
+            await Task.yield()
+            if viewModel.isProcessing {
+                processingProgress = 1 - processingProgress
+            } else {
+                processingProgress = panelViewModel.suggestion.isEmpty ? 0 : 1
+            }
+        }
+    }
 }
 
 struct WidgetView_Preview: PreviewProvider {