From 3e2d20f37c47cd0a9ba53d15db97aa0207d40908 Mon Sep 17 00:00:00 2001
From: Matt Rubens <mrubens@users.noreply.github.com>
Date: Mon, 21 Apr 2025 22:57:58 -0400
Subject: [PATCH] Search and replace fixes (#2830)

* Allow replacing with an empty string

* Visual cleanup
---
 src/core/tools/searchAndReplaceTool.ts      |  2 +-
 webview-ui/src/components/chat/ChatRow.tsx  | 26 ++-------------------
 webview-ui/src/i18n/locales/de/chat.json    |  2 +-
 webview-ui/src/i18n/locales/en/chat.json    |  2 +-
 webview-ui/src/i18n/locales/ja/chat.json    |  2 +-
 webview-ui/src/i18n/locales/zh-CN/chat.json |  2 +-
 webview-ui/src/i18n/locales/zh-TW/chat.json |  2 +-
 7 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/core/tools/searchAndReplaceTool.ts b/src/core/tools/searchAndReplaceTool.ts
index f371901e5f..7a503b5f1e 100644
--- a/src/core/tools/searchAndReplaceTool.ts
+++ b/src/core/tools/searchAndReplaceTool.ts
@@ -41,7 +41,7 @@ async function validateParams(
 		return false
 	}
 
-	if (!replace) {
+	if (replace === undefined) {
 		cline.consecutiveMistakeCount++
 		cline.recordToolError("search_and_replace")
 		pushToolResult(await cline.sayAndCreateMissingParamError("search_and_replace", "replace"))
diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index 486183c150..8c09b101b1 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -323,36 +323,14 @@ export const ChatRowContent = ({
 			case "searchAndReplace":
 				return (
 					<>
-						<div className="flex items-center gap-2.5 mb-2.5">
+						<div style={headerStyle}>
 							{toolIcon("replace")}
-							<span className="font-bold">
+							<span style={{ fontWeight: "bold" }}>
 								{message.type === "ask"
 									? t("chat:fileOperations.wantsToSearchReplace")
 									: t("chat:fileOperations.didSearchReplace")}
 							</span>
 						</div>
-						<div className="mb-2.5">
-							<div className="flex items-center gap-2.5 mb-1.5">
-								<span className="text-vscode-descriptionForeground">Search:</span>
-								<code>{tool.search}</code>
-								{tool.useRegex && <span className="text-vscode-descriptionForeground">(regex)</span>}
-								{tool.ignoreCase && (
-									<span className="text-vscode-descriptionForeground">(case-insensitive)</span>
-								)}
-							</div>
-							<div className="flex items-center gap-2.5 mb-1.5">
-								<span className="text-vscode-descriptionForeground">Replace:</span>
-								<code>{tool.replace}</code>
-							</div>
-							{(tool.startLine !== undefined || tool.endLine !== undefined) && (
-								<div className="flex items-center gap-2.5">
-									<span className="text-vscode-descriptionForeground">Lines:</span>
-									<code>
-										{tool.startLine ?? 1} - {tool.endLine ?? "end"}
-									</code>
-								</div>
-							)}
-						</div>
 						<CodeAccordian
 							progressStatus={message.progressStatus}
 							isLoading={message.partial}
diff --git a/webview-ui/src/i18n/locales/de/chat.json b/webview-ui/src/i18n/locales/de/chat.json
index 372c6c728a..a1f947f997 100644
--- a/webview-ui/src/i18n/locales/de/chat.json
+++ b/webview-ui/src/i18n/locales/de/chat.json
@@ -121,7 +121,7 @@
 		"wantsToEdit": "Roo möchte diese Datei bearbeiten:",
 		"wantsToEditOutsideWorkspace": "Roo möchte diese Datei außerhalb des Arbeitsbereichs bearbeiten:",
 		"wantsToCreate": "Roo möchte eine neue Datei erstellen:",
-		"wantsToSearchReplace": "Roo möchte Suchen und Ersetzen in dieser Datei durchführen:",
+		"wantsToSearchReplace": "Roo möchte in dieser Datei suchen und ersetzen:",
 		"didSearchReplace": "Roo hat Suchen und Ersetzen in dieser Datei durchgeführt:",
 		"wantsToInsert": "Roo möchte Inhalte in diese Datei einfügen:",
 		"wantsToInsertWithLineNumber": "Roo möchte Inhalte in diese Datei in Zeile {{lineNumber}} einfügen:",
diff --git a/webview-ui/src/i18n/locales/en/chat.json b/webview-ui/src/i18n/locales/en/chat.json
index b6c957a45d..f1609b19a6 100644
--- a/webview-ui/src/i18n/locales/en/chat.json
+++ b/webview-ui/src/i18n/locales/en/chat.json
@@ -116,7 +116,7 @@
 		"wantsToEdit": "Roo wants to edit this file:",
 		"wantsToEditOutsideWorkspace": "Roo wants to edit this file outside of the workspace:",
 		"wantsToCreate": "Roo wants to create a new file:",
-		"wantsToSearchReplace": "Roo wants to perform search and replace on this file:",
+		"wantsToSearchReplace": "Roo wants to search and replace in this file:",
 		"didSearchReplace": "Roo performed search and replace on this file:",
 		"wantsToInsert": "Roo wants to insert content into this file:",
 		"wantsToInsertWithLineNumber": "Roo wants to insert content into this file at line {{lineNumber}}:",
diff --git a/webview-ui/src/i18n/locales/ja/chat.json b/webview-ui/src/i18n/locales/ja/chat.json
index 8a68068c30..39ceb74099 100644
--- a/webview-ui/src/i18n/locales/ja/chat.json
+++ b/webview-ui/src/i18n/locales/ja/chat.json
@@ -121,7 +121,7 @@
 		"wantsToEdit": "Rooはこのファイルを編集したい:",
 		"wantsToEditOutsideWorkspace": "Rooはワークスペース外のこのファイルを編集したい:",
 		"wantsToCreate": "Rooは新しいファイルを作成したい:",
-		"wantsToSearchReplace": "Rooはこのファイルで検索と置換を実行したい:",
+		"wantsToSearchReplace": "Rooはこのファイルで検索と置換を行う:",
 		"didSearchReplace": "Rooはこのファイルで検索と置換を実行しました:",
 		"wantsToInsert": "Rooはこのファイルにコンテンツを挿入したい:",
 		"wantsToInsertWithLineNumber": "Rooはこのファイルの{{lineNumber}}行目にコンテンツを挿入したい:",
diff --git a/webview-ui/src/i18n/locales/zh-CN/chat.json b/webview-ui/src/i18n/locales/zh-CN/chat.json
index 8d0a78572a..928dcc047a 100644
--- a/webview-ui/src/i18n/locales/zh-CN/chat.json
+++ b/webview-ui/src/i18n/locales/zh-CN/chat.json
@@ -121,7 +121,7 @@
 		"wantsToEdit": "需要编辑文件:",
 		"wantsToEditOutsideWorkspace": "需要编辑外部文件:",
 		"wantsToCreate": "需要新建文件:",
-		"wantsToSearchReplace": "需要执行搜索和替换:",
+		"wantsToSearchReplace": "需要在此文件中搜索和替换:",
 		"didSearchReplace": "已完成搜索和替换:",
 		"wantsToInsert": "需要在此文件中插入内容:",
 		"wantsToInsertWithLineNumber": "需要在第 {{lineNumber}} 行插入内容:",
diff --git a/webview-ui/src/i18n/locales/zh-TW/chat.json b/webview-ui/src/i18n/locales/zh-TW/chat.json
index 4c3f2be8f3..305d012dc6 100644
--- a/webview-ui/src/i18n/locales/zh-TW/chat.json
+++ b/webview-ui/src/i18n/locales/zh-TW/chat.json
@@ -121,7 +121,7 @@
 		"wantsToEdit": "Roo 想要編輯此檔案：",
 		"wantsToEditOutsideWorkspace": "Roo 想要編輯此工作區外的檔案：",
 		"wantsToCreate": "Roo 想要建立新檔案：",
-		"wantsToSearchReplace": "Roo 想要在此檔案執行搜尋和取代：",
+		"wantsToSearchReplace": "Roo 想要在此檔案中搜尋和取代：",
 		"didSearchReplace": "Roo 已在此檔案執行搜尋和取代：",
 		"wantsToInsert": "Roo 想要在此檔案中插入內容：",
 		"wantsToInsertWithLineNumber": "Roo 想要在此檔案第 {{lineNumber}} 行插入內容：",