Merge tag '0.33.0' into develop

Author: intitni

Core/Tests/ServiceTests/FilespaceSuggestionInvalidationTests.swift

@@ -78,7 +78,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
             range: .init(startPair: (1, 0), endPair: (1, 0))
         )
         let isValid = await filespace.validateSuggestions(
-            lines: ["\n", "h🎆🎆o man\n", "\n"],
+            lines: ["\n", "h🎆🎆o ma\n", "\n"],
             cursorPosition: .init(line: 1, character: 2)
         )
         XCTAssertTrue(isValid)
@@ -95,7 +95,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
             range: .init(startPair: (1, 0), endPair: (1, 0))
         )
         let isValid = await filespace.validateSuggestions(
-            lines: ["\n", "h🎆🎆o man\n", "\n"],
+            lines: ["\n", "h🎆🎆o ma\n", "\n"],
             cursorPosition: .init(line: 1, character: 3)
         )
         XCTAssertTrue(isValid)
@@ -170,7 +170,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
             range: .init(startPair: (1, 0), endPair: (1, 0))
         )
         let wasValid = await filespace.validateSuggestions(
-            lines: ["\n", "hello man\n", "\n"],
+            lines: ["\n", "hello ma\n", "\n"],
             cursorPosition: .init(line: 1, character: 8)
         )
         let isValid = await filespace.validateSuggestions(
@@ -190,7 +190,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
             range: .init(startPair: (1, 0), endPair: (1, 0))
         )
         let wasValid = await filespace.validateSuggestions(
-            lines: ["\n", "hello m🎆🎆an\n", "\n"],
+            lines: ["\n", "hello m🎆🎆a\n", "\n"],
             cursorPosition: .init(line: 1, character: 12)
         )
         let isValid = await filespace.validateSuggestions(
@@ -211,7 +211,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
             range: .init(startPair: (1, 0), endPair: (1, 0))
         )
         let wasValid = await filespace.validateSuggestions(
-            lines: ["\n", "hello man!!!!!\n", "\n"],
+            lines: ["\n", "hello ma!!!!\n", "\n"],
             cursorPosition: .init(line: 1, character: 8)
         )
         let isValid = await filespace.validateSuggestions(

Core/Tests/ServiceUpdateMigrationTests/MigrateTo240Tests.swift

@@ -28,7 +28,7 @@ final class MigrateTo240Tests: XCTestCase {
                 XCTAssertEqual(chatModel.info, .init(
                     apiKeyName: "OpenAI",
                     baseURL: "",
-                    maxTokens: 4096,
+                    maxTokens: 16385,
                     supportsFunctionCalling: true,
                     modelName: "gpt-3.5-turbo"
                 ))

Pro

@@ -83,7 +83,7 @@ public extension Filespace {
             )
 
             let utf16View = editingLine.utf16
-            
+
             let startIndex = utf16View.index(
                 utf16View.startIndex,
                 offsetBy: max(0, presentingSuggestion.range.start.character),
@@ -102,11 +102,13 @@ public extension Filespace {
 
             return ""
         }()
-        
+
         /// if the line will not change after accepting the suggestion
-        if presentingSuggestion.range.isOneLine {
-            #warning("TODO: Also handle the case where the suggestion doesn't start at character 0")
-            if editingLine == suggestionFirstLine {
+        if suggestionLines.count == 1 {
+            if editingLine.hasPrefix(suggestionFirstLine),
+               cursorPosition.character
+               >= suggestionFirstLine.utf16.count + presentingSuggestion.range.start.character
+            {
                 reset()
                 resetSnapshot()
                 return false

Tool/Sources/WorkspaceSuggestionService/Filespace+SuggestionService.swift

@@ -77,7 +77,7 @@ final class FetchSuggestionTests: XCTestCase {
             usesTabsForIndentation: false
         )
         XCTAssertEqual(completions.count, 1)
-        XCTAssertEqual(completions.first?.text, "Hello World")
+        XCTAssertEqual(completions.first?.text, "Hello World\n")
     }
 }
 

Tool/Tests/GitHubCopilotServiceTests/FetchSuggestionsTests.swift

@@ -1,3 +1,3 @@
 APP_VERSION = 0.33.0
-APP_BUILD = 374
+APP_BUILD = 376
 

Version.xcconfig

@@ -3,6 +3,18 @@
   <channel>
     <title>Copilot for Xcode</title>
 
+    <item>
+      <title>0.33.0</title>
+      <pubDate>Wed, 15 May 2024 01:34:14 +0800</pubDate>
+      <sparkle:version>376</sparkle:version>
+      <sparkle:shortVersionString>0.33.0</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.33.0
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.33.0/Copilot.for.Xcode.app.zip" length="46218778" type="application/octet-stream" sparkle:edSignature="OiIxIyet6Qj9pDFVCDDRE64bpcGvVOk9GvqhAFN+zIiBAP7XlKkpOBWhJ2YDFKty5w2SfjVIlD19qpil1GkMBw=="/>
+    </item>
+
     <item>
       <title>0.33.0</title>
       <pubDate>Tue, 14 May 2024 01:18:40 +0800</pubDate>
@@ -15,7 +27,7 @@
       </sparkle:releaseNotesLink>
       <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.33.0.beta/Copilot.for.Xcode.0.33.0.beta.3.zip" length="46141881" type="application/octet-stream" sparkle:edSignature="ID6Ovucmhoft/40Mmh9m5yY9vu/16XTv+K164SHiYywBNnDqWoCoTHMDZE8oxUvObFcXmxt13jczlJlCr/ciDg=="/>
     </item>
-    
+
     <item>
       <title>0.33.0</title>
       <pubDate>Fri, 10 May 2024 14:54:26 +0800</pubDate>