fixed #3 Copy from clipboard does nothing

dafi · dafi · commit 3cd052d5bd15 · 2025-11-22T10:10:25.000+01:00
diff --git a/Sources/Features/FilesCompare/DiffResult/DiffResult.swift b/Sources/Features/FilesCompare/DiffResult/DiffResult.swift
@@ -230,49 +230,56 @@ class DiffResult {
         at startIndex: Int,
         side: DisplaySide
     ) {
-        var src: [DiffLine]
-        var dest: [DiffLine]
-        var type: DiffChangeType
-
         switch side {
         case .left:
-            src = leftSide.lines
-            dest = rightSide.lines
-            type = .deleted
+            insertLines(
+                text: text,
+                destination: leftSide,
+                otherSide: rightSide,
+                at: startIndex,
+                type: .deleted
+            )
         case .right:
-            src = rightSide.lines
-            dest = leftSide.lines
-            type = .added
+            insertLines(
+                text: text,
+                destination: rightSide,
+                otherSide: leftSide,
+                at: startIndex,
+                type: .added
+            )
         }
+    }
 
+    private func insertLines(
+        text: String,
+        destination: DiffSide,
+        otherSide: DiffSide,
+        at startIndex: Int,
+        type: DiffChangeType
+    ) {
         var index = startIndex
 
         text.enumerateLines { line, _ in
-            let srcLS = src[index]
-            if srcLS.type == .missing {
-                srcLS.text = line
-                let destLS = dest[index]
+            let destLine = destination.lines[index]
+            if destLine.type == .missing {
+                destLine.text = line
+                let otherLine = otherSide.lines[index]
                 // simple comparison
-                if destLS.text == line {
-                    destLS.type = .matching
-                    srcLS.type = .matching
+                if otherLine.text == line {
+                    otherLine.type = .matching
+                    destLine.type = .matching
                 } else {
-                    destLS.type = .changed
-                    srcLS.type = .changed
+                    otherLine.type = .changed
+                    destLine.type = .changed
                 }
             } else {
                 // line numbers will be set correctly below
-                src.insert(DiffLine(with: type, number: 0, text: line), at: index)
-                dest.insert(DiffLine.missingLine(), at: index)
+                destination.insert(DiffLine(with: type, number: 0, text: line), at: index)
+                otherSide.insert(DiffLine.missingLine(), at: index)
             }
             index += 1
         }
-        switch side {
-        case .left:
-            leftSide.renumberLines()
-        case .right:
-            rightSide.renumberLines()
-        }
+        destination.renumberLines()
     }
 
     func removeLine(at index: Int) {
diff --git a/Sources/Features/FilesCompare/DiffResult/DiffSide.swift b/Sources/Features/FilesCompare/DiffResult/DiffSide.swift
@@ -31,6 +31,10 @@ class DiffSide {
         lines.firstIndex { $0 === line }
     }
 
+    func insert(_ line: DiffLine, at index: Int) {
+        lines.insert(line, at: index)
+    }
+
     func write(
         path: URL,
         encoding: String.Encoding
diff --git a/Tests/Sources/FileCompare/DiffResult/Tests/DiffResultTests.swift b/Tests/Sources/FileCompare/DiffResult/Tests/DiffResultTests.swift
@@ -451,6 +451,114 @@ final class DiffResultTests: DiffResultBaseTests {
             #expect(line.number == lineNumbers[index])
         }
     }
+
+    @Test func insertLinesLeftDestination() throws {
+        let leftText = "line1\n\nline2\nline3"
+        let rightText = "line1\nline2\nline4"
+
+        let diffResult = DiffResult()
+        diffResult.diff(leftText: leftText, rightText: rightText)
+
+        let newLines = "line2.1\nline2.2\n"
+        diffResult.insert(text: newLines, at: 3, side: .left)
+
+        let leftChangeType: [DiffChangeType] = [.matching, .deleted, .matching, .deleted, .deleted, .changed]
+        assert(lines: diffResult.leftSide.lines, expectedValue: leftChangeType)
+        let rightChangeType: [DiffChangeType] = [.matching, .missing, .matching, .missing, .missing, .changed]
+        assert(lines: diffResult.rightSide.lines, expectedValue: rightChangeType)
+
+        assert(sectionSeparators: diffResult.leftSide.lines, isSeparator: false)
+        assert(sectionSeparators: diffResult.rightSide.lines, isSeparator: false)
+
+        #expect(diffResult.summary == DiffSummary(matching: 2, added: 0, deleted: 1, changed: 1))
+
+        assertArrayCount(diffResult.sections, 2)
+        #expect(diffResult.sections[0] == DiffSection(start: 1, end: 1))
+        #expect(diffResult.sections[1] == DiffSection(start: 3, end: 3))
+
+        let expectedLeftLines = [
+            (1, "line1"),
+            (2, ""),
+            (3, "line2"),
+            (4, "line2.1"),
+            (5, "line2.2"),
+            (6, "line3"),
+        ]
+
+        let expectedRightLines = [
+            (1, "line1"),
+            (-1, ""),
+            (2, "line2"),
+            (-1, ""),
+            (-1, ""),
+            (3, "line4"),
+        ]
+
+        for (index, (leftNumber, leftLine)) in expectedLeftLines.enumerated() {
+            let (rightNumber, rightLine) = expectedRightLines[index]
+            let diffLeftLine = diffResult.leftSide.lines[index]
+            let diffRightLine = diffResult.rightSide.lines[index]
+
+            #expect(leftNumber == diffLeftLine.number)
+            #expect(leftLine == diffLeftLine.text)
+
+            #expect(rightNumber == diffRightLine.number)
+            #expect(rightLine == diffRightLine.text)
+        }
+    }
+
+    @Test func insertLinesRightDestination() throws {
+        let leftText = "line1\n\nline2\nline3"
+        let rightText = "line1\nline2\nline4"
+
+        let diffResult = DiffResult()
+        diffResult.diff(leftText: leftText, rightText: rightText)
+
+        let newLines = "line1.1\nline1.2\n"
+        diffResult.insert(text: newLines, at: 1, side: .right)
+
+        let leftChangeType: [DiffChangeType] = [.matching, .changed, .missing, .matching, .changed]
+        assert(lines: diffResult.leftSide.lines, expectedValue: leftChangeType)
+        let rightChangeType: [DiffChangeType] = [.matching, .changed, .added, .matching, .changed]
+        assert(lines: diffResult.rightSide.lines, expectedValue: rightChangeType)
+
+        assert(sectionSeparators: diffResult.leftSide.lines, isSeparator: false)
+        assert(sectionSeparators: diffResult.rightSide.lines, isSeparator: false)
+
+        #expect(diffResult.summary == DiffSummary(matching: 2, added: 0, deleted: 1, changed: 1))
+
+        assertArrayCount(diffResult.sections, 2)
+        #expect(diffResult.sections[0] == DiffSection(start: 1, end: 1))
+        #expect(diffResult.sections[1] == DiffSection(start: 3, end: 3))
+
+        let expectedLeftLines = [
+            (1, "line1"),
+            (2, ""),
+            (-1, ""),
+            (3, "line2"),
+            (4, "line3"),
+        ]
+
+        let expectedRightLines = [
+            (1, "line1"),
+            (2, "line1.1"),
+            (3, "line1.2"),
+            (4, "line2"),
+            (5, "line4"),
+        ]
+
+        for (index, (leftNumber, leftLine)) in expectedLeftLines.enumerated() {
+            let (rightNumber, rightLine) = expectedRightLines[index]
+            let diffLeftLine = diffResult.leftSide.lines[index]
+            let diffRightLine = diffResult.rightSide.lines[index]
+
+            #expect(leftNumber == diffLeftLine.number)
+            #expect(leftLine == diffLeftLine.text)
+
+            #expect(rightNumber == diffRightLine.number)
+            #expect(rightLine == diffRightLine.text)
+        }
+    }
 }
 
 // swiftlint:enable file_length
