Merge branch 'feature/window-related-shortcuts' into develop

Author: intitni

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -23,6 +23,14 @@ struct ChatWindowView: View {
         Group {
             if let chat = viewModel.chat {
                 ChatPanel(chat: chat)
+                    .background {
+                        Button(action: {
+                            viewModel.isPanelDisplayed = false
+                        }) {
+                            EmptyView()
+                        }
+                        .keyboardShortcut("M", modifiers: [.command])
+                    }
             }
         }
         .opacity(viewModel.isPanelDisplayed ? 1 : 0)

Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift

@@ -33,15 +33,6 @@ struct ChatPanelToolbar: View {
 
     var body: some View {
         HStack {
-            Toggle(isOn: .init(get: {
-                useGlobalChat
-            }, set: { _ in
-                chat.switchContext()
-            })) { EmptyView() }
-                .toggleStyle(GlobalChatSwitchToggleStyle())
-
-            Spacer()
-
             Button(action: {
                 chat.close()
             }) {
@@ -50,17 +41,27 @@ struct ChatPanelToolbar: View {
                     .foregroundStyle(.secondary)
             }
             .buttonStyle(.plain)
+            .keyboardShortcut("w", modifiers: [.command])
+
+            Spacer()
+
+            Toggle(isOn: .init(get: {
+                useGlobalChat
+            }, set: { _ in
+                chat.switchContext()
+            })) { EmptyView() }
+                .toggleStyle(GlobalChatSwitchToggleStyle())
         }
-        .padding(.leading, 8)
-        .padding(.trailing, 4)
+        .padding(.leading, 4)
+        .padding(.trailing, 8)
         .padding(.vertical, 4)
         .background(.regularMaterial)
     }
 }
 
 struct ChatPanelMessages: View {
     @ObservedObject var chat: ChatProvider
-    
+
     var body: some View {
         List {
             Group {
@@ -287,12 +288,6 @@ struct ChatPanelInputArea: View {
                 .multilineTextAlignment(.leading)
                 .textFieldStyle(.plain)
                 .padding(8)
-                .onSubmit {
-                    if chat.isReceivingMessage { return }
-                    if typedMessage.isEmpty { return }
-                    chat.send(typedMessage)
-                    typedMessage = ""
-                }
 
                 Button(action: {
                     if typedMessage.isEmpty { return }
@@ -304,6 +299,7 @@ struct ChatPanelInputArea: View {
                 }
                 .buttonStyle(.plain)
                 .disabled(chat.isReceivingMessage)
+                .keyboardShortcut(KeyEquivalent.return, modifiers: [])
             }
             .frame(maxWidth: .infinity)
             .background {
@@ -314,6 +310,14 @@ struct ChatPanelInputArea: View {
                 RoundedRectangle(cornerRadius: 6)
                     .stroke(Color(nsColor: .controlColor), lineWidth: 1)
             }
+            .background {
+                Button(action: {
+                    typedMessage += "\n"
+                }) {
+                    EmptyView()
+                }
+                .keyboardShortcut(KeyEquivalent.return, modifiers: [.shift])
+            }
         }
         .onAppear {
             isInputAreaFocused = true
@@ -535,3 +539,4 @@ struct ChatPanel_Light_Preview: PreviewProvider {
         .colorScheme(.light)
     }
 }
+

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift

@@ -59,7 +59,9 @@ struct PromptToCodePanel: View {
                                     provider.cancel()
                                 }) {
                                     Text("Cancel")
-                                }.buttonStyle(CommandButtonStyle(color: .gray))
+                                }
+                                .buttonStyle(CommandButtonStyle(color: .gray))
+                                .keyboardShortcut("w", modifiers: [.command])
 
                                 if !provider.code.isEmpty {
                                     Button(action: {
@@ -149,7 +151,7 @@ struct PromptToCodePanelContent: View {
                     .frame(maxWidth: .infinity)
                     .scaleEffect(x: -1, y: -1, anchor: .center)
                 }
-                
+
                 if let name = provider.name {
                     Text(name)
                         .font(.footnote)
@@ -204,9 +206,6 @@ struct PromptToCodePanelToolbar: View {
                 .multilineTextAlignment(.leading)
                 .textFieldStyle(.plain)
                 .padding(8)
-                .onSubmit {
-                    provider.sendRequirement()
-                }
 
                 Button(action: {
                     provider.sendRequirement()
@@ -216,6 +215,7 @@ struct PromptToCodePanelToolbar: View {
                 }
                 .buttonStyle(.plain)
                 .disabled(provider.isResponding)
+                .keyboardShortcut(KeyEquivalent.return, modifiers: [])
             }
             .frame(maxWidth: .infinity)
             .background {
@@ -226,6 +226,14 @@ struct PromptToCodePanelToolbar: View {
                 RoundedRectangle(cornerRadius: 6)
                     .stroke(Color(nsColor: .controlColor), lineWidth: 1)
             }
+            .background {
+                Button(action: {
+                    provider.requirement += "\n"
+                }) {
+                    EmptyView()
+                }
+                .keyboardShortcut(KeyEquivalent.return, modifiers: [.shift])
+            }
         }
         .onAppear {
             isInputAreaFocused = true
@@ -277,3 +285,4 @@ struct PromptToCodePanel_Error_Bright_Preview: PreviewProvider {
         .frame(width: 450, height: 400)
     }
 }
+

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -25,8 +25,11 @@ struct WidgetView: View {
         Circle().fill(isHovering ? .white.opacity(0.8) : .white.opacity(0.3))
             .onTapGesture {
                 withAnimation(.easeInOut(duration: 0.2)) {
-                    let isDisplayed = panelViewModel.isPanelDisplayed
-                        || chatWindowViewModel.isPanelDisplayed
+                    let isDisplayed = {
+                        if panelViewModel.isPanelDisplayed && panelViewModel.content != nil { return true }
+                        if chatWindowViewModel.isPanelDisplayed && chatWindowViewModel.chat != nil { return true }
+                        return false
+                    }()
                     panelViewModel.isPanelDisplayed = !isDisplayed
                     chatWindowViewModel.isPanelDisplayed = !isDisplayed
                 }
@@ -75,6 +78,7 @@ struct WidgetView: View {
             }
             .onChange(of: viewModel.isProcessing) { _ in refreshRing() }
             .onChange(of: panelViewModel.content?.contentHash) { _ in refreshRing() }
+            .onChange(of: chatWindowViewModel.chat?.id) { _ in refreshRing() }
             .onHover { yes in
                 withAnimation(.easeInOut(duration: 0.2)) {
                     isHovering = yes

README.md

@@ -144,6 +144,14 @@ Whenever you stop typing for a few milliseconds, the app will automatically fetc
 - Real-time Suggestions: Call only by Copilot for Xcode. When suggestions are successfully fetched, Copilot for Xcode will run this command to present the suggestions.
 - Prefetch Suggestions: Call only by Copilot for Xcode. In the background, Copilot for Xcode will occasionally run this command to prefetch real-time suggestions.
 
+#### Keyboard Shortcuts
+
+| Shortcut | Description |
+|:---:|---|
+| `⌘W` | Cancel. |
+| `⌘↩︎` | Accept suggestion. |
+| `⇧↩︎` | Add new line. |
+
 ### Chat
 
 This feature is powered by ChatGPT. Please ensure that you have set up your OpenAI account before using it.
@@ -157,7 +165,13 @@ You can detach the chat panel by simply dragging it away. Once detached, the cha
 - Chat with Selection: Open a chat window, if there is a selection, the selected code will be added to the prompt.
 - Explain Selection: Open a chat window and explain the selected code.
 
-Chat commands are not available in comment mode.
+#### Keyboard Shortcuts
+
+| Shortcut | Description |
+|:---:|---|
+| `⌘W` | Close the chat. |
+| `⌘M` | Minimize the chat, you can bring it back with any chat commands or by clicking the circular widget. |
+| `⇧↩︎` | Add new line. |
 
 #### Chat Plugins