Merge branch 'main' into cte/monorepo

Author: cte

src/integrations/editor/DiffViewProvider.ts

@@ -122,15 +122,18 @@ export class DiffViewProvider {
 		const endLine = accumulatedLines.length
 		// Replace all content up to the current line with accumulated lines.
 		const edit = new vscode.WorkspaceEdit()
-		const rangeToReplace = new vscode.Range(0, 0, endLine + 1, 0)
+		const rangeToReplace = new vscode.Range(0, 0, endLine, 0)
 		const contentToReplace = accumulatedLines.slice(0, endLine + 1).join("\n") + "\n"
 		edit.replace(document.uri, rangeToReplace, this.stripAllBOMs(contentToReplace))
 		await vscode.workspace.applyEdit(edit)
 		// Update decorations.
 		this.activeLineController.setActiveLine(endLine)
 		this.fadedOverlayController.updateOverlayAfterLine(endLine, document.lineCount)
 		// Scroll to the current line.
-		this.scrollEditorToLine(endLine)
+		const ranges = this.activeDiffEditor?.visibleRanges
+		if (ranges && ranges.length > 0 && ranges[0].start.line < endLine && ranges[0].end.line > endLine) {
+			this.scrollEditorToLine(endLine)
+		}
 
 		// Update the streamedLines with the new accumulated content.
 		this.streamedLines = accumulatedLines

src/shared/combineApiRequests.ts

@@ -43,9 +43,7 @@ export function combineApiRequests(messages: ClineMessage[]): ClineMessage[] {
 	const result: ClineMessage[] = []
 	const startedIndices: number[] = []
 
-	for (let i = 0; i < messages.length; i++) {
-		const message = messages[i]
-
+	for (const message of messages) {
 		if (message.type !== "say" || (message.say !== "api_req_started" && message.say !== "api_req_finished")) {
 			result.push(message)
 			continue

src/utils/xml-matcher.ts

@@ -42,8 +42,7 @@ export class XmlMatcher<Result = XmlMatcherResult> {
 	}
 
 	private _update(chunk: string) {
-		for (let i = 0; i < chunk.length; i++) {
-			const char = chunk[i]
+		for (const char of chunk) {
 			this.cached.push(char)
 			this.pointer++