[mendoza] Handle overlapping prefix/suffix in string rebase

sanity-io · Oct 6, 2020 · 68b1108 · 68b1108
1 parent 82c53c4
commit 68b1108
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/mendoza/src/incremental-patcher.ts b/packages/mendoza/src/incremental-patcher.ts
@@ -423,7 +423,7 @@ export function rebaseValue<T>(left: Value<T>, right: Value<T>): Value<T> {
 
       let result = rightModel.copyString(null)
       let prefix = commonPrefix(leftRaw, rightRaw)
-      let suffix = commonSuffix(leftRaw, rightRaw)
+      let suffix = commonSuffix(leftRaw, rightRaw, prefix)
 
       let rightLen = utf8stringSize(rightRaw)
       let leftLen = utf8stringSize(leftRaw)

diff --git a/packages/mendoza/src/utf8.ts b/packages/mendoza/src/utf8.ts
@@ -50,8 +50,8 @@ export function commonPrefix(str: string, str2: string) {
   return b
 }
 
-export function commonSuffix(str: string, str2: string) {
-  let len = Math.min(str.length, str2.length)
+export function commonSuffix(str: string, str2: string, prefix: number = 0) {
+  let len = Math.min(str.length, str2.length) - prefix
   let b = 0
   for (let i = 0; i < len; ) {
     let aPoint = str.codePointAt(str.length - 1 - i)!