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

refactor: simplify indentation inference and enhance edit strategies

Browse Source 
- Refactored the `inferIndentation` function to streamline indentation handling for context and added lines.
- Improved the `applyContextMatching` and `applyDMP` functions for better clarity and efficiency in processing changes.
- Code was formatted
This commit is contained in:
Daniel Riccio
2025-01-17 01:38:44 -05:00
parent 9857e31e9c
commit 71fdf88672
1 changed files with 206 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,249 +1,271 @@
import { diff_match_patch } from 'diff-match-patch'; import { diff_match_patch } from "diff-match-patch"
import { EditResult, Hunk } from './types'; import { EditResult, Hunk } from "./types"
import { getDMPSimilarity, validateEditResult } from './search-strategies'; import { getDMPSimilarity, validateEditResult } from "./search-strategies"
import * as path from 'path'; import * as path from "path"
import simpleGit, { SimpleGit } from 'simple-git'; import simpleGit, { SimpleGit } from "simple-git"
import * as tmp from 'tmp'; import * as tmp from "tmp"
import * as fs from 'fs'; import * as fs from "fs"
// Helper function to infer indentation // Helper function to infer indentation - simplified version
function inferIndentation(line: string, contextLines: string[], previousIndent: string = ''): string { function inferIndentation(line: string, contextLines: string[], previousIndent: string = ""): string {
const match = line.match(/^(\s+)/); // If the line has explicit indentation in the change, use it exactly
if (match) { const lineMatch = line.match(/^(\s+)/)
return match[1]; if (lineMatch) {
} return lineMatch[1]
}
for (const contextLine of contextLines) { // If we have context lines, use the indentation from the first context line
const contextMatch = contextLine.match(/^(\s+)/); const contextLine = contextLines[0]
if (contextLine) {
const contextMatch = contextLine.match(/^(\s+)/)
if (contextMatch) { if (contextMatch) {
const currentLineDepth = (line.match(/^\s*/)?.[0] || '').length; return contextMatch[1]
const contextLineDepth = contextMatch[1].length; }
}
if (currentLineDepth > contextLineDepth) {
return contextMatch[1] + ' '.repeat(2);
}
return contextMatch[1];
}
}
return previousIndent; // Fallback to previous indent
return previousIndent
} }
// Context matching edit strategy // Context matching edit strategy
export function applyContextMatching(hunk: Hunk, content: string[], matchPosition: number, confidenceThreshold: number): EditResult { export function applyContextMatching(
hunk: Hunk,
content: string[],
matchPosition: number,
): EditResult {
if (matchPosition === -1) { if (matchPosition === -1) {
return { confidence: 0, result: content, strategy: 'context' }; return { confidence: 0, result: content, strategy: "context" }
} }
const newResult = [...content.slice(0, matchPosition)]; const newResult = [...content.slice(0, matchPosition)]
let sourceIndex = matchPosition; let sourceIndex = matchPosition
let previousIndent = '';
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)); // Use the original line from content if available
previousIndent = change.indent; if (sourceIndex < content.length) {
sourceIndex++; newResult.push(content[sourceIndex])
contextLinesProcessed++; } else {
} else if (change.type === 'add') { const line = change.indent ? change.indent + change.content : change.content
const indent = change.indent || inferIndentation(change.content, newResult.push(line)
hunk.changes.filter(c => c.type === 'context' && c.originalLine).map(c => c.originalLine || ''), }
previousIndent sourceIndex++
); } else if (change.type === "add") {
newResult.push(indent + change.content); // Use exactly the indentation from the change
previousIndent = indent; const baseIndent = change.indent || ""
} else if (change.type === 'remove') {
sourceIndex++;
}
}
// Only append remaining content after the hunk's actual span in the original content // Handle multi-line additions
const remainingContentStart = matchPosition + contextLinesProcessed + hunk.changes.filter(c => c.type === 'remove').length; const lines = change.content.split("\n").map((line) => {
newResult.push(...content.slice(remainingContentStart)); // If the line already has indentation, preserve it relative to the base indent
const lineIndentMatch = line.match(/^(\s*)(.*)/)
// Calculate the window size based on all changes if (lineIndentMatch) {
const windowSize = hunk.changes.length; const [, lineIndent, content] = lineIndentMatch
// Only add base indent if the line doesn't already have it
// Validate the result using the full window size return lineIndent ? line : baseIndent + content
const similarity = getDMPSimilarity( }
content.slice(matchPosition, matchPosition + windowSize).join('\n'), return baseIndent + line
newResult.slice(matchPosition, matchPosition + windowSize).join('\n') })
)
const confidence = validateEditResult(hunk, newResult.slice(matchPosition, matchPosition + windowSize).join('\n'), confidenceThreshold); newResult.push(...lines)
} else if (change.type === "remove") {
// Handle multi-line removes by incrementing sourceIndex for each line
const removedLines = change.content.split("\n").length
sourceIndex += removedLines
}
}
return { // Append remaining content
confidence: similarity * confidence, newResult.push(...content.slice(sourceIndex))
result: newResult,
strategy: 'context' // Calculate confidence based on the actual changes
}; const afterText = newResult.slice(matchPosition, newResult.length - (content.length - sourceIndex)).join("\n")
const confidence = validateEditResult(hunk, afterText)
return {
confidence,
result: newResult,
strategy: "context"
}
} }
// DMP edit strategy // DMP edit strategy
export function applyDMP(hunk: Hunk, content: string[], matchPosition: number, confidenceThreshold: number): EditResult { export function applyDMP(
hunk: Hunk,
content: string[],
matchPosition: number,
): EditResult {
if (matchPosition === -1) { if (matchPosition === -1) {
return { confidence: 0, result: content, strategy: 'dmp' }; return { confidence: 0, result: content, strategy: "dmp" }
} }
const dmp = new diff_match_patch(); const dmp = new diff_match_patch()
// Calculate total lines in before block accounting for multi-line content
const beforeLineCount = hunk.changes
.filter((change) => change.type === "context" || change.type === "remove")
.reduce((count, change) => count + change.content.split("\n").length, 0)
// Build BEFORE block (context + removals) // Build BEFORE block (context + removals)
const beforeLines = hunk.changes const beforeLines = hunk.changes
.filter(change => change.type === 'context' || change.type === 'remove') .filter((change) => change.type === "context" || change.type === "remove")
.map(change => change.originalLine || (change.indent + change.content)); .map((change) => {
if (change.originalLine) {
return change.originalLine
}
return change.indent ? change.indent + change.content : change.content
})
// Build AFTER block (context + additions) // Build AFTER block (context + additions)
const afterLines = hunk.changes const afterLines = hunk.changes
.filter(change => change.type === 'context' || change.type === 'add') .filter((change) => change.type === "context" || change.type === "add")
.map(change => change.originalLine || (change.indent + change.content)); .map((change) => {
if (change.originalLine) {
// Convert to text return change.originalLine
const beforeText = beforeLines.join('\n'); }
const afterText = afterLines.join('\n'); return change.indent ? change.indent + change.content : change.content
})
// Create the patch
const patch = dmp.patch_make(beforeText, afterText); // Convert to text with proper line endings
const beforeText = beforeLines.join("\n")
// Get the target text from content const afterText = afterLines.join("\n")
const targetText = content.slice(matchPosition, matchPosition + beforeLines.length).join('\n');
// Create and apply patch
// Apply the patch const patch = dmp.patch_make(beforeText, afterText)
const [patchedText] = dmp.patch_apply(patch, targetText); const targetText = content.slice(matchPosition, matchPosition + beforeLineCount).join("\n")
const [patchedText] = dmp.patch_apply(patch, targetText)
// Split patched text back into lines
const patchedLines = patchedText.split('\n'); // Split result and preserve line endings
const patchedLines = patchedText.split("\n")
// Construct the final result
// Construct final result
const newResult = [ const newResult = [
...content.slice(0, matchPosition), ...content.slice(0, matchPosition),
...patchedLines, ...patchedLines,
...content.slice(matchPosition + beforeLines.length) ...content.slice(matchPosition + beforeLineCount),
]; ]
// Calculate confidence const confidence = validateEditResult(hunk, patchedText)
const similarity = getDMPSimilarity(beforeText, targetText);
const confidence = validateEditResult(hunk, patchedText, confidenceThreshold);
return { return {
confidence: similarity * confidence, confidence,
result: newResult, result: newResult,
strategy: 'dmp' strategy: "dmp",
}; }
} }
// Git fallback strategy that works with full content // Git fallback strategy that works with full content
async function applyGitFallback(hunk: Hunk, content: string[]): Promise<EditResult> { async function applyGitFallback(hunk: Hunk, content: string[]): Promise<EditResult> {
let tmpDir: tmp.DirResult | undefined; let tmpDir: tmp.DirResult | undefined
try {
tmpDir = tmp.dirSync({ unsafeCleanup: true });
const git: SimpleGit = simpleGit(tmpDir.name);
await git.init();
await git.addConfig('user.name', 'Temp');
await git.addConfig('user.email', 'temp@example.com');
const filePath = path.join(tmpDir.name, 'file.txt'); try {
tmpDir = tmp.dirSync({ unsafeCleanup: true })
const git: SimpleGit = simpleGit(tmpDir.name)
await git.init()
await git.addConfig("user.name", "Temp")
await git.addConfig("user.email", "temp@example.com")
const filePath = path.join(tmpDir.name, "file.txt")
const searchLines = hunk.changes const searchLines = hunk.changes
.filter(change => change.type === 'context' || change.type === 'remove') .filter((change) => change.type === "context" || change.type === "remove")
.map(change => change.originalLine || (change.indent + change.content)); .map((change) => change.originalLine || change.indent + change.content)
const replaceLines = hunk.changes const replaceLines = hunk.changes
.filter(change => change.type === 'context' || change.type === 'add') .filter((change) => change.type === "context" || change.type === "add")
.map(change => change.originalLine || (change.indent + change.content)); .map((change) => change.originalLine || change.indent + change.content)
const searchText = searchLines.join('\n'); const searchText = searchLines.join("\n")
const replaceText = replaceLines.join('\n'); const replaceText = replaceLines.join("\n")
const originalText = content.join('\n'); const originalText = content.join("\n")
try { try {
fs.writeFileSync(filePath, originalText); fs.writeFileSync(filePath, originalText)
await git.add('file.txt'); await git.add("file.txt")
const originalCommit = await git.commit('original'); const originalCommit = await git.commit("original")
console.log('Strategy 1 - Original commit:', originalCommit.commit); console.log("Strategy 1 - Original commit:", originalCommit.commit)
fs.writeFileSync(filePath, searchText); fs.writeFileSync(filePath, searchText)
await git.add('file.txt'); await git.add("file.txt")
const searchCommit1 = await git.commit('search'); const searchCommit1 = await git.commit("search")
console.log('Strategy 1 - Search commit:', searchCommit1.commit); console.log("Strategy 1 - Search commit:", searchCommit1.commit)
fs.writeFileSync(filePath, replaceText); fs.writeFileSync(filePath, replaceText)
await git.add('file.txt'); await git.add("file.txt")
const replaceCommit = await git.commit('replace'); const replaceCommit = await git.commit("replace")
console.log('Strategy 1 - Replace commit:', replaceCommit.commit); console.log("Strategy 1 - Replace commit:", replaceCommit.commit)
console.log('Strategy 1 - Attempting checkout of:', originalCommit.commit); console.log("Strategy 1 - Attempting checkout of:", originalCommit.commit)
await git.raw(['checkout', originalCommit.commit]); await git.raw(["checkout", originalCommit.commit])
try { try {
console.log('Strategy 1 - Attempting cherry-pick of:', replaceCommit.commit); console.log("Strategy 1 - Attempting cherry-pick of:", replaceCommit.commit)
await git.raw(['cherry-pick', '--minimal', replaceCommit.commit]); await git.raw(["cherry-pick", "--minimal", replaceCommit.commit])
const newText = fs.readFileSync(filePath, 'utf-8'); const newText = fs.readFileSync(filePath, "utf-8")
const newLines = newText.split('\n'); const newLines = newText.split("\n")
return { return {
confidence: 1, confidence: 1,
result: newLines, result: newLines,
strategy: 'git-fallback' strategy: "git-fallback",
}; }
} catch (cherryPickError) { } catch (cherryPickError) {
console.error('Strategy 1 failed with merge conflict'); console.error("Strategy 1 failed with merge conflict")
} }
} catch (error) { } catch (error) {
console.error('Strategy 1 failed:', error); console.error("Strategy 1 failed:", error)
} }
try { try {
await git.init(); await git.init()
await git.addConfig('user.name', 'Temp'); await git.addConfig("user.name", "Temp")
await git.addConfig('user.email', 'temp@example.com'); await git.addConfig("user.email", "temp@example.com")
fs.writeFileSync(filePath, searchText); fs.writeFileSync(filePath, searchText)
await git.add('file.txt'); await git.add("file.txt")
const searchCommit = await git.commit('search'); const searchCommit = await git.commit("search")
const searchHash = searchCommit.commit.replace(/^HEAD /, ''); const searchHash = searchCommit.commit.replace(/^HEAD /, "")
console.log('Strategy 2 - Search commit:', searchHash); console.log("Strategy 2 - Search commit:", searchHash)
fs.writeFileSync(filePath, replaceText); fs.writeFileSync(filePath, replaceText)
await git.add('file.txt'); await git.add("file.txt")
const replaceCommit = await git.commit('replace'); const replaceCommit = await git.commit("replace")
const replaceHash = replaceCommit.commit.replace(/^HEAD /, ''); const replaceHash = replaceCommit.commit.replace(/^HEAD /, "")
console.log('Strategy 2 - Replace commit:', replaceHash); console.log("Strategy 2 - Replace commit:", replaceHash)
console.log('Strategy 2 - Attempting checkout of:', searchHash); console.log("Strategy 2 - Attempting checkout of:", searchHash)
await git.raw(['checkout', searchHash]); await git.raw(["checkout", searchHash])
fs.writeFileSync(filePath, originalText); fs.writeFileSync(filePath, originalText)
await git.add('file.txt'); await git.add("file.txt")
const originalCommit2 = await git.commit('original'); const originalCommit2 = await git.commit("original")
console.log('Strategy 2 - Original commit:', originalCommit2.commit); console.log("Strategy 2 - Original commit:", originalCommit2.commit)
try { try {
console.log('Strategy 2 - Attempting cherry-pick of:', replaceHash); console.log("Strategy 2 - Attempting cherry-pick of:", replaceHash)
await git.raw(['cherry-pick', '--minimal', replaceHash]); await git.raw(["cherry-pick", "--minimal", replaceHash])
const newText = fs.readFileSync(filePath, 'utf-8'); const newText = fs.readFileSync(filePath, "utf-8")
const newLines = newText.split('\n'); const newLines = newText.split("\n")
return { return {
confidence: 1, confidence: 1,
result: newLines, result: newLines,
strategy: 'git-fallback' strategy: "git-fallback",
}; }
} catch (cherryPickError) { } catch (cherryPickError) {
console.error('Strategy 2 failed with merge conflict'); console.error("Strategy 2 failed with merge conflict")
} }
} catch (error) { } catch (error) {
console.error('Strategy 2 failed:', error); console.error("Strategy 2 failed:", error)
} }
console.error('Git fallback failed'); console.error("Git fallback failed")
return { confidence: 0, result: content, strategy: 'git-fallback' }; return { confidence: 0, result: content, strategy: "git-fallback" }
} catch (error) { } catch (error) {
console.error('Git fallback strategy failed:', error); console.error("Git fallback strategy failed:", error)
return { confidence: 0, result: content, strategy: 'git-fallback' }; return { confidence: 0, result: content, strategy: "git-fallback" }
} finally { } finally {
if (tmpDir) { if (tmpDir) {
tmpDir.removeCallback(); tmpDir.removeCallback()
} }
} }
} }
@@ -258,24 +280,26 @@ export async function applyEdit(
): Promise<EditResult> { ): Promise<EditResult> {
// Don't attempt regular edits if confidence is too low // Don't attempt regular edits if confidence is too low
if (confidence < confidenceThreshold) { if (confidence < confidenceThreshold) {
console.log(`Search confidence (${confidence}) below minimum threshold (${confidenceThreshold}), trying git fallback...`); console.log(
return applyGitFallback(hunk, content); `Search confidence (${confidence}) below minimum threshold (${confidenceThreshold}), trying git fallback...`
)
return applyGitFallback(hunk, content)
} }
// Try each strategy in sequence until one succeeds // Try each strategy in sequence until one succeeds
const strategies = [ const strategies = [
{ name: 'dmp', apply: () => applyDMP(hunk, content, matchPosition, confidenceThreshold) }, { name: "dmp", apply: () => applyDMP(hunk, content, matchPosition) },
{ name: 'context', apply: () => applyContextMatching(hunk, content, matchPosition, confidenceThreshold) }, { name: "context", apply: () => applyContextMatching(hunk, content, matchPosition) },
{ name: 'git-fallback', apply: () => applyGitFallback(hunk, content) } { name: "git-fallback", apply: () => applyGitFallback(hunk, content) },
]; ]
// Try strategies sequentially until one succeeds // 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 >= confidenceThreshold) { if (result.confidence >= confidenceThreshold) {
return result; return result
} }
} }
return { confidence: 0, result: content, strategy: 'none' }; return { confidence: 0, result: content, strategy: "none" }
} }