pacnpal/Roo-Code
1
0
Fork 0
mirror of https://github.com/pacnpal/Roo-Code.git synced 2025-12-20 12:21:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where start/end line not passed to diff

Browse Source
This commit is contained in:
Matt Rubens
2024-12-16 12:22:23 -05:00
parent c2b4b05459
commit 61b2104345
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/Cline.ts
View File

@@ -1238,7 +1238,12 @@ export class Cline {
const originalContent = await fs.readFile(absolutePath, "utf-8") const originalContent = await fs.readFile(absolutePath, "utf-8")
// Apply the diff to the original content // Apply the diff to the original content
const diffResult = this.diffStrategy?.applyDiff(originalContent, diffContent) ?? { const diffResult = this.diffStrategy?.applyDiff(
originalContent,
diffContent,
parseInt(block.params.start_line ?? ''),
parseInt(block.params.end_line ?? '')
) ?? {
success: false, success: false,
error: "No diff strategy available" error: "No diff strategy available"
} }

2
src/core/assistant-message/index.ts
View File

@@ -44,6 +44,8 @@ export const toolParamNames = [
"question", "question",
"result", "result",
"diff", "diff",
"start_line",
"end_line",
] as const ] as const
export type ToolParamName = (typeof toolParamNames)[number] export type ToolParamName = (typeof toolParamNames)[number]

17
src/core/diff/strategies/search-replace.ts
View File

@@ -162,12 +162,12 @@ Your search/replace content here
let bestMatchScore = 0; let bestMatchScore = 0;
let bestMatchContent = ""; let bestMatchContent = "";
if (startLine !== undefined && endLine !== undefined) { if (startLine && endLine) {
// Convert to 0-based index // Convert to 0-based index
const exactStartIndex = startLine - 1; const exactStartIndex = startLine - 1;
const exactEndIndex = endLine - 1; const exactEndIndex = endLine - 1;
if (exactStartIndex < 0 || exactEndIndex >= originalLines.length) { if (exactStartIndex < 0 || exactEndIndex >= originalLines.length || exactStartIndex > exactEndIndex) {
const debugInfo = this.debugEnabled ? `\n\nDebug Info:\n- Requested Range: lines ${startLine}-${endLine}\n- File Bounds: lines 1-${originalLines.length}` : ''; const debugInfo = this.debugEnabled ? `\n\nDebug Info:\n- Requested Range: lines ${startLine}-${endLine}\n- File Bounds: lines 1-${originalLines.length}` : '';
return { return {
@@ -193,13 +193,12 @@ Your search/replace content here
let searchStartIndex = 0; let searchStartIndex = 0;
let searchEndIndex = originalLines.length; let searchEndIndex = originalLines.length;
if (startLine !== undefined || endLine !== undefined) { if (startLine || endLine) {
// Convert to 0-based index and add buffer // Convert to 0-based index and add buffer
const BUFFER_LINES = 5; if (startLine) {
if (startLine !== undefined) {
searchStartIndex = Math.max(0, startLine - (BUFFER_LINES + 1)); searchStartIndex = Math.max(0, startLine - (BUFFER_LINES + 1));
} }
if (endLine !== undefined) { if (endLine) {
searchEndIndex = Math.min(originalLines.length, endLine + BUFFER_LINES); searchEndIndex = Math.min(originalLines.length, endLine + BUFFER_LINES);
} }
} }
@@ -236,10 +235,10 @@ Your search/replace content here
? `\n\nBest Match Found:\n${addLineNumbers(bestMatchContent, matchIndex + 1)}` ? `\n\nBest Match Found:\n${addLineNumbers(bestMatchContent, matchIndex + 1)}`
: `\n\nBest Match Found:\n(no match)`; : `\n\nBest Match Found:\n(no match)`;
const debugInfo = this.debugEnabled ? `\n\nDebug Info:\n- Similarity Score: ${Math.floor(bestMatchScore * 100)}%\n- Required Threshold: ${Math.floor(this.fuzzyThreshold * 100)}%\n- Line Range: lines ${startLine}-${endLine}\n\nSearch Content:\n${searchChunk}${bestMatchSection}${originalContentSection}` : ''; const debugInfo = this.debugEnabled ? `\n\nDebug Info:\n- Similarity Score: ${Math.floor(bestMatchScore * 100)}%\n- Required Threshold: ${Math.floor(this.fuzzyThreshold * 100)}%\n- Search Range: ${startLine && endLine ? `lines ${startLine}-${endLine}` : 'start to end'}\n\nSearch Content:\n${searchChunk}${bestMatchSection}${originalContentSection}` : '';
const lineRange = startLine !== undefined || endLine !== undefined ? const lineRange = startLine || endLine ?
` at ${startLine !== undefined ? `start: ${startLine}` : 'start'} to ${endLine !== undefined ? `end: ${endLine}` : 'end'}` : ''; ` at ${startLine ? `start: ${startLine}` : 'start'} to ${endLine ? `end: ${endLine}` : 'end'}` : '';
return { return {
success: false, success: false,
error: `No sufficiently similar match found${lineRange} (${Math.floor(bestMatchScore * 100)}% similar, needs ${Math.floor(this.fuzzyThreshold * 100)}%)${debugInfo}` error: `No sufficiently similar match found${lineRange} (${Math.floor(bestMatchScore * 100)}% similar, needs ${Math.floor(this.fuzzyThreshold * 100)}%)${debugInfo}`