update

Author: MrWangJustToDo

packages/react/src/components/DiffViewWithMultiSelect.tsx

@@ -307,7 +307,11 @@ const InternalDiffViewWithMultiSelect = <T extends unknown>(
             }
             if (isUnifiedMode && otherMultiResult?.length) {
               const max = Math.max(...otherMultiResult);
-              if (max === lineNum) {
+              const diffFile = getDiffFile();
+              const index = diffFile.getUnifiedLineIndexByLineNumber(lineNum, side);
+              const unifiedItem = diffFile.getUnifiedLine(index);
+              const otherSideLineNum = side === SplitSide.old ? unifiedItem.newLineNumber : unifiedItem.oldLineNumber;
+              if (max === otherSideLineNum) {
                 const finalResult = { [otherSide]: otherMultiResult };
                 setMultiResult(finalResult as typeof multiResult);
                 onAddWidgetClick?.({

packages/solid/src/components/DiffViewWithMultiSelect.tsx

@@ -246,7 +246,11 @@ const InternalDiffViewWithMultiSelect = <T extends unknown>(props: DiffViewWithM
       }
       if (isUnifiedMode() && otherSideResult?.length) {
         const max = Math.max(...otherSideResult);
-        if (max === lineNum) {
+        const diffFile = innerDiffFile();
+        const index = diffFile?.getUnifiedLineIndexByLineNumber(lineNum, side) ?? -1;
+        const unifiedItem = diffFile?.getUnifiedLine(index);
+        const otherSideLineNum = side === SplitSide.old ? unifiedItem?.newLineNumber : unifiedItem?.oldLineNumber;
+        if (max === otherSideLineNum) {
           const finalResult = { [otherSide]: otherSideResult };
           setMultiResult(finalResult as ReturnType<typeof extendDataToPreselectedLines>);
           props.onAddWidgetClick?.({

packages/svelte/src/lib/components/DiffViewWithMultiSelect.svelte

@@ -204,7 +204,9 @@
 
 	let isWrapModeInitial = true;
 	$effect(() => {
+		// eslint-disable-next-line @typescript-eslint/no-unused-expressions
 		props.diffViewWrap;
+		// eslint-disable-next-line @typescript-eslint/no-unused-expressions
 		props.diffViewMode;
 		if (isWrapModeInitial) {
 			isWrapModeInitial = false;
@@ -230,7 +232,7 @@
 		if (multiResult) {
 			const currentSide = SplitSide[side] as unknown as 'new' | 'old';
 			const currentMultiResult = multiResult[currentSide] as number[];
-			const otherSide = currentSide === "new" ? "old" : "new";
+			const otherSide = currentSide === 'new' ? 'old' : 'new';
 			const otherMultiResult = multiResult[otherSide] as number[];
 			if (currentMultiResult?.length) {
 				const max = Math.max(...currentMultiResult);
@@ -247,13 +249,18 @@
 			}
 			if (isUnifiedMode && otherMultiResult?.length) {
 				const max = Math.max(...otherMultiResult);
-				if (max === lineNum) {
+				const diffFile = innerDiffFile;
+				const index = diffFile?.getUnifiedLineIndexByLineNumber(lineNum, side) ?? -1;
+				const unifiedItem = diffFile?.getUnifiedLine(index);
+				const otherSideLineNum =
+					side === SplitSide.old ? unifiedItem?.newLineNumber : unifiedItem?.oldLineNumber;
+				if (max === otherSideLineNum) {
 					const finalResult = { [otherSide]: otherMultiResult };
 					multiResult = finalResult as typeof multiResult;
 					props.onAddWidgetClick?.({
 						lineNumber: max,
 						fromLineNumber: Math.min(...otherMultiResult),
-						side: otherSide === "old" ? SplitSide.old : SplitSide.new
+						side: otherSide === 'old' ? SplitSide.old : SplitSide.new
 					});
 					return;
 				}

packages/vue/src/components/DiffViewWithMultiSelect.tsx

@@ -216,7 +216,11 @@ export const DiffViewWithMultiSelect = defineComponent<
         }
         if (isUnifiedMode.value && otherMultiResult?.length) {
           const max = Math.max(...otherMultiResult);
-          if (max === lineNum) {
+          const diffFile = getDiffFile();
+          const index = diffFile?.getUnifiedLineIndexByLineNumber(lineNum, side) ?? -1;
+          const unifiedItem = diffFile?.getUnifiedLine(index);
+          const otherSideLineNum = side === SplitSide.old ? unifiedItem?.newLineNumber : unifiedItem?.oldLineNumber;
+          if (max === otherSideLineNum) {
             const finalResult = { [otherSide]: otherMultiResult };
             multiResult.value = finalResult as typeof multiResult.value;
             options.emit("onAddWidgetClick", {