From 48c5ffa2117474d532b1f222ef42b6bf08cf0fda Mon Sep 17 00:00:00 2001
From: shaokeyibb <shaokeyibb@126.com>
Date: Mon, 26 Aug 2024 21:31:37 +0800
Subject: [PATCH] fix: range

---
 cloudflare-workers/src/utils.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cloudflare-workers/src/utils.ts b/cloudflare-workers/src/utils.ts
index 1b5aa478..916ff056 100644
--- a/cloudflare-workers/src/utils.ts
+++ b/cloudflare-workers/src/utils.ts
@@ -9,6 +9,7 @@ type OffsetDelta = {
 export function calcOffsetModification(offsets: Offset[], diff: ModifiedCommentBody['diff']): Replacement[] {
 	const offsetsDelta: OffsetDelta[] = Array.from({ length: offsets.length }, () => ({ startDelta: 0, endDelta: 0 }));
 
+	// i1, i2, j1, j2, start, end 均为左闭右开
 	for (const { tag, i1, i2, j1, j2 } of diff) {
 		for (let i = 0; i < offsets.length; i++) {
 			const { start, end } = offsets[i];
@@ -33,7 +34,7 @@ export function calcOffsetModification(offsets: Offset[], diff: ModifiedCommentB
 				case 'delete':
 				case 'replace': {
 					// 替换点在该区间前
-					if (i2 < start) {
+					if (i2 <= start) {
 						const deltaLength = j2 - j1 - (i2 - i1);
 						delta.startDelta += deltaLength;
 						delta.endDelta += deltaLength;
@@ -44,17 +45,17 @@ export function calcOffsetModification(offsets: Offset[], diff: ModifiedCommentB
 						delta.endDelta += deltaLength;
 					}
 					// 替换点右半边在该区间内，左半边在该区间外
-					else if (i1 < start && i2 >= start && i2 <= end) {
+					else if (i1 < start && i2 > start && i2 <= end) {
 						const deltaLength = i1 - start; // 获取替换部分
 						delta.startDelta += deltaLength;
 						delta.endDelta += deltaLength - (i2 - start);
 					}
 					// 替换点右半边在该区间外，左半边在该区间内
-					else if (i2 > end && i1 >= start && i1 < end) {
+					else if (i2 >= end && i1 >= start && i1 < end) {
 						delta.endDelta += i1 - end;
 					}
 					// 替换点包括整个区间
-					else if (i1 < start && i2 > end) {
+					else if (i1 < start && i2 >= end) {
 						delta.invalid = true;
 					}
 					// 替换点在该区间后不需要变动