Update to show suggestion index and count

Author: intitni

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -50,7 +50,13 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         )
 
         if let suggestion = filespace.presentingSuggestion {
-            presenter.presentSuggestion(suggestion, lines: editor.lines, fileURL: fileURL)
+            presenter.presentSuggestion(
+                suggestion,
+                lines: editor.lines,
+                fileURL: fileURL,
+                currentSuggestionIndex: filespace.suggestionIndex,
+                suggestionCount: filespace.suggestions.count
+            )
         } else {
             presenter.discardSuggestion(fileURL: fileURL)
         }
@@ -76,7 +82,13 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         )
 
         if let suggestion = filespace.presentingSuggestion {
-            presenter.presentSuggestion(suggestion, lines: editor.lines, fileURL: fileURL)
+            presenter.presentSuggestion(
+                suggestion,
+                lines: editor.lines,
+                fileURL: fileURL,
+                currentSuggestionIndex: filespace.suggestionIndex,
+                suggestionCount: filespace.suggestions.count
+            )
         } else {
             presenter.discardSuggestion(fileURL: fileURL)
         }
@@ -102,7 +114,13 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         )
 
         if let suggestion = filespace.presentingSuggestion {
-            presenter.presentSuggestion(suggestion, lines: editor.lines, fileURL: fileURL)
+            presenter.presentSuggestion(
+                suggestion,
+                lines: editor.lines,
+                fileURL: fileURL,
+                currentSuggestionIndex: filespace.suggestionIndex,
+                suggestionCount: filespace.suggestions.count
+            )
         } else {
             presenter.discardSuggestion(fileURL: fileURL)
         }

Core/Sources/Service/SuggestionPresenter/PresentInWindowSuggestionPresenter.swift

@@ -2,13 +2,21 @@ import CopilotModel
 import Foundation
 
 struct PresentInWindowSuggestionPresenter {
-    func presentSuggestion(_ suggestion: CopilotCompletion, lines: [String], fileURL: URL) {
+    func presentSuggestion(
+        _ suggestion: CopilotCompletion,
+        lines: [String],
+        fileURL: URL,
+        currentSuggestionIndex: Int,
+        suggestionCount: Int
+    ) {
         Task { @MainActor in
             let controller = GraphicalUserInterfaceController.shared.suggestionWidget
             controller.suggestCode(
                 suggestion.text,
                 startLineIndex: suggestion.position.line,
-                fileURL: fileURL
+                fileURL: fileURL,
+                currentSuggestionIndex: currentSuggestionIndex,
+                suggestionCount: suggestionCount
             )
         }
     }

Core/Sources/SuggestionWidget/SuggestionPanelView.swift

@@ -107,7 +107,8 @@ struct ToolBar: View {
 
     var body: some View {
         HStack {
-            Text("\(viewModel.currentSuggestionIndex)/\(viewModel.suggestionCount)")
+            Text("\(viewModel.currentSuggestionIndex + 1)/\(viewModel.suggestionCount)")
+                .monospacedDigit()
 
             Spacer()
 

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -56,7 +56,7 @@ public final class SuggestionWidgetController {
     private var suggestionForFiles: [URL: Suggestion] = [:]
 
     enum Suggestion {
-        case code([String], startLineIndex: Int)
+        case code([String], startLineIndex: Int, currentSuggestionIndex: Int, suggestionCount: Int)
     }
 
     public nonisolated init() {
@@ -83,14 +83,24 @@ public final class SuggestionWidgetController {
         }
     }
 
-    public func suggestCode(_ code: String, startLineIndex: Int, fileURL: URL) {
+    public func suggestCode(
+        _ code: String,
+        startLineIndex: Int,
+        fileURL: URL,
+        currentSuggestionIndex: Int,
+        suggestionCount: Int
+    ) {
         withAnimation(.easeInOut(duration: 0.2)) {
             suggestionPanelViewModel.suggestion = code.split(separator: "\n").map(String.init)
             suggestionPanelViewModel.startLineIndex = startLineIndex
             suggestionPanelViewModel.isPanelDisplayed = true
+            suggestionPanelViewModel.currentSuggestionIndex = currentSuggestionIndex
+            suggestionPanelViewModel.suggestionCount = suggestionCount
             suggestionForFiles[fileURL] = .code(
                 suggestionPanelViewModel.suggestion,
-                startLineIndex: startLineIndex
+                startLineIndex: startLineIndex,
+                currentSuggestionIndex: currentSuggestionIndex,
+                suggestionCount: suggestionCount
             )
             widgetViewModel.isProcessing = false
         }
@@ -101,6 +111,8 @@ public final class SuggestionWidgetController {
             suggestionForFiles[fileURL] = nil
             suggestionPanelViewModel.suggestion = []
             suggestionPanelViewModel.startLineIndex = 0
+            suggestionPanelViewModel.currentSuggestionIndex = 0
+            suggestionPanelViewModel.suggestionCount = 0
             suggestionPanelViewModel.isPanelDisplayed = false
             widgetViewModel.isProcessing = false
         }
@@ -136,9 +148,11 @@ public final class SuggestionWidgetController {
                         continue
                     }
                     switch suggestion {
-                    case let .code(code, startLineIndex):
+                    case let .code(code, startLineIndex, currentSuggestionIndex, suggestionCount):
                         suggestionPanelViewModel.suggestion = code
                         suggestionPanelViewModel.startLineIndex = startLineIndex
+                        suggestionPanelViewModel.currentSuggestionIndex = currentSuggestionIndex
+                        suggestionPanelViewModel.suggestionCount = suggestionCount
                     }
                 }
             }