gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-10-27 21:53:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix vbranch file contents to include deltas

Browse Source
This commit is contained in:
Kiril Videlov 2023-07-14 13:05:20 +02:00 committed by Kiril Videlov
parent 556db1290d
commit 61a4695194
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/vbranches/branchStoresCache.ts
View File

@ -1,5 +1,6 @@
import { writable, type Loadable, Loaded } from 'svelte-loadable-store';
import type { Session } from '$lib/api';
import type { Session, Delta } from '$lib/api';
import { Operation } from '$lib/api';
import type { Readable } from '@square/svelte-store';
import { git } from '$lib/api/ipc';
import { stores } from '$lib';
@ -114,16 +115,38 @@ async function branchesWithFileContent(projectId: string, sessionId: string, bra
.map((branch) => branch.files)
.flat()
.map((file) => file.path);
const fullFiles = await invoke<Record<string, string>>('list_session_files', {
const sessionFiles = await invoke<Record<string, string>>('list_session_files', {
projectId: projectId,
sessionId: sessionId,
paths: filePaths
});
const sessionDeltas = await invoke<Record<string, Delta[]>>('list_deltas', {
projectId: projectId,
sessionId: sessionId,
paths: filePaths
});
const branchesWithContnent = branches.map((branch) => {
branch.files.map((file) => {
file.content = fullFiles[file.path];
const contentAtSessionStart = sessionFiles[file.path];
const deltas = sessionDeltas[file.path];
file.content = applyDeltas(contentAtSessionStart, deltas);
});
return branch;
});
return branchesWithContnent;
}
function applyDeltas(text: string, deltas: Delta[]) {
if (!deltas) return text;
const operations = deltas.flatMap((delta) => delta.operations);
operations.forEach((operation) => {
if (Operation.isInsert(operation)) {
text =
text.slice(0, operation.insert[0]) + operation.insert[1] + text.slice(operation.insert[0]);
} else if (Operation.isDelete(operation)) {
text =
text.slice(0, operation.delete[0]) + text.slice(operation.delete[0] + operation.delete[1]);
}
});
return text;
}