Merge branch 'feature/chat-panel-tweaks' into develop

Author: intitni

Config.debug.xcconfig

@@ -2,6 +2,7 @@
 SLASH = /
 
 PRODUCT_NAME = Copilot for Xcode Dev
+HOST_APP_NAME = Copilot for Xcode Dev
 BUNDLE_IDENTIFIER_BASE = dev.com.intii.CopilotForXcode
 EXTENSION_BUNDLE_NAME = Copilot Dev
 SPARKLE_FEED_URL = http:$(SLASH)$(SLASH)127.0.0.1:9433/appcast.xml

Core/Sources/ActiveApplicationMonitor/ActiveApplicationMonitor.swift

@@ -4,11 +4,13 @@ public final class ActiveApplicationMonitor {
     static let shared = ActiveApplicationMonitor()
     var latestXcode: NSRunningApplication? = NSWorkspace.shared.runningApplications
         .first(where: \.isXcode)
+    var previousApp: NSRunningApplication?
     var activeApplication = NSWorkspace.shared.runningApplications.first(where: \.isActive) {
         didSet {
             if activeApplication?.isXcode ?? false {
                 latestXcode = activeApplication
             }
+            previousApp = oldValue
         }
     }
 
@@ -35,6 +37,8 @@ public final class ActiveApplicationMonitor {
     }
 
     public static var activeApplication: NSRunningApplication? { shared.activeApplication }
+    
+    public static var previousActiveApplication: NSRunningApplication? { shared.previousApp }
 
     public static var activeXcode: NSRunningApplication? {
         if activeApplication?.isXcode ?? false {
@@ -77,3 +81,4 @@ public final class ActiveApplicationMonitor {
 public extension NSRunningApplication {
     var isXcode: Bool { bundleIdentifier == "com.apple.dt.Xcode" }
 }
+

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift.swift

@@ -33,4 +33,15 @@ public final class GraphicalUserInterfaceController {
             }
         }
     }
+    
+    public func openGlobalChat() {
+        UserDefaults.shared.set(true, for: \.useGlobalChat)
+        let dataSource = WidgetDataSource.shared
+        let fakeFileURL = URL(fileURLWithPath: "/")
+        Task {
+            await dataSource.createChatIfNeeded(for: fakeFileURL)
+            let presenter = PresentInWindowSuggestionPresenter()
+            presenter.presentChatRoom(fileURL: fakeFileURL)
+        }
+    }
 }

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -1,9 +1,10 @@
+import ActiveApplicationMonitor
 import ChatService
-import SuggestionModel
-import GitHubCopilotService
 import Foundation
+import GitHubCopilotService
 import OpenAIService
 import PromptToCodeService
+import SuggestionModel
 import SuggestionWidget
 
 @ServiceActor
@@ -52,6 +53,9 @@ final class WidgetDataSource {
                     }
                     let presenter = PresentInWindowSuggestionPresenter()
                     presenter.closeChatRoom(fileURL: url)
+                    if let app = ActiveApplicationMonitor.previousActiveApplication, app.isXcode {
+                        app.activate()
+                    }
                 },
                 onSwitchContext: { [weak self] in
                     let useGlobalChat = UserDefaults.shared.value(for: \.useGlobalChat)
@@ -114,6 +118,9 @@ final class WidgetDataSource {
                     self?.removePromptToCode(for: url)
                     let presenter = PresentInWindowSuggestionPresenter()
                     presenter.closePromptToCode(fileURL: url)
+                    if let app = ActiveApplicationMonitor.previousActiveApplication, app.isXcode {
+                        app.activate()
+                    }
                 }
             )
             return PromptToCode(promptToCodeService: service, provider: provider)
@@ -199,3 +206,4 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
         return promptToCodes[url]?.provider
     }
 }
+

Core/Sources/SuggestionWidget/CustomTextEditor.swift

@@ -0,0 +1,70 @@
+import SwiftUI
+
+struct CustomTextEditor: NSViewRepresentable {
+    func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+
+    @Binding var text: String
+    let font: NSFont
+    let onSubmit: () -> Void
+
+    func makeNSView(context: Context) -> NSScrollView {
+        let textView = (context.coordinator.theTextView.documentView as! NSTextView)
+        textView.delegate = context.coordinator
+        textView.string = text
+        textView.font = font
+        textView.allowsUndo = true
+        textView.drawsBackground = false
+       
+        return context.coordinator.theTextView
+    }
+
+    func updateNSView(_ nsView: NSScrollView, context: Context) {
+        let textView = (context.coordinator.theTextView.documentView as! NSTextView)
+        textView.string = text
+    }
+}
+
+extension CustomTextEditor {
+    class Coordinator: NSObject, NSTextViewDelegate {
+        var view: CustomTextEditor
+        var theTextView = NSTextView.scrollableTextView()
+        var affectedCharRange: NSRange?
+
+        init(_ view: CustomTextEditor) {
+            self.view = view
+        }
+
+        func textDidChange(_ notification: Notification) {
+            guard let textView = notification.object as? NSTextView else {
+                return
+            }
+
+            view.text = textView.string
+        }
+
+        func textView(_ textView: NSTextView, doCommandBy commandSelector: Selector) -> Bool {
+            if commandSelector == #selector(NSTextView.insertNewline(_:)) {
+                if let event = NSApplication.shared.currentEvent,
+                   !event.modifierFlags.contains(.shift),
+                   event.keyCode == 36
+                {
+                    view.onSubmit()
+                    return true
+                }
+            }
+
+            return false
+        }
+
+        func textView(
+            _ textView: NSTextView,
+            shouldChangeTextIn affectedCharRange: NSRange,
+            replacementString: String?
+        ) -> Bool {
+            return true
+        }
+    }
+}
+

Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift

@@ -250,80 +250,99 @@ struct ChatPanelInputArea: View {
 
     var body: some View {
         HStack {
-            // clear button
-            Button(action: {
-                chat.clear()
-            }) {
-                Group {
-                    if #available(macOS 13.0, *) {
-                        Image(systemName: "eraser.line.dashed.fill")
-                    } else {
-                        Image(systemName: "trash.fill")
-                    }
-                }
-                .padding(6)
-                .background {
-                    Circle().fill(Color(nsColor: .controlBackgroundColor))
-                }
-                .overlay {
-                    Circle()
-                        .stroke(Color(nsColor: .controlColor), lineWidth: 1)
-                }
-            }
-            .buttonStyle(.plain)
+            clearButton
+            textEditor
+        }
+        .onAppear {
+            isInputAreaFocused = true
+        }
+        .padding(8)
+        .background(.ultraThickMaterial)
+    }
 
-            HStack(spacing: 0) {
-                Group {
-                    if #available(macOS 13.0, *) {
-                        TextField("Type a message", text: $typedMessage, axis: .vertical)
-                    } else {
-                        TextEditor(text: $typedMessage)
-                            .frame(height: 42, alignment: .leading)
-                            .font(.body)
-                            .background(Color.clear)
-                    }
-                }
-                .focused($isInputAreaFocused)
-                .lineLimit(3)
-                .multilineTextAlignment(.leading)
-                .textFieldStyle(.plain)
-                .padding(8)
-
-                Button(action: {
-                    if typedMessage.isEmpty { return }
-                    chat.send(typedMessage)
-                    typedMessage = ""
-                }) {
-                    Image(systemName: "paperplane.fill")
-                        .padding(8)
+    var clearButton: some View {
+        Button(action: {
+            chat.clear()
+        }) {
+            Group {
+                if #available(macOS 13.0, *) {
+                    Image(systemName: "eraser.line.dashed.fill")
+                } else {
+                    Image(systemName: "trash.fill")
                 }
-                .buttonStyle(.plain)
-                .disabled(chat.isReceivingMessage)
-                .keyboardShortcut(KeyEquivalent.return, modifiers: [])
             }
-            .frame(maxWidth: .infinity)
+            .padding(6)
             .background {
-                RoundedRectangle(cornerRadius: 6)
-                    .fill(Color(nsColor: .controlBackgroundColor))
+                Circle().fill(Color(nsColor: .controlBackgroundColor))
             }
             .overlay {
-                RoundedRectangle(cornerRadius: 6)
+                Circle()
                     .stroke(Color(nsColor: .controlColor), lineWidth: 1)
             }
-            .background {
-                Button(action: {
-                    typedMessage += "\n"
-                }) {
-                    EmptyView()
-                }
-                .keyboardShortcut(KeyEquivalent.return, modifiers: [.shift])
+        }
+        .buttonStyle(.plain)
+    }
+
+    var textEditor: some View {
+        HStack(spacing: 0) {
+            ZStack(alignment: .center) {
+                // a hack to support dynamic height of TextEditor
+                Text(typedMessage.isEmpty ? "Hi" : typedMessage).opacity(0)
+                    .font(.system(size: 14))
+                    .frame(maxWidth: .infinity, maxHeight: 400)
+                    .overlay(alignment: .leadingFirstTextBaseline) {
+                        Text("Write something..")
+                            .foregroundColor(.secondary)
+                            .font(.system(size: 14))
+                            .opacity(typedMessage.isEmpty ? 1 : 0)
+                    }
+                    .padding(.top, 0)
+                    .padding(.bottom, 3)
+                    .padding(.horizontal, 4)
+
+                CustomTextEditor(
+                    text: $typedMessage,
+                    font: .systemFont(ofSize: 14),
+                    onSubmit: { submitText() }
+                )
             }
+            .focused($isInputAreaFocused)
+            .padding(8)
+            .fixedSize(horizontal: false, vertical: true)
+
+            Button(action: {
+                submitText()
+            }) {
+                Image(systemName: "paperplane.fill")
+                    .padding(8)
+            }
+            .buttonStyle(.plain)
+            .disabled(chat.isReceivingMessage)
+            .keyboardShortcut(KeyEquivalent.return, modifiers: [])
         }
-        .onAppear {
-            isInputAreaFocused = true
+        .frame(maxWidth: .infinity)
+        .background {
+            RoundedRectangle(cornerRadius: 6)
+                .fill(Color(nsColor: .controlBackgroundColor))
         }
-        .padding(8)
-        .background(.ultraThickMaterial)
+        .overlay {
+            RoundedRectangle(cornerRadius: 6)
+                .stroke(Color(nsColor: .controlColor), lineWidth: 1)
+        }
+        .background {
+            Button(action: {
+                typedMessage += "\n"
+            }) {
+                EmptyView()
+            }
+            .keyboardShortcut(KeyEquivalent.return, modifiers: [.shift])
+        }
+    }
+
+    func submitText() {
+        if typedMessage.isEmpty { return }
+        chat.send(typedMessage)
+        typedMessage = ""
     }
 }
 
@@ -386,6 +405,9 @@ struct RoundedCorners: Shape {
 struct GlobalChatSwitchToggleStyle: ToggleStyle {
     func makeBody(configuration: Configuration) -> some View {
         HStack(spacing: 4) {
+            Text(configuration.isOn ? "Shared Conversation" : "Local Conversation")
+                .foregroundStyle(.tertiary)
+            
             RoundedRectangle(cornerRadius: 10, style: .circular)
                 .foregroundColor(configuration.isOn ? Color.indigo : .gray.opacity(0.5))
                 .frame(width: 30, height: 20, alignment: .center)
@@ -411,9 +433,6 @@ struct GlobalChatSwitchToggleStyle: ToggleStyle {
                     RoundedRectangle(cornerRadius: 10, style: .circular)
                         .stroke(.black.opacity(0.2), lineWidth: 1)
                 }
-
-            Text(configuration.isOn ? "Global Chat" : "File Chat")
-                .foregroundStyle(.tertiary)
         }
     }
 }

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -152,7 +152,7 @@ struct WidgetContextMenu: View {
                 Button(action: {
                     useGlobalChat.toggle()
                 }) {
-                    Text("Use Global Chat")
+                    Text("Use Shared Conversation")
                     if useGlobalChat {
                         Image(systemName: "checkmark")
                     }