Merge branch 'main' of https://github.com/RooVetGit/Roo-Code into bug/1631/v001

Author: bramburn

package-lock.json

@@ -1486,6 +1486,23 @@ function five() {
 }`)
 				}
 			})
+
+			it("should delete a line when search block has line number prefix and replace is empty", async () => {
+				const originalContent = "line 1\nline to delete\nline 3"
+				const diffContent = `
+<<<<<<< SEARCH
+:start_line:2
+:end_line:2
+-------
+2 | line to delete
+=======
+>>>>>>> REPLACE`
+				const result = await strategy.applyDiff(originalContent, diffContent)
+				expect(result.success).toBe(true)
+				if (result.success) {
+					expect(result.content).toBe("line 1\nline 3")
+				}
+			})
 		})
 
 		describe("insertion", () => {

src/core/diff/strategies/__tests__/multi-search-replace.test.ts

@@ -301,7 +301,10 @@ Only use a single line of '=======' between search and replacement content, beca
 			replaceContent = this.unescapeMarkers(replaceContent)
 
 			// Strip line numbers from search and replace content if every line starts with a line number
-			if (everyLineHasLineNumbers(searchContent) && everyLineHasLineNumbers(replaceContent)) {
+			if (
+				(everyLineHasLineNumbers(searchContent) && everyLineHasLineNumbers(replaceContent)) ||
+				(everyLineHasLineNumbers(searchContent) && replaceContent.trim() === "")
+			) {
 				searchContent = stripLineNumbers(searchContent)
 				replaceContent = stripLineNumbers(replaceContent)
 			}

src/core/diff/strategies/multi-search-replace.ts

@@ -85,7 +85,7 @@ const HistoryView = ({ onDone }: HistoryViewProps) => {
 									: `${t("history:enterSelectionMode")}`
 							}>
 							<span
-								className={`codicon ${isSelectionMode ? "codicon-check-all" : "codicon-checklist"}`}
+								className={`codicon ${isSelectionMode ? "codicon-check-all" : "codicon-checklist"} mr-1`}
 							/>
 							{isSelectionMode ? t("history:exitSelection") : t("history:selectionMode")}
 						</VSCodeButton>

webview-ui/src/components/history/HistoryView.tsx

@@ -106,7 +106,7 @@ export const SelectDropdown = React.forwardRef<React.ElementRef<typeof DropdownM
 					onEscapeKeyDown={() => setOpen(false)}
 					onInteractOutside={() => setOpen(false)}
 					container={portalContainer}
-					className={contentClassName}>
+					className={cn("overflow-y-auto max-h-[80vh]", contentClassName)}>
 					{options.map((option, index) => {
 						if (option.type === DropdownOptionType.SEPARATOR) {
 							return <DropdownMenuSeparator key={`sep-${index}`} />