Add tests for extract selected code and remove spaces

Author: intitni

Core/Sources/XPCShared/Models.swift

@@ -42,39 +42,7 @@ public struct EditorContent: Codable {
     public var usesTabsForIndentation: Bool
 
     public func selectedCode(in selection: Selection) -> String {
-        let startPosition = selection.start
-        let endPosition = selection.end
-
-        guard startPosition.line >= 0, startPosition.line < lines.count else { return "" }
-        guard endPosition.line >= 0, endPosition.line < lines.count else { return "" }
-        guard endPosition.line >= startPosition.line else { return "" }
-
-        var code = ""
-        if startPosition.line == endPosition.line {
-            let line = lines[startPosition.line]
-            let startIndex = line.index(line.startIndex, offsetBy: startPosition.character)
-            let endIndex = line.index(line.startIndex, offsetBy: endPosition.character)
-            code = String(line[startIndex...endIndex])
-        } else {
-            let startLine = lines[startPosition.line]
-            let startIndex = startLine.index(
-                startLine.startIndex,
-                offsetBy: startPosition.character
-            )
-            code += String(startLine[startIndex...])
-
-            if startPosition.line + 1 < endPosition.line {
-                for line in lines[startPosition.line + 1...endPosition.line - 1] {
-                    code += line
-                }
-            }
-
-            let endLine = lines[endPosition.line]
-            let endIndex = endLine.index(endLine.startIndex, offsetBy: endPosition.character)
-            code += String(endLine[...endIndex])
-        }
-        
-        return code
+        return XPCShared.selectedCode(in: selection, for: lines)
     }
 }
 
@@ -89,3 +57,47 @@ public struct UpdatedContent: Codable {
     public var newCursor: CursorPosition?
     public var modifications: [Modification]
 }
+
+func selectedCode(in selection: EditorContent.Selection, for lines: [String]) -> String {
+    let startPosition = selection.start
+    var endPosition = CursorPosition(
+        line: selection.end.line,
+        character: selection.end.character - 1
+    )
+
+    guard startPosition.line >= 0, startPosition.line < lines.count else { return "" }
+    guard startPosition.character >= 0,
+          startPosition.character < lines[startPosition.line].count else { return "" }
+    guard endPosition.line >= 0, endPosition.line < lines.count else { return "" }
+    guard endPosition.line >= startPosition.line else { return "" }
+    guard endPosition.character >= 0,
+          endPosition.character < lines[endPosition.line].count else { return "" }
+
+    var code = ""
+    if startPosition.line == endPosition.line {
+        guard endPosition.character >= startPosition.character else { return "" }
+        let line = lines[startPosition.line]
+        let startIndex = line.index(line.startIndex, offsetBy: startPosition.character)
+        let endIndex = line.index(line.startIndex, offsetBy: endPosition.character)
+        code = String(line[startIndex...endIndex])
+    } else {
+        let startLine = lines[startPosition.line]
+        let startIndex = startLine.index(
+            startLine.startIndex,
+            offsetBy: startPosition.character
+        )
+        code += String(startLine[startIndex...])
+
+        if startPosition.line + 1 < endPosition.line {
+            for line in lines[startPosition.line + 1...endPosition.line - 1] {
+                code += line
+            }
+        }
+
+        let endLine = lines[endPosition.line]
+        let endIndex = endLine.index(endLine.startIndex, offsetBy: endPosition.character)
+        code += String(endLine[...endIndex])
+    }
+
+    return code
+}

Core/Tests/ServiceTests/ExtractSelectedCodeTests.swift

@@ -0,0 +1,56 @@
+import CopilotModel
+import XCTest
+@testable import Service
+@testable import XPCShared
+
+class ExtractSelectedCodeTests: XCTestCase {
+    func test_empty_selection() {
+        let selection = EditorContent.Selection(
+            start: CursorPosition(line: 0, character: 0),
+            end: CursorPosition(line: 0, character: 0)
+        )
+        let lines = ["let foo = 1\n", "let bar = 2\n"]
+        let result = selectedCode(in: selection, for: lines)
+        XCTAssertEqual(result, "")
+    }
+
+    func test_single_line_selection() {
+        let selection = EditorContent.Selection(
+            start: CursorPosition(line: 0, character: 4),
+            end: CursorPosition(line: 0, character: 10)
+        )
+        let lines = ["let foo = 1\n", "let bar = 2\n"]
+        let result = selectedCode(in: selection, for: lines)
+        XCTAssertEqual(result, "foo = ")
+    }
+
+    func test_single_line_selection_at_line_end() {
+        let selection = EditorContent.Selection(
+            start: CursorPosition(line: 0, character: 8),
+            end: CursorPosition(line: 0, character: 11)
+        )
+        let lines = ["let foo = 1\n", "let bar = 2\n"]
+        let result = selectedCode(in: selection, for: lines)
+        XCTAssertEqual(result, "= 1")
+    }
+
+    func test_multi_line_selection() {
+        let selection = EditorContent.Selection(
+            start: CursorPosition(line: 0, character: 4),
+            end: CursorPosition(line: 1, character: 11)
+        )
+        let lines = ["let foo = 1\n", "let bar = 2\n", "let baz = 3\n"]
+        let result = selectedCode(in: selection, for: lines)
+        XCTAssertEqual(result, "foo = 1\nlet bar = 2")
+    }
+
+    func test_invalid_selection() {
+        let selection = EditorContent.Selection(
+            start: CursorPosition(line: 1, character: 4),
+            end: CursorPosition(line: 0, character: 10)
+        )
+        let lines = ["let foo = 1", "let bar = 2"]
+        let result = selectedCode(in: selection, for: lines)
+        XCTAssertEqual(result, "")
+    }
+}

Core/Tests/ServiceTests/RemoveContinuousSpacesInCodeTests.swift

@@ -0,0 +1,33 @@
+import XCTest
+@testable import Service
+
+class RemoveContinuousSpacesInCodeTests: XCTestCase {
+    func test_remove_continuous_spaces_in_code_empty_string() {
+        let input = ""
+        let expectedOutput = ""
+        let output = removeContinuousSpaces(from: input)
+        XCTAssertEqual(output, expectedOutput)
+    }
+    
+    func test_remove_continuous_spaces_in_code_blank_string() {
+        let input = "   "
+        let expectedOutput = ""
+        let output = removeContinuousSpaces(from: input)
+        XCTAssertEqual(output, expectedOutput)
+    }
+    
+    func test_remove_continuous_spaces() {
+        let input = "hello    world"
+        let expectedOutput = "hello world"
+        let output = removeContinuousSpaces(from: input)
+        XCTAssertEqual(output, expectedOutput)
+    }
+    
+    func test_remove_continuous_spaces_without_continuous_spaces() {
+        let input = "hello world"
+        let expectedOutput = "hello world"
+        let output = removeContinuousSpaces(from: input)
+        XCTAssertEqual(output, expectedOutput)
+    }
+}
+