UniqAI/bolt.diy
1
0
Fork 0
mirror of https://github.com/stackblitz-labs/bolt.diy synced 2025-06-26 18:26:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(diff): always produce minimal patch

Browse Source
This commit is contained in:
vgcman16 2025-06-05 20:45:30 -05:00
parent 88aec9654e
commit c9f79eca98
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/utils/diff.ts
View File

@ -35,14 +35,9 @@ export function computeFileModifications(files: FileMap, modifiedFiles: Map<stri
hasModifiedFiles = true; hasModifiedFiles = true;
if (unifiedDiff.length > file.content.length) { // always send a diff so that only the changed lines are rewritten
// if there are lots of changes we simply grab the current file content since it's smaller than the diff
modifications[filePath] = { type: 'file', content: file.content };
} else {
// otherwise we use the diff since it's smaller
modifications[filePath] = { type: 'diff', content: unifiedDiff }; modifications[filePath] = { type: 'diff', content: unifiedDiff };
} }
}
if (!hasModifiedFiles) { if (!hasModifiedFiles) {
return undefined; return undefined;
@ -59,7 +54,8 @@ export function computeFileModifications(files: FileMap, modifiedFiles: Map<stri
* @see https://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html * @see https://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html
*/ */
export function diffFiles(fileName: string, oldFileContent: string, newFileContent: string) { export function diffFiles(fileName: string, oldFileContent: string, newFileContent: string) {
let unifiedDiff = createTwoFilesPatch(fileName, fileName, oldFileContent, newFileContent); // use 0 lines of context to keep the diff as small as possible
let unifiedDiff = createTwoFilesPatch(fileName, fileName, oldFileContent, newFileContent, '', '', { context: 0 });
const patchHeaderEnd = `--- ${fileName}\n+++ ${fileName}\n`; const patchHeaderEnd = `--- ${fileName}\n+++ ${fileName}\n`;
const headerEndIndex = unifiedDiff.indexOf(patchHeaderEnd); const headerEndIndex = unifiedDiff.indexOf(patchHeaderEnd);