From 219550c51544c7f342824a9e29dc03c718957079 Mon Sep 17 00:00:00 2001
From: Saoud Rizwan <7799382+saoudrizwan@users.noreply.github.com>
Date: Mon, 16 Dec 2024 15:28:45 -0800
Subject: [PATCH] Fixes

---
 src/core/assistant-message/diff.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/assistant-message/diff.ts b/src/core/assistant-message/diff.ts
index c8b27f85a9..0c9b197aa1 100644
--- a/src/core/assistant-message/diff.ts
+++ b/src/core/assistant-message/diff.ts
@@ -103,7 +103,7 @@ function lineTrimmedFallbackMatch(
 			// Add one char for newline if not the first line
 
 			const matchedBlock = originalLines.slice(i, i + searchLines.length).join("\n")
-			const matchEnd = matchStart + matchedBlock.length
+			const matchEnd = matchStart + matchedBlock.length + 1
 
 			return [matchStart, matchEnd]
 		}
@@ -171,7 +171,9 @@ export async function constructNewFileContent(
 				if (exactIndex !== -1) {
 					searchMatchIndex = exactIndex
 					searchEndIndex = exactIndex + currentSearchContent.length
+					console.log("Exact match found", searchMatchIndex, searchEndIndex)
 				} else {
+					console.log("No exact match found, trying fallback line-trimmed matching")
 					// Attempt fallback line-trimmed matching
 					const fallbackMatch = lineTrimmedFallbackMatch(
 						originalContent,
@@ -180,6 +182,7 @@ export async function constructNewFileContent(
 					)
 					if (fallbackMatch) {
 						;[searchMatchIndex, searchEndIndex] = fallbackMatch
+						console.log("Fallback line-trimmed match found", searchMatchIndex, searchEndIndex)
 					} else {
 						throw new Error(
 							`The SEARCH block:\n${currentSearchContent.trimEnd()}\n...does not match anything in the file.`,