Pre-release 0.40.133

Author: actions-user

Copilot for Xcode.xcodeproj/xcshareddata/xcschemes/ExtensionService.xcscheme

@@ -50,6 +50,18 @@
             reference = "container:Pro/ProTestPlan.xctestplan">
          </TestPlanReference>
       </TestPlans>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "GitHelperTests"
+               BuildableName = "GitHelperTests"
+               BlueprintName = "GitHelperTests"
+               ReferencedContainer = "container:Tool">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

Core/Package.swift

@@ -182,7 +182,9 @@ let package = Package(
                     .product(name: "Terminal", package: "Tool"),
                     .product(name: "SystemUtils", package: "Tool"),
                     .product(name: "AppKitExtension", package: "Tool"),
-                    .product(name: "WebContentExtractor", package: "Tool")
+                    .product(name: "WebContentExtractor", package: "Tool"),
+                    .product(name: "GitHelper", package: "Tool"),
+                    .product(name: "SuggestionBasic", package: "Tool")
                 ]),
             .testTarget(
                 name: "ChatServiceTests",

Core/Sources/ChatService/ChatInjector.swift

@@ -4,7 +4,7 @@ import XcodeInspector
 import AXHelper
 import ApplicationServices
 import AppActivator
-
+import LanguageServerProtocol
 
 public struct ChatInjector {
     public init() {}
@@ -22,76 +22,126 @@ public struct ChatInjector {
             var lines = editorContent.content.splitByNewLine(
                 omittingEmptySubsequences: false
             ).map { String($0) }
-            // Ensure the line number is within the bounds of the file
+            
             guard cursorPosition.line <= lines.count else { return }
 
             var modifications: [Modification] = []
 
-            // remove selection
-            // make sure there is selection exist and valid
+            // Handle selection deletion
             if let selection = editorContent.selections.first,
-                selection.isValid,
-                selection.start.line < lines.endIndex {
+               selection.isValid,
+               selection.start.line < lines.endIndex {
                 let selectionEndLine = min(selection.end.line, lines.count - 1)
                 let deletedSelection = CursorRange(
                     start: selection.start,
                     end: .init(line: selectionEndLine, character: selection.end.character)
                 )
                 modifications.append(.deletedSelection(deletedSelection))
                 lines = lines.applying([.deletedSelection(deletedSelection)])
-                
-                // update cursorPosition to the start of selection
                 cursorPosition = selection.start
             }
 
-            let targetLine = lines[cursorPosition.line]
+            let insertionRange = CursorRange(
+                start: cursorPosition,
+                end: cursorPosition
+            )
 
-            // Determine the indention level of the target line
-            let leadingWhitespace = cursorPosition.character > 0 ? targetLine.prefix { $0.isWhitespace } : ""
-            let indentation = String(leadingWhitespace)
+            try Self.performInsertion(
+                content: codeBlock,
+                range: insertionRange,
+                lines: &lines,
+                modifications: &modifications,
+                focusElement: focusElement
+            )
 
-            // Insert codeblock at the specified position
-            let index = targetLine.index(targetLine.startIndex, offsetBy: min(cursorPosition.character, targetLine.count))
-            let before = targetLine[..<index]
-            let after = targetLine[index...]
+        } catch {
+            print("Failed to insert code block: \(error)")
+        }
+    }
+    
+    public static func insertSuggestion(suggestion: String, range: CursorRange, lines: [String]) {
+        do {
+            guard let focusElement = XcodeInspector.shared.focusedElement,
+                  focusElement.description == "Source Editor"
+            else { return }
 
-            let codeBlockLines = codeBlock.splitByNewLine(
-                omittingEmptySubsequences: false
-            ).enumerated().map { (index, element) -> String in
-                return index == 0 ? String(element) : indentation + String(element)
-            }
-            
-            var toBeInsertedLines = [String]()
-            toBeInsertedLines.append(String(before) + codeBlockLines.first!)
-            toBeInsertedLines.append(contentsOf: codeBlockLines.dropFirst().dropLast())
-            toBeInsertedLines.append(codeBlockLines.last! + String(after))
+            guard range.start.line >= 0,
+                  range.start.line < lines.count,
+                  range.end.line >= 0,
+                  range.end.line < lines.count
+            else { return }
 
-            lines.replaceSubrange((cursorPosition.line)...(cursorPosition.line), with: toBeInsertedLines)
+            var lines = lines
+            var modifications: [Modification] = []
 
-            // Join the lines
-            let newContent = String(lines.joined(separator: "\n"))
+            if range.isValid {
+                modifications.append(.deletedSelection(range))
+                lines = lines.applying([.deletedSelection(range)])
+            }
 
-            // Inject updated content
-            let newCursorPosition = CursorPosition(
-                line: cursorPosition.line + codeBlockLines.count - 1,
-                character: codeBlockLines.last?.count ?? 0
-            )
-            modifications.append(.inserted(cursorPosition.line, toBeInsertedLines))
-            try AXHelper().injectUpdatedCodeWithAccessibilityAPI(
-                .init(
-                    content: newContent,
-                    newSelection: .cursor(newCursorPosition),
-                    modifications: modifications
-                ),
-                focusElement: focusElement,
-                onSuccess: {
-                    NSWorkspace.activatePreviousActiveXcode()
-                }
-                
+            try performInsertion(
+                content: suggestion,
+                range: range,
+                lines: &lines,
+                modifications: &modifications,
+                focusElement: focusElement
             )
 
         } catch {
-            print("Failed to insert code block: \(error)")
+            print("Failed to insert suggestion: \(error)")
+        }
+    }
+    
+    private static func performInsertion(
+        content: String,
+        range: CursorRange,
+        lines: inout [String],
+        modifications: inout [Modification],
+        focusElement: AXUIElement
+    ) throws {
+        let targetLine = lines[range.start.line]
+        let leadingWhitespace = range.start.character > 0 ? targetLine.prefix { $0.isWhitespace } : ""
+        let indentation = String(leadingWhitespace)
+        
+        let index = targetLine.index(targetLine.startIndex, offsetBy: min(range.start.character, targetLine.count))
+        let before = targetLine[..<index]
+        let after = targetLine[index...]
+        
+        let contentLines = content.splitByNewLine(
+            omittingEmptySubsequences: false
+        ).enumerated().map { (index, element) -> String in
+            return index == 0 ? String(element) : indentation + String(element)
+        }
+        
+        var toBeInsertedLines = [String]()
+        if contentLines.count > 1 {
+            toBeInsertedLines.append(String(before) + contentLines.first!)
+            toBeInsertedLines.append(contentsOf: contentLines.dropFirst().dropLast())
+            toBeInsertedLines.append(contentLines.last! + String(after))
+        } else {
+            toBeInsertedLines.append(String(before) + contentLines.first! + String(after))
         }
+        
+        lines.replaceSubrange((range.start.line)...(range.start.line), with: toBeInsertedLines)
+        
+        let newContent = String(lines.joined(separator: "\n"))
+        let newCursorPosition = CursorPosition(
+            line: range.start.line + contentLines.count - 1,
+            character: contentLines.last?.count ?? 0
+        )
+        
+        modifications.append(.inserted(range.start.line, toBeInsertedLines))
+        
+        try AXHelper().injectUpdatedCodeWithAccessibilityAPI(
+            .init(
+                content: newContent,
+                newSelection: .cursor(newCursorPosition),
+                modifications: modifications
+            ),
+            focusElement: focusElement,
+            onSuccess: {
+                NSWorkspace.activatePreviousActiveXcode()
+            }
+        )
     }
 }