Merge branch 'feature/present-errors-in-widget' into develop

Author: intitni

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -17,6 +17,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
             do {
                 try await _presentSuggestions(editor: editor)
             } catch {
+                presenter.presentError(error)
                 Logger.service.error(error)
             }
         }
@@ -63,7 +64,11 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
 
     func presentNextSuggestion(editor: EditorContent) async throws -> UpdatedContent? {
         Task {
-            try await _presentNextSuggestion(editor: editor)
+            do {
+                try await _presentNextSuggestion(editor: editor)
+            } catch {
+                presenter.presentError(error)
+            }
         }
         return nil
     }
@@ -92,7 +97,11 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
 
     func presentPreviousSuggestion(editor: EditorContent) async throws -> UpdatedContent? {
         Task {
-            try await _presentPreviousSuggestion(editor: editor)
+            do {
+                try await _presentPreviousSuggestion(editor: editor)
+            } catch {
+                presenter.presentError(error)
+            }
         }
         return nil
     }
@@ -121,7 +130,11 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
 
     func rejectSuggestion(editor: EditorContent) async throws -> UpdatedContent? {
         Task {
-            try await _rejectSuggestion(editor: editor)
+            do {
+                try await _rejectSuggestion(editor: editor)
+            } catch {
+                presenter.presentError(error)
+            }
         }
         return nil
     }
@@ -147,6 +160,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
             }
             return result
         } catch {
+            presenter.presentError(error)
             throw error
         }
     }

Core/Sources/Service/SuggestionPresenter/PresentInWindowSuggestionPresenter.swift

@@ -36,4 +36,11 @@ struct PresentInWindowSuggestionPresenter {
             controller.markAsProcessing(isProcessing)
         }
     }
+    
+    func presentError(_ error: Error) {
+        Task { @MainActor in
+            let controller = GraphicalUserInterfaceController.shared.suggestionWidget
+            controller.presentError(error.localizedDescription)
+        }
+    }
 }

Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlockSuggestionPanel.swift

@@ -0,0 +1,95 @@
+import SwiftUI
+
+struct CodeBlock: View {
+    var suggestion: SuggestionPanelViewModel.Suggestion
+
+    var body: some View {
+        VStack {
+            ForEach(0..<suggestion.code.endIndex, id: \.self) { index in
+                HStack(alignment: .firstTextBaseline) {
+                    Text("\(index + suggestion.startLineIndex + 1)")
+                        .multilineTextAlignment(.trailing)
+                        .foregroundColor(.secondary)
+                        .frame(minWidth: 40)
+                    Text(AttributedString(suggestion.code[index]))
+                        .foregroundColor(.white.opacity(0.1))
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .multilineTextAlignment(.leading)
+                        .lineSpacing(4)
+                }
+            }
+        }
+        .foregroundColor(.white)
+        .font(.system(size: 12, design: .monospaced))
+        .padding()
+    }
+}
+
+struct CodeBlockSuggestionPanel: View {
+    @ObservedObject var viewModel: SuggestionPanelViewModel
+    var suggestion: SuggestionPanelViewModel.Suggestion
+
+    struct ToolBar: View {
+        @ObservedObject var viewModel: SuggestionPanelViewModel
+        var suggestion: SuggestionPanelViewModel.Suggestion
+
+        var body: some View {
+            HStack {
+                Button(action: {
+                    viewModel.onPreviousButtonTapped?()
+                }) {
+                    Image(systemName: "chevron.left")
+                }.buttonStyle(.plain)
+
+                Text(
+                    "\(suggestion.currentSuggestionIndex + 1) / \(suggestion.suggestionCount)"
+                )
+                .monospacedDigit()
+
+                Button(action: {
+                    viewModel.onNextButtonTapped?()
+                }) {
+                    Image(systemName: "chevron.right")
+                }.buttonStyle(.plain)
+
+                Spacer()
+
+                Button(action: {
+                    viewModel.onRejectButtonTapped?()
+                }) {
+                    Text("Reject")
+                }.buttonStyle(CommandButtonStyle(color: .gray))
+
+                Button(action: {
+                    viewModel.onAcceptButtonTapped?()
+                }) {
+                    Text("Accept")
+                }.buttonStyle(CommandButtonStyle(color: .indigo))
+            }
+            .padding()
+            .foregroundColor(.secondary)
+            .background(.regularMaterial)
+        }
+    }
+
+    var body: some View {
+        VStack(spacing: 0) {
+            ScrollView {
+                CodeBlock(suggestion: suggestion)
+                    .frame(maxWidth: .infinity)
+            }
+            .background(Color(nsColor: {
+                switch viewModel.colorScheme {
+                case .dark:
+                    return #colorLiteral(red: 0.1580096483, green: 0.1730263829, blue: 0.2026666105, alpha: 1)
+                case .light:
+                    return .white
+                @unknown default:
+                    return .white
+                }
+            }()))
+
+            ToolBar(viewModel: viewModel, suggestion: suggestion)
+        }
+    }
+}

Core/Sources/SuggestionWidget/SuggestionPanelContent/ErrorPanel.swift

@@ -0,0 +1,29 @@
+import SwiftUI
+
+struct ErrorPanel: View {
+    @ObservedObject var viewModel: SuggestionPanelViewModel
+    var description: String
+
+    var body: some View {
+        ZStack(alignment: .topTrailing) {
+            Text(description)
+                .multilineTextAlignment(.leading)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .foregroundColor(.white)
+                .padding()
+                .background(Color.red)
+            
+            // close button
+            Button(action: {
+                viewModel.isPanelDisplayed = false
+                viewModel.content = .empty
+            }) {
+                Image(systemName: "xmark")
+                    .padding([.leading, .bottom], 16)
+                    .padding([.top, .trailing], 8)
+                    .foregroundColor(.white)
+            }
+            .buttonStyle(.plain)
+        }
+    }
+}