Merge branch 'feature/chat-instruction-on-scopes-and-plugins' into develop

Author: intitni

Core/Sources/ChatService/ChatPluginController.swift

@@ -12,7 +12,7 @@ final class ChatPluginController {
         self.chatGPTService = chatGPTService
         var all = [String: ChatPlugin.Type]()
         for plugin in plugins {
-            all[plugin.command] = plugin
+            all[plugin.command.lowercased()] = plugin
         }
         self.plugins = all
     }
@@ -29,7 +29,7 @@ final class ChatPluginController {
         let regex = try NSRegularExpression(pattern: #"^\/([a-zA-Z0-9]+)"#)
         let matches = regex.matches(in: content, range: NSRange(content.startIndex..., in: content))
         if let match = matches.first {
-            let command = String(content[Range(match.range(at: 1), in: content)!])
+            let command = String(content[Range(match.range(at: 1), in: content)!]).lowercased()
             // handle exit plugin
             if command == "exit" {
                 if let plugin = runningPlugin {

Core/Sources/SuggestionWidget/CustomTextEditor.swift

@@ -8,19 +8,25 @@ struct CustomTextEditor: NSViewRepresentable {
     @Binding var text: String
     let font: NSFont
     let onSubmit: () -> Void
+    var completions: (_ text: String, _ words: [String], _ range: NSRange)
+        -> [String] = { _, _, _ in
+            []
+        }
 
     func makeNSView(context: Context) -> NSScrollView {
+        context.coordinator.completions = completions
         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) {
+        context.coordinator.completions = completions
         let textView = (context.coordinator.theTextView.documentView as! NSTextView)
         guard textView.string != text else { return }
         textView.string = text
@@ -32,6 +38,7 @@ extension CustomTextEditor {
         var view: CustomTextEditor
         var theTextView = NSTextView.scrollableTextView()
         var affectedCharRange: NSRange?
+        var completions: (String, [String], _ range: NSRange) -> [String] = { _, _, _ in [] }
 
         init(_ view: CustomTextEditor) {
             self.view = view
@@ -43,13 +50,14 @@ extension CustomTextEditor {
             }
 
             view.text = textView.string
+            textView.complete(nil)
         }
 
         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
+                   event.keyCode == 36 // enter
                 {
                     view.onSubmit()
                     return true
@@ -66,6 +74,16 @@ extension CustomTextEditor {
         ) -> Bool {
             return true
         }
+
+        func textView(
+            _ textView: NSTextView,
+            completions words: [String],
+            forPartialWordRange charRange: NSRange,
+            indexOfSelectedItem index: UnsafeMutablePointer<Int>?
+        ) -> [String] {
+            index?.pointee = -1
+            return completions(textView.textStorage?.string ?? "", words, charRange)
+        }
     }
 }
 

Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift

@@ -88,7 +88,7 @@ struct ChatPanelMessages: View {
                     }
                 }
                 .listItemTint(.clear)
-                
+
                 Instruction()
 
                 Spacer()
@@ -147,6 +147,8 @@ private struct Instruction: View {
                     - The text cursor location.
 
                     If you'd like me to examine the entire file, simply add `@file` to the beginning of your message.
+                    
+                    To use plugins, you can start a message with `/pluginName`.
                     """
                 )
             } else {
@@ -160,6 +162,8 @@ private struct Instruction: View {
                     - The text cursor location.
 
                     If you would like me to examine the selected code, please prefix your message with `@selection`. If you would like me to examine the entire file, please prefix your message with `@file`.
+                    
+                    To use plugins, you can start a message with `/pluginName`.
                     """
                 )
             }
@@ -350,7 +354,28 @@ struct ChatPanelInputArea: View {
                 CustomTextEditor(
                     text: $typedMessage,
                     font: .systemFont(ofSize: 14),
-                    onSubmit: { submitText() }
+                    onSubmit: { submitText() },
+                    completions: { text, _, range in
+                        if text.isEmpty { return [] }
+                        let availableFeatures = [
+                            "/run",
+                            "/airun",
+                            "/math",
+                            "/search",
+                            "@selection",
+                            "@file",
+                        ]
+                        return availableFeatures
+                            .filter { $0.hasPrefix(text) && $0 != text }
+                            .compactMap {
+                                guard let index = $0.index(
+                                    $0.startIndex,
+                                    offsetBy: range.location,
+                                    limitedBy: $0.endIndex
+                                ) else { return nil }
+                                return String($0[index...])
+                            }
+                    }
                 )
                 .padding(.top, 1)
                 .padding(.bottom, -1)