Update prompt to code to generate according to the extra system prompt

Author: intitni

Core/Sources/PromptToCodeService/CopilotPromptToCodeAPI.swift

@@ -18,7 +18,8 @@ final class CopilotPromptToCodeAPI: PromptToCodeAPI {
         requirement: String,
         projectRootURL: URL,
         fileURL: URL,
-        allCode: String
+        allCode: String,
+        extraSystemPrompt: String?
     ) async throws -> AsyncThrowingStream<(code: String, description: String), Error> {
         let copilotService = CopilotSuggestionService(projectRootURL: projectRootURL)
         let relativePath = {
@@ -36,14 +37,25 @@ final class CopilotPromptToCodeAPI: PromptToCodeAPI {
             return filePath
         }()
 
-        let comment = """
-        // update the following code, \(requirement.split(separator: "\n").joined(separator: " ")).
-        \(code.split(separator: "\n").map { "//\($0)" }.joined(separator: "\n"))
+        func convertToComment(_ s: String) -> String {
+            s.split(separator: "\n").map { "// \($0)" }.joined(separator: "\n")
+        }
 
+        let comment = """
+        // A file to refactor the following code
+        //
+        // Code:
+        // ```
+        \(convertToComment(code))
+        // ```
+        //
+        // Requirements:
+        \(convertToComment((extraSystemPrompt ?? "\n") + requirement))
+        //
         
         
-        // Path: \(relativePath)
         
+        // end of file
         """
         let lineCount = comment.breakLines().count
 
@@ -53,7 +65,7 @@ final class CopilotPromptToCodeAPI: PromptToCodeAPI {
                     let result = try await copilotService.getCompletions(
                         fileURL: fileURL,
                         content: comment,
-                        cursorPosition: .init(line: lineCount - 4, character: 0),
+                        cursorPosition: .init(line: lineCount - 3, character: 0),
                         tabSize: indentSize,
                         indentSize: indentSize,
                         usesTabsForIndentation: usesTabsForIndentation,

Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift

@@ -20,7 +20,8 @@ final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
         requirement: String,
         projectRootURL: URL,
         fileURL: URL,
-        allCode: String
+        allCode: String,
+        extraSystemPrompt: String?
     ) async throws -> AsyncThrowingStream<(code: String, description: String), Error> {
         let userPreferredLanguage = UserDefaults.shared.value(for: \.chatGPTLanguage)
         let textLanguage = userPreferredLanguage.isEmpty ? "" : "in \(userPreferredLanguage)"
@@ -38,25 +39,33 @@ final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
                 Please reply to me start with the code block, followed by a clear and concise description in 1-3 sentences about what you did \(
                     textLanguage
                 ).
+                
+                \(extraSystemPrompt ?? "")
                 """
             } else {
                 return """
+                # Description
+                
                 You are a senior programer in writing code in \(language.rawValue).
 
                 Please mutate the following code fragment with my requirements. Keep the original indentation. Do not add comments unless told to.
 
                 Please reply to me start with the code block followed by a clear and concise description about what you did in 1-3 sentences \(
                     textLanguage
                 ).
+                
+                \(extraSystemPrompt ?? "")
 
+                # Code
+                
                 ```
                 \(code)
                 ```
                 """
             }
         }()
 
-        let chatGPTService = ChatGPTService(systemPrompt: prompt, temperature: 0.5)
+        let chatGPTService = ChatGPTService(systemPrompt: prompt, temperature: 0.3)
         service = chatGPTService
         let stream = try await chatGPTService.send(content: requirement)
         return .init { continuation in

Core/Sources/PromptToCodeService/PromptToCodeService.swift

@@ -53,6 +53,7 @@ public final class PromptToCodeService: ObservableObject {
     public var projectRootURL: URL
     public var fileURL: URL
     public var allCode: String
+    public var extraSystemPrompt: String?
 
     public init(
         code: String,
@@ -62,7 +63,8 @@ public final class PromptToCodeService: ObservableObject {
         usesTabsForIndentation: Bool,
         projectRootURL: URL,
         fileURL: URL,
-        allCode: String
+        allCode: String,
+        extraSystemPrompt: String? = nil
     ) {
         self.code = code
         self.selectionRange = selectionRange
@@ -73,6 +75,7 @@ public final class PromptToCodeService: ObservableObject {
         self.fileURL = fileURL
         self.allCode = allCode
         self.history = .empty
+        self.extraSystemPrompt = extraSystemPrompt
     }
 
     public func modifyCode(prompt: String) async throws {
@@ -93,7 +96,8 @@ public final class PromptToCodeService: ObservableObject {
                 requirement: prompt,
                 projectRootURL: projectRootURL,
                 fileURL: fileURL,
-                allCode: allCode
+                allCode: allCode,
+                extraSystemPrompt: extraSystemPrompt
             )
             for try await fragment in stream {
                 code = fragment.code
@@ -145,7 +149,8 @@ protocol PromptToCodeAPI {
         requirement: String,
         projectRootURL: URL,
         fileURL: URL,
-        allCode: String
+        allCode: String,
+        extraSystemPrompt: String?
     ) async throws -> AsyncThrowingStream<(code: String, description: String), Error>
 
     func stopResponding()

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -91,7 +91,9 @@ final class WidgetDataSource {
         selectionRange: CursorRange,
         language: CopilotLanguage,
         identSize: Int = 4,
-        usesTabsForIndentation: Bool = false
+        usesTabsForIndentation: Bool = false,
+        extraSystemPrompt: String?,
+        name: String?
     ) async -> PromptToCodeService {
         let build = {
             let service = PromptToCodeService(
@@ -102,7 +104,8 @@ final class WidgetDataSource {
                 usesTabsForIndentation: usesTabsForIndentation,
                 projectRootURL: projectURL,
                 fileURL: url,
-                allCode: allCode
+                allCode: allCode,
+                extraSystemPrompt: extraSystemPrompt
             )
             let provider = PromptToCodeProvider(
                 service: service,

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -248,7 +248,12 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
     func promptToCode(editor: EditorContent) async throws -> UpdatedContent? {
         Task {
             do {
-                try await presentPromptToCode(editor: editor, prompt: nil, isContinuous: false)
+                try await presentPromptToCode(
+                    editor: editor,
+                    extraSystemPrompt: nil,
+                    prompt: nil,
+                    isContinuous: false
+                )
             } catch {
                 presenter.presentError(error)
             }
@@ -293,9 +298,10 @@ extension WindowBaseCommandHandler {
                 extraSystemPrompt: nil,
                 sendingMessageImmediately: prompt
             )
-        case let .promptToCode(_, prompt, continuousMode):
+        case let .promptToCode(extraSystemPrompt, prompt, continuousMode):
             try await presentPromptToCode(
                 editor: editor,
+                extraSystemPrompt: extraSystemPrompt,
                 prompt: prompt,
                 isContinuous: continuousMode ?? false
             )
@@ -304,6 +310,7 @@ extension WindowBaseCommandHandler {
 
     func presentPromptToCode(
         editor: EditorContent,
+        extraSystemPrompt: String?,
         prompt: String?,
         isContinuous: Bool
     ) async throws {
@@ -323,7 +330,7 @@ extension WindowBaseCommandHandler {
             guard var selection = editor.selections.last,
                   selection.start != selection.end
             else { return ("", .cursor(editor.cursorPosition)) }
-            
+
             let isMultipleLine = selection.start.line != selection.end.line
             let isSpaceOnlyBeforeStartPositionOnTheSameLine = {
                 guard selection.start.line >= 0, selection.start.line < editor.lines.count else {
@@ -333,10 +340,12 @@ extension WindowBaseCommandHandler {
                 guard selection.start.character > 0, selection.start.character < line.count else {
                     return false
                 }
-                let substring = line[line.startIndex..<line.index(line.startIndex, offsetBy: selection.start.character)]
-                return substring.allSatisfy({ $0.isWhitespace })
+                let substring =
+                    line[line.startIndex..<line
+                        .index(line.startIndex, offsetBy: selection.start.character)]
+                return substring.allSatisfy { $0.isWhitespace }
             }()
-            
+
             if isMultipleLine || isSpaceOnlyBeforeStartPositionOnTheSameLine {
                 // when there are multiple lines start from char 0 so that it can keep the
                 // indentation.
@@ -357,11 +366,13 @@ extension WindowBaseCommandHandler {
             selectedCode: code,
             allCode: editor.content,
             selectionRange: selection,
-            language: codeLanguage
+            language: codeLanguage,
+            extraSystemPrompt: extraSystemPrompt,
+            name: nil
         )
 
         promptToCode.isContinuous = isContinuous
-        if let prompt {
+        if let prompt, !prompt.isEmpty {
             Task { try await promptToCode.modifyCode(prompt: prompt) }
         }
 
@@ -402,7 +413,7 @@ extension WindowBaseCommandHandler {
             ```
             """
         }()
-        
+
         if let extraSystemPrompt {
             systemPrompt += "\n\(extraSystemPrompt)"
         }