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

refactor: enhance context handling and confidence validation in edit strategies

Browse Source 
- Improved the applyContextMatching function to better track context lines and handle changes more accurately.
- Updated the applyEdit function to enforce a stricter confidence check, now requiring a confidence level of 1 for successful edits.
- Refined the processing logic for addition and removal changes, ensuring more reliable diff application.
- Enhanced debugging capabilities with clearer logging and validation checks for edit results.
This commit is contained in:
Daniel Riccio
2025-01-09 16:38:32 -05:00
parent 5351b3d981
commit ab31aea551
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/diff/strategies/new-unified/edit-strategies.ts
View File

@@ -36,17 +36,14 @@ export function applyContextMatching(hunk: Hunk, content: string[], matchPositio
const newResult = [...content.slice(0, matchPosition)]; const newResult = [...content.slice(0, matchPosition)];
let sourceIndex = matchPosition; let sourceIndex = matchPosition;
let previousIndent = ''; let previousIndent = '';
let lastChangeWasRemove = false; // Track if last change was a remove let contextLinesProcessed = 0;
for (const change of hunk.changes) { for (const change of hunk.changes) {
if (change.type === 'context') { if (change.type === 'context') {
newResult.push(change.originalLine || (change.indent + change.content)); newResult.push(change.originalLine || (change.indent + change.content));
previousIndent = change.indent; previousIndent = change.indent;
if (!lastChangeWasRemove) { // Only increment if we didn't just remove a line sourceIndex++;
sourceIndex++; contextLinesProcessed++;
}
lastChangeWasRemove = false;
} else if (change.type === 'add') { } else if (change.type === 'add') {
const indent = change.indent || inferIndentation(change.content, const indent = change.indent || inferIndentation(change.content,
hunk.changes.filter(c => c.type === 'context' && c.originalLine).map(c => c.originalLine || ''), hunk.changes.filter(c => c.type === 'context' && c.originalLine).map(c => c.originalLine || ''),
@@ -54,14 +51,14 @@ export function applyContextMatching(hunk: Hunk, content: string[], matchPositio
); );
newResult.push(indent + change.content); newResult.push(indent + change.content);
previousIndent = indent; previousIndent = indent;
lastChangeWasRemove = false;
} else if (change.type === 'remove') { } else if (change.type === 'remove') {
sourceIndex++; sourceIndex++;
lastChangeWasRemove = true;
} }
} }
newResult.push(...content.slice(sourceIndex)); // Only append remaining content after the hunk's actual span in the original content
const remainingContentStart = matchPosition + contextLinesProcessed + hunk.changes.filter(c => c.type === 'remove').length;
newResult.push(...content.slice(remainingContentStart));
// Calculate the window size based on all changes // Calculate the window size based on all changes
const windowSize = hunk.changes.length; const windowSize = hunk.changes.length;
@@ -344,7 +341,7 @@ export async function applyEdit(hunk: Hunk, content: string[], matchPosition: nu
// Normal mode - try strategies sequentially until one succeeds // Normal mode - try strategies sequentially until one succeeds
for (const strategy of strategies) { for (const strategy of strategies) {
const result = await strategy.apply(); const result = await strategy.apply();
if (result.confidence > MIN_CONFIDENCE) { if (result.confidence === 1) {
return result; return result;
} }
} }