0.0.6-SNAPSHOT fixed block indexes in merge3 result
This commit is contained in:
1 parent
ce3987d009
commit
2e19e8ca42
4 files changed
+34
-2
No files matched your search
@@ -36,7 +36,12 @@ class MergeResult<T>(
|
||||
start = r.endInclusive + 1
|
||||
}
|
||||
if (start < merged.size) {
|
||||
result.add(MergedBlock.Unchanged(merged.slice(start until merged.size), sourceIndices[start]))
|
||||
result.add(
|
||||
MergedBlock.Unchanged(
|
||||
merged.slice(start until merged.size),
|
||||
sourceIndices.indexOf(start)
|
||||
)
|
||||
)
|
||||
}
|
||||
result
|
||||
}
|
||||
|
||||
@@ -84,6 +84,10 @@ class BasicTest {
|
||||
val b = "456 Hello".toList()
|
||||
|
||||
val m = merge3(src, b, a, true)
|
||||
// println(m.toTrace(src))
|
||||
// println(m.changedAreas)
|
||||
// for( b in m.blocks )
|
||||
// println(b)
|
||||
val unchanged = m.blocks.last() as MergedBlock.Unchanged
|
||||
println(unchanged)
|
||||
assertEquals(0, unchanged.referenceIndex)
|
||||
|
||||
Reference in new issue
Block a user