Add a widget window to show/hide the suggestion panel

Author: intitni

Core/Sources/Service/GUI/SuggestionPanelController.swift

@@ -6,7 +6,7 @@ import SwiftUI
 
 @MainActor
 final class SuggestionPanelController {
-    private lazy var window = {
+    private lazy var widgetWindow = {
         let it = NSWindow(
             contentRect: .zero,
             styleMask: .borderless,
@@ -18,21 +18,41 @@ final class SuggestionPanelController {
         it.backgroundColor = .clear
         it.level = .statusBar
         it.contentView = NSHostingView(
-            rootView: SuggestionPanelView(viewModel: viewModel)
-                .allowsHitTesting(false)
-                .frame(width: 400, height: 250)
+            rootView: WidgetView(
+                viewModel: widgetViewModel,
+                panelViewModel: suggestionPanelViewModel
+            )
+        )
+        it.setIsVisible(true)
+        return it
+    }()
+
+    private lazy var panelWindow = {
+        let it = NSWindow(
+            contentRect: .zero,
+            styleMask: .borderless,
+            backing: .buffered,
+            defer: false
+        )
+        it.isReleasedWhenClosed = false
+        it.isOpaque = false
+        it.backgroundColor = .clear
+        it.level = .statusBar
+        it.contentView = NSHostingView(
+            rootView: SuggestionPanelView(viewModel: suggestionPanelViewModel)
         )
         it.setIsVisible(true)
         return it
     }()
 
-    let viewModel = SuggestionPanelViewModel()
+    let widgetViewModel = WidgetViewModel()
+    let suggestionPanelViewModel = SuggestionPanelViewModel()
 
     private var windowChangeObservationTask: Task<Void, Error>?
     private var activeApplicationMonitorTask: Task<Void, Error>?
     private var xcode: NSRunningApplication?
     private var suggestionForFiles: [URL: Suggestion] = [:]
-    
+
     enum Suggestion {
         case code([String], startLineIndex: Int)
     }
@@ -58,11 +78,22 @@ final class SuggestionPanelController {
             }
         }
     }
-    
+
     func suggestCode(_ code: String, startLineIndex: Int, fileURL: URL) {
-        viewModel.suggestion = code.split(separator: "\n").map(String.init)
-        viewModel.startLineIndex = startLineIndex
-        suggestionForFiles[fileURL] = .code(viewModel.suggestion, startLineIndex: startLineIndex)
+        suggestionPanelViewModel.suggestion = code.split(separator: "\n").map(String.init)
+        suggestionPanelViewModel.startLineIndex = startLineIndex
+        suggestionPanelViewModel.isPanelDisplayed = true
+        suggestionForFiles[fileURL] = .code(
+            suggestionPanelViewModel.suggestion,
+            startLineIndex: startLineIndex
+        )
+    }
+
+    func discardSuggestion(fileURL: URL) {
+        suggestionForFiles[fileURL] = nil
+        suggestionPanelViewModel.suggestion = []
+        suggestionPanelViewModel.startLineIndex = 0
+        suggestionPanelViewModel.isPanelDisplayed = false
     }
 
     private func observeXcodeWindowChangeIfNeeded(_ app: NSRunningApplication) {
@@ -82,18 +113,19 @@ final class SuggestionPanelController {
                 guard let self else { return }
                 try Task.checkCancellation()
                 self.updateWindowLocation()
-                
+
                 if notification.name == kAXFocusedUIElementChangedNotification {
                     guard let fileURL = try? await Environment.fetchCurrentFileURL(),
                           let suggestion = suggestionForFiles[fileURL]
                     else {
-                        viewModel.suggestion = []
+                        suggestionPanelViewModel.suggestion = []
                         continue
                     }
                     switch suggestion {
                     case let .code(code, startLineIndex):
-                        viewModel.suggestion = code
-                        viewModel.startLineIndex = startLineIndex
+                        return
+                            suggestionPanelViewModel.suggestion = code
+                        suggestionPanelViewModel.startLineIndex = startLineIndex
                     }
                 }
             }
@@ -123,68 +155,104 @@ final class SuggestionPanelController {
                 var size: CGSize = .zero
                 let foundSize = AXValueGetValue(sizeValue, .cgSize, &size)
                 let screen = NSScreen.screens.first
-                var frame = CGRect(origin: position, size: size)
+                let frame = CGRect(origin: position, size: size)
                 if foundSize, foundPosition, let screen {
-                    frame.origin = .init(
-                        x: frame.maxX + 2,
-                        y: screen.frame.height - frame.minY - 250
+                    let anchorFrame = CGRect(
+                        x: frame.maxX - 4 - 30,
+                        y: screen.frame.height - frame.minY - 30,
+                        width: 30,
+                        height: 30
+                    )
+                    widgetWindow.setFrame(anchorFrame, display: false)
+
+                    let panelFrame = CGRect(
+                        x: anchorFrame.maxX + 8,
+                        y: anchorFrame.minY - 300 + 30,
+                        width: 400,
+                        height: 300
                     )
-                    frame.size = .init(width: 400, height: 300)
-                    window.alphaValue = 1
-                    window.setFrame(frame, display: false)
+                    panelWindow.alphaValue = 1
+                    panelWindow.setFrame(panelFrame, display: false)
                     return
                 }
             }
         }
 
-        window.alphaValue = 0
+        panelWindow.alphaValue = 0
     }
 }
 
-#warning("MUSTDO: Update when editing file is changed.")
-
 @MainActor
 final class SuggestionPanelViewModel: ObservableObject {
     @Published var startLineIndex: Int = 0
-    @Published var suggestion: [String] = ["Hello", "World"] {
-        didSet {
-            isPanelDisplayed = !suggestion.isEmpty
-        }
-    }
-
+    @Published var suggestion: [String] = ["Hello", "World"]
     @Published var isPanelDisplayed = true
 }
 
 struct SuggestionPanelView: View {
     @ObservedObject var viewModel: SuggestionPanelViewModel
+    @State var isHovered: Bool = false
 
     var body: some View {
-        if viewModel.isPanelDisplayed {
-            if !viewModel.suggestion.isEmpty {
-                ZStack(alignment: .topLeading) {
-                    Color(red: 31 / 255, green: 31 / 255, blue: 36 / 255)
-                    ScrollView {
-                        VStack(alignment: .leading) {
-                            ForEach(0..<viewModel.suggestion.count, id: \.self) { index in
-                                HStack(alignment: .firstTextBaseline) {
-                                    Text("\(index)")
-                                    Text(viewModel.suggestion[index])
-                                }
+        if !viewModel.suggestion.isEmpty {
+            ZStack(alignment: .topLeading) {
+                RoundedRectangle(cornerRadius: 8, style: .continuous)
+                    .fill(Color(red: 31 / 255, green: 31 / 255, blue: 36 / 255))
+                ScrollView {
+                    VStack(alignment: .leading) {
+                        ForEach(0..<viewModel.suggestion.count, id: \.self) { index in
+                            HStack(alignment: .firstTextBaseline) {
+                                Text("\(index)")
+                                Text(viewModel.suggestion[index])
                             }
-                            Spacer()
                         }
-                        .foregroundColor(.white)
-                        .font(.system(size: 12, design: .monospaced))
-                        .multilineTextAlignment(.leading)
-                        .padding()
+                        Spacer()
                     }
+                    .foregroundColor(.white)
+                    .font(.system(size: 12, design: .monospaced))
+                    .multilineTextAlignment(.leading)
+                    .padding()
+                }
+            }
+            .opacity({
+                guard viewModel.isPanelDisplayed else { return 0 }
+                return isHovered ? 0.3 : 1
+            }())
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
+            .onHover { yes in
+                withAnimation(.easeInOut(duration: 0.2)) {
+                    isHovered = yes
                 }
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-            } else {
-                Color(red: 31 / 255, green: 31 / 255, blue: 36 / 255)
             }
-        } else {
-            EmptyView()
+            .allowsHitTesting(viewModel.isPanelDisplayed)
         }
     }
 }
+
+@MainActor
+final class WidgetViewModel: ObservableObject {
+    enum Position {
+        case topLeft
+        case topRight
+        case bottomLeft
+        case bottomRight
+    }
+
+    var position: Position = .topRight
+
+    init() {}
+}
+
+struct WidgetView: View {
+    @ObservedObject var viewModel: WidgetViewModel
+    var panelViewModel: SuggestionPanelViewModel
+
+    var body: some View {
+        Circle().fill(.blue)
+            .onTapGesture {
+                withAnimation(.easeInOut(duration: 0.2)) {
+                    panelViewModel.isPanelDisplayed.toggle()
+                }
+            }
+    }
+}

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -42,10 +42,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         if let suggestion = filespace.presentingSuggestion {
             presentSuggestion(suggestion, lines: editor.lines, fileURL: fileURL)
         } else {
-            Task { @MainActor in
-                GraphicalUserInterfaceController.shared.suggestionPanelController.viewModel
-                    .suggestion = []
-            }
+            discardSuggestion(fileURL: fileURL)
         }
     }
 
@@ -69,10 +66,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         if let suggestion = filespace.presentingSuggestion {
             presentSuggestion(suggestion, lines: editor.lines, fileURL: fileURL)
         } else {
-            Task { @MainActor in
-                GraphicalUserInterfaceController.shared.suggestionPanelController.viewModel
-                    .suggestion = []
-            }
+            discardSuggestion(fileURL: fileURL)
         }
     }
 
@@ -96,10 +90,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         if let suggestion = filespace.presentingSuggestion {
             presentSuggestion(suggestion, lines: editor.lines, fileURL: fileURL)
         } else {
-            Task { @MainActor in
-                GraphicalUserInterfaceController.shared.suggestionPanelController.viewModel
-                    .suggestion = []
-            }
+            discardSuggestion(fileURL: fileURL)
         }
     }
 
@@ -115,18 +106,13 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         let (workspace, _) = try await Workspace.fetchOrCreateWorkspaceIfNeeded(fileURL: fileURL)
         workspace.rejectSuggestion(forFileAt: fileURL)
 
-        // hide it
-
-        Task { @MainActor in
-            GraphicalUserInterfaceController.shared.suggestionPanelController.viewModel
-                .suggestion = []
-        }
+        discardSuggestion(fileURL: fileURL)
     }
 
     func acceptSuggestion(editor: EditorContent) async throws -> UpdatedContent? {
-        Task { @MainActor in
-            GraphicalUserInterfaceController.shared.suggestionPanelController.viewModel
-                .suggestion = []
+        Task {
+            let fileURL = try await Environment.fetchCurrentFileURL()
+            discardSuggestion(fileURL: fileURL)
         }
         return try await CommentBaseCommandHandler().acceptSuggestion(editor: editor)
     }
@@ -150,4 +136,11 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
             )
         }
     }
+
+    func discardSuggestion(fileURL: URL) {
+        Task { @MainActor in
+            let controller = GraphicalUserInterfaceController.shared.suggestionPanelController
+            controller.discardSuggestion(fileURL: fileURL)
+        }
+    }
 }