Add command Prompt to Code

Author: intitni

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -32,6 +32,7 @@
 		C841BB242994CAD400B0B336 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C841BB232994CAD400B0B336 /* SettingsView.swift */; };
 		C8520301293C4D9000460097 /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8520300293C4D9000460097 /* Helpers.swift */; };
 		C85AF32D29CF0C170031E18B /* DebugView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C85AF32C29CF0C170031E18B /* DebugView.swift */; };
+		C861A6A329E5503F005C41A3 /* PromptToCodeCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C861A6A229E5503F005C41A3 /* PromptToCodeCommand.swift */; };
 		C861E6112994F6070056CB02 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C861E6102994F6070056CB02 /* AppDelegate.swift */; };
 		C861E6152994F6080056CB02 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C861E6142994F6080056CB02 /* Assets.xcassets */; };
 		C861E61E2994F6150056CB02 /* Service in Frameworks */ = {isa = PBXBuildFile; productRef = C861E61D2994F6150056CB02 /* Service */; };
@@ -180,6 +181,7 @@
 		C8520300293C4D9000460097 /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = "<group>"; };
 		C8520308293D805800460097 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		C85AF32C29CF0C170031E18B /* DebugView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugView.swift; sourceTree = "<group>"; };
+		C861A6A229E5503F005C41A3 /* PromptToCodeCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromptToCodeCommand.swift; sourceTree = "<group>"; };
 		C861E60E2994F6070056CB02 /* CopilotForXcodeExtensionService.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CopilotForXcodeExtensionService.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C861E6102994F6070056CB02 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		C861E6142994F6080056CB02 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -262,6 +264,7 @@
 				C800DBB0294C624D00B04CAC /* PrefetchSuggestionsCommand.swift */,
 				C8EE07A029CC9ED30043B6D9 /* ExplainSelectionCommand.swift */,
 				C8DCEFFF29CE11D500FDDDD7 /* ChatWithSelection.swift */,
+				C861A6A229E5503F005C41A3 /* PromptToCodeCommand.swift */,
 				C81458972939EFDC00135263 /* Info.plist */,
 				C81458982939EFDC00135263 /* EditorExtension.entitlements */,
 			);
@@ -527,6 +530,7 @@
 			files = (
 				C8DCF00029CE11D500FDDDD7 /* ChatWithSelection.swift in Sources */,
 				C81458942939EFDC00135263 /* SourceEditorExtension.swift in Sources */,
+				C861A6A329E5503F005C41A3 /* PromptToCodeCommand.swift in Sources */,
 				C8520301293C4D9000460097 /* Helpers.swift in Sources */,
 				C8009BFF2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift in Sources */,
 				C87B03A5293B261200C77EAE /* AcceptSuggestionCommand.swift in Sources */,

Core/Sources/Client/AsyncXPCService.swift

@@ -186,6 +186,14 @@ public struct AsyncXPCService {
             { $0.chatWithSelection }
         )
     }
+    
+    public func promptToCode(editorContent: EditorContent) async throws -> UpdatedContent? {
+        try await suggestionRequest(
+            connection,
+            editorContent,
+            { $0.promptToCode }
+        )
+    }
 }
 
 struct AutoFinishContinuation<T> {

Core/Sources/Service/SuggestionCommandHandler/CommentBaseCommandHandler.swift

@@ -179,6 +179,10 @@ struct CommentBaseCommandHandler: SuggestionCommandHandler {
     func chatWithSelection(editor: EditorContent) async throws -> UpdatedContent? {
         throw NotSupportedInCommentMode()
     }
+    
+    func promptToCode(editor: XPCShared.EditorContent) async throws -> XPCShared.UpdatedContent? {
+        throw NotSupportedInCommentMode()
+    }
 }
 
 // MARK: - Unsupported

Core/Sources/Service/SuggestionCommandHandler/SuggestionCommandHandler.swift

@@ -20,4 +20,6 @@ protocol SuggestionCommandHandler {
     func explainSelection(editor: EditorContent) async throws -> UpdatedContent?
     @ServiceActor
     func chatWithSelection(editor: EditorContent) async throws -> UpdatedContent?
+    @ServiceActor
+    func promptToCode(editor: EditorContent) async throws -> UpdatedContent?
 }

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -275,4 +275,43 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
 
         presenter.presentChatRoom(fileURL: fileURL)
     }
+
+    func promptToCode(editor: EditorContent) async throws -> UpdatedContent? {
+        Task {
+            do {
+                try await _promptToCode(editor: editor)
+            } catch {
+                presenter.presentError(error)
+            }
+        }
+        return nil
+    }
+
+    func _promptToCode(editor: EditorContent) async throws {
+        presenter.markAsProcessing(true)
+        defer { presenter.markAsProcessing(false) }
+        let fileURL = try await Environment.fetchCurrentFileURL()
+        let language = UserDefaults.shared.value(for: \.chatGPTLanguage)
+        let codeLanguage = languageIdentifierFromFileURL(fileURL)
+        let code = {
+            guard let selection = editor.selections.last,
+                  selection.start != selection.end else { return "" }
+            return editor.selectedCode(in: selection)
+        }()
+
+        _ = await WidgetDataSource.shared.createPromptToCode(
+            for: fileURL,
+            code: code,
+            selectionRange: editor.selections.last.map { .init(
+                start: $0.start,
+                end: $0.end
+            ) } ?? .init(
+                start: editor.cursorPosition,
+                end: editor.cursorPosition
+            ),
+            language: codeLanguage
+        )
+
+        presenter.presentPromptToCode(fileURL: fileURL)
+    }
 }

Core/Sources/Service/XPCService.swift

@@ -232,6 +232,15 @@ public class XPCService: NSObject, XPCServiceProtocol {
             try await handler.chatWithSelection(editor: editor)
         }
     }
+    
+    public func promptToCode(
+        editorContent: Data,
+        withReply reply: @escaping (Data?, Error?) -> Void
+    ) {
+        replyWithUpdatedContent(editorContent: editorContent, withReply: reply) { handler, editor in
+            try await handler.promptToCode(editor: editor)
+        }
+    }
 
     // MARK: - Settings
 

Core/Sources/XPCShared/XPCServiceProtocol.swift

@@ -44,6 +44,10 @@ public protocol XPCServiceProtocol {
         editorContent: Data,
         withReply reply: @escaping (Data?, Error?) -> Void
     )
+    func promptToCode(
+        editorContent: Data,
+        withReply reply: @escaping (Data?, Error?) -> Void
+    )
 
     func toggleRealtimeSuggestion(withReply reply: @escaping (Error?) -> Void)
 

EditorExtension/PromptToCodeCommand.swift

@@ -0,0 +1,29 @@
+import Client
+import CopilotModel
+import Foundation
+import XcodeKit
+
+class PromptToCodeCommand: NSObject, XCSourceEditorCommand, CommandType {
+    var name: String { "Prompt to Code" }
+
+    func perform(
+        with invocation: XCSourceEditorCommandInvocation,
+        completionHandler: @escaping (Error?) -> Void
+    ) {
+        Task {
+            do {
+                let service = try getService()
+                if let content = try await service.promptToCode(
+                    editorContent: .init(invocation)
+                ) {
+                    invocation.accept(content)
+                }
+                completionHandler(nil)
+            } catch is CancellationError {
+                completionHandler(nil)
+            } catch {
+                completionHandler(error)
+            }
+        }
+    }
+}

EditorExtension/SourceEditorExtension.swift

@@ -15,6 +15,7 @@ class SourceEditorExtension: NSObject, XCSourceEditorExtension {
             PrefetchSuggestionsCommand(),
             ChatWithSelectionCommand(),
             ExplainSelectionCommand(),
+            PromptToCodeCommand(),
         ].map(makeCommandDefinition)
     }