Make the chat box work

intitni · intitni · commit 0eb92ef6b7d6 · 2023-03-24T19:26:09.000+08:00
diff --git a/Core/Sources/ActiveApplicationMonitor/ActiveApplicationMonitor.swift b/Core/Sources/ActiveApplicationMonitor/ActiveApplicationMonitor.swift
@@ -2,7 +2,14 @@ import AppKit
 
 public final class ActiveApplicationMonitor {
     static let shared = ActiveApplicationMonitor()
-    var activeApplication = NSWorkspace.shared.runningApplications.first(where: \.isActive)
+    var latestXcode: NSRunningApplication?
+    var activeApplication = NSWorkspace.shared.runningApplications.first(where: \.isActive) {
+        didSet {
+            if activeApplication?.isXcode ?? false {
+                latestXcode = activeApplication
+            }
+        }
+    }
     private var continuations: [UUID: AsyncStream<NSRunningApplication?>.Continuation] = [:]
 
     private init() {
@@ -28,11 +35,13 @@ public final class ActiveApplicationMonitor {
     public static var activeApplication: NSRunningApplication? { shared.activeApplication }
 
     public static var activeXcode: NSRunningApplication? {
-        if activeApplication?.bundleIdentifier == "com.apple.dt.Xcode" {
+        if activeApplication?.isXcode ?? false {
             return activeApplication
         }
         return nil
     }
+    
+    public static var latestXcode: NSRunningApplication? { shared.latestXcode }
 
     public static func createStream() -> AsyncStream<NSRunningApplication?> {
         .init { continuation in
@@ -62,3 +71,8 @@ public final class ActiveApplicationMonitor {
         }
     }
 }
+
+extension NSRunningApplication {
+    public var isXcode: Bool { bundleIdentifier == "com.apple.dt.Xcode" }
+}
+
diff --git a/Core/Sources/Environment/Environment.swift b/Core/Sources/Environment/Environment.swift
@@ -111,33 +111,28 @@ public enum Environment {
         }
 
     public static var triggerAction: (_ name: String) async throws -> Void = { name in
-        var xcodes = [NSRunningApplication]()
-        var retryCount = 0
-        // Sometimes runningApplications returns 0 items.
-        while xcodes.isEmpty, retryCount < 5 {
-            xcodes = NSRunningApplication
-                .runningApplications(withBundleIdentifier: "com.apple.dt.Xcode")
-            if retryCount > 0 { try await Task.sleep(nanoseconds: 10_000_000) }
-            retryCount += 1
-        }
-
-        guard let activeXcode = xcodes.first(where: { $0.isActive }) else { return }
+        guard let activeXcode = ActiveApplicationMonitor.activeXcode
+            ?? ActiveApplicationMonitor.latestXcode
+        else { return }
         let bundleName = Bundle.main
             .object(forInfoDictionaryKey: "EXTENSION_BUNDLE_NAME") as! String
 
         /// check if menu is open, if not, click the menu item.
         let appleScript = """
         tell application "System Events"
-            set proc to item 1 of (processes whose unix id is \(activeXcode.processIdentifier))
-            tell proc
-                repeat with theMenu in menus of menu bar 1
-                    set theValue to value of attribute "AXVisibleChildren" of theMenu
-                    if theValue is not {} then
-                        return
-                    end if
-                end repeat
-                click menu item "\(name)" of menu 1 of menu item "\(bundleName)" of menu 1 of menu bar item "Editor" of menu bar 1
-            end tell
+            set theprocs to every process whose unix id is \(activeXcode.processIdentifier)
+            repeat with proc in theprocs
+            set the frontmost of proc to true
+                tell proc
+                    repeat with theMenu in menus of menu bar 1
+                        set theValue to value of attribute "AXVisibleChildren" of theMenu
+                        if theValue is not {} then
+                            return
+                        end if
+                    end repeat
+                    click menu item "\(name)" of menu 1 of menu item "\(bundleName)" of menu 1 of menu bar item "Editor" of menu bar 1
+                end tell
+            end repeat
         end tell
         """
 
diff --git a/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift
@@ -199,20 +199,23 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
 
         let service = ChatGPTService(
             systemPrompt: """
-            You are a code explanation engine, you can only explain the code, do not interpret or translate it. Reply in \(language.isEmpty ? language : "English")
+            You are a code explanation engine, you can only explain the code concisely, do not interpret or translate it. Reply in \(
+                language
+                    .isEmpty ? language : "English"
+            )
             """,
             apiKey: UserDefaults.shared.value(for: \.openAIAPIKey),
             endpoint: endpoint.isEmpty ? nil : endpoint,
             model: model.isEmpty ? nil : model,
-            temperature: 0.6,
+            temperature: 1,
             maxToken: UserDefaults.shared.value(for: \.chatGPTMaxToken)
         )
 
         let code = editor.selectedCode(in: selection)
         Task {
             try? await service.send(
                 content: removeContinousSpaces(from: code),
-                summary: "Explain selected code from \(selection.start.line):\(selection.start.character) to \(selection.end.line):\(selection.end.character)."
+                summary: "Explain selected code from `\(selection.start.line + 1):\(selection.start.character + 1)` to `\(selection.end.line + 1):\(selection.end.character + 1)`."
             )
         }
 
diff --git a/Core/Sources/SuggestionWidget/Styles.swift b/Core/Sources/SuggestionWidget/Styles.swift
@@ -18,11 +18,11 @@ extension Color {
             return .white
         }))
     }
-    
+
     static var userChatContentBackground: Color {
         Color(nsColor: NSColor(name: nil, dynamicProvider: { appearance in
             if appearance.isDarkMode {
-                return #colorLiteral(red: 0.1777971793, green: 0.1670255649, blue: 0.2501594388, alpha: 1)
+                return #colorLiteral(red: 0.2284317913, green: 0.2145925438, blue: 0.3214019983, alpha: 1)
             }
             return #colorLiteral(red: 0.896820749, green: 0.8709097223, blue: 0.9766687925, alpha: 1)
         }))
@@ -31,10 +31,25 @@ extension Color {
 
 extension NSAppearance {
     var isDarkMode: Bool {
-        if self.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua {
+        if bestMatch(from: [.darkAqua, .aqua]) == .darkAqua {
             return true
         } else {
             return false
         }
     }
 }
+
+extension View {
+    func xcodeStyleFrame() -> some View {
+        clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
+            .overlay(
+                RoundedRectangle(cornerRadius: 8, style: .continuous)
+                    .stroke(Color.black.opacity(0.3), style: .init(lineWidth: 1))
+            )
+            .overlay(
+                RoundedRectangle(cornerRadius: 7, style: .continuous)
+                    .stroke(Color.white.opacity(0.2), style: .init(lineWidth: 1))
+                    .padding(1)
+            )
+    }
+}
diff --git a/Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift b/Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift
@@ -2,33 +2,90 @@ import MarkdownUI
 import SwiftUI
 
 struct ChatPanel: View {
-    @ObservedObject var viewModel: SuggestionPanelViewModel
+    var viewModel: SuggestionPanelViewModel
     @ObservedObject var chat: ChatRoom
+    @State var typedMessage = ""
+    @Namespace var inputAreaNamespace
 
     var body: some View {
         ZStack(alignment: .topTrailing) {
-            ScrollView {
-                LazyVStack {
-                    ForEach(chat.history.reversed(), id: \.id) { message in
-                        Markdown(message.text)
-                            .markdownTheme(.gitHub.text {
-                                BackgroundColor(Color.clear)
-                            })
-                            .frame(maxWidth: .infinity, alignment: .leading)
-                            .padding()
-                            .background(
-                                RoundedRectangle(cornerRadius: 9, style: .continuous)
-                                    .fill(
-                                        message.isUser
+            VStack {
+                ScrollView {
+                    LazyVStack() {
+                        if chat.isReceivingMessage {
+                            Button(action: {
+                                chat.stop()
+                            }) {
+                                HStack(spacing: 4) {
+                                    Image(systemName: "stop.fill")
+                                    Text("Stop Responding")
+                                }
+                                .rotationEffect(Angle(degrees: 180))
+                                .padding(8)
+                                .background(
+                                    .regularMaterial,
+                                    in: RoundedRectangle(cornerRadius: 8, style: .continuous)
+                                )
+                            }
+                            .buttonStyle(.plain)
+                            .xcodeStyleFrame()
+                            .matchedGeometryEffect(id: "input", in: inputAreaNamespace)
+                        }
+                        
+                        ForEach(chat.history.reversed(), id: \.id) { message in
+                            let text = message.text.isEmpty && !message.isUser ? "..." : message.text
+                            
+                            Markdown(text)
+                                .textSelection(.enabled)
+                                .markdownTheme(.gitHub.text {
+                                    BackgroundColor(Color.clear)
+                                })
+                                .frame(maxWidth: .infinity, alignment: .leading)
+                                .padding()
+                                .background(
+                                    RoundedRectangle(cornerRadius: 9, style: .continuous)
+                                        .fill(
+                                            message.isUser
                                             ? Color.userChatContentBackground
                                             : Color.contentBackground
-                                    )
+                                        )
+                                )
+                                .xcodeStyleFrame()
+                                .rotationEffect(Angle(degrees: 180))
+                        }
+                    }
+                }
+                .rotationEffect(Angle(degrees: 180))
+                
+                if !chat.isReceivingMessage {
+                    HStack {
+                        TextField("Type a message", text: $typedMessage)
+                            .textFieldStyle(.plain)
+                            .padding(8)
+                            .background(
+                                .regularMaterial,
+                                in: RoundedRectangle(cornerRadius: 8, style: .continuous)
                             )
-                            .rotationEffect(Angle(degrees: 180))
+                            .xcodeStyleFrame()
+                        
+                        Button(action: {
+                            if typedMessage.isEmpty { return }
+                            chat.send(typedMessage)
+                            typedMessage = ""
+                        }) {
+                            Image(systemName: "paperplane.fill")
+                                .padding(8)
+                                .background(
+                                    .regularMaterial,
+                                    in: RoundedRectangle(cornerRadius: 8, style: .continuous)
+                                )
+                        }
+                        .buttonStyle(.plain)
+                        .xcodeStyleFrame()
                     }
+                    .matchedGeometryEffect(id: "input", in: inputAreaNamespace)
                 }
             }
-            .rotationEffect(Angle(degrees: 180))
 
             // close button
             Button(action: {
@@ -39,11 +96,10 @@ struct ChatPanel: View {
                 Image(systemName: "xmark")
                     .padding([.leading, .bottom], 16)
                     .padding([.top, .trailing], 8)
-                    .foregroundColor(.white)
+                    .foregroundStyle(.secondary)
             }
             .buttonStyle(.plain)
         }
-        .colorScheme(viewModel.colorScheme)
     }
 }
 
@@ -76,9 +132,12 @@ struct ChatPanel_Preview: PreviewProvider {
                     """#
                 ),
             ],
-            isReceivingMessage: false
+            isReceivingMessage: true
         ))
+        .padding(8)
+        .background(Color.contentBackground)
         .frame(width: 450, height: 500)
+        .colorScheme(.dark)
     }
 }
 
@@ -112,8 +171,11 @@ struct ChatPanel_Light_Preview: PreviewProvider {
                     """#
                 ),
             ],
-            isReceivingMessage: false
+            isReceivingMessage: true
         ))
+        .padding(8)
+        .background(Color.contentBackground)
         .frame(width: 450, height: 500)
+        .colorScheme(.light)
     }
 }
diff --git a/Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlockSuggestionPanel.swift b/Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlockSuggestionPanel.swift
@@ -82,5 +82,6 @@ struct CodeBlockSuggestionPanel: View {
 
             ToolBar(viewModel: viewModel, suggestion: suggestion)
         }
+        .xcodeStyleFrame()
     }
 }
diff --git a/Core/Sources/SuggestionWidget/SuggestionPanelContent/ErrorPanel.swift b/Core/Sources/SuggestionWidget/SuggestionPanelContent/ErrorPanel.swift
@@ -25,5 +25,6 @@ struct ErrorPanel: View {
             }
             .buttonStyle(.plain)
         }
+        .xcodeStyleFrame()
     }
 }
diff --git a/Core/Sources/SuggestionWidget/SuggestionPanelView.swift b/Core/Sources/SuggestionWidget/SuggestionPanelView.swift
@@ -77,16 +77,6 @@ struct SuggestionPanelView: View {
             }
             .frame(maxWidth: .infinity, maxHeight: Style.panelHeight)
             .fixedSize(horizontal: false, vertical: true)
-            .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
-            .overlay(
-                RoundedRectangle(cornerRadius: 8, style: .continuous)
-                    .stroke(Color.black.opacity(0.3), style: .init(lineWidth: 1))
-            )
-            .overlay(
-                RoundedRectangle(cornerRadius: 7, style: .continuous)
-                    .stroke(Color.white.opacity(0.2), style: .init(lineWidth: 1))
-                    .padding(1)
-            )
             .allowsHitTesting(viewModel.isPanelDisplayed && viewModel.content != .empty)
             .preferredColorScheme(viewModel.colorScheme)
 
@@ -267,3 +257,19 @@ struct SuggestionPanelView_Error_Preview: PreviewProvider {
         .frame(width: 450, height: 200)
     }
 }
+
+struct SuggestionPanelView_Chat_Preview: PreviewProvider {
+    static var previews: some View {
+        SuggestionPanelView(viewModel: .init(
+            content: .chat(.init(
+                history: [
+                    .init(id: "1", isUser: true, text: "Hello"),
+                    .init(id: "2", isUser: false, text: "Hi"),
+                    .init(id: "3", isUser: true, text: "What's up?"),
+                ]
+            )),
+            isPanelDisplayed: true
+        ))
+        .frame(width: 450, height: 200)
+    }
+}
diff --git a/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift b/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift
diff --git a/ExtensionService/AppDelegate.swift b/ExtensionService/AppDelegate.swift

Original file line number	Diff line number	Diff line change
`@@ -82,5 +82,6 @@ struct CodeBlockSuggestionPanel: View {`
`82`	`82`
`83`	`83`	`ToolBar(viewModel: viewModel, suggestion: suggestion)`
`84`	`84`	`}`
	`85`	`+ .xcodeStyleFrame()`
`85`	`86`	`}`
`86`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,6 @@ struct ErrorPanel: View {`
`25`	`25`	`}`
`26`	`26`	`.buttonStyle(.plain)`
`27`	`27`	`}`
	`28`	`+ .xcodeStyleFrame()`
`28`	`29`	`}`
`29`	`30`	`}`