obsidian-plugin/silvanocerza_github-gitless-sync
1
0
Fork 0
mirror of https://github.com/silvanocerza/github-gitless-sync.git synced 2026-07-22 05:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle line numbers greater than document lines number

Browse source
This commit is contained in:
Silvano Cerza 2025-02-20 19:15:56 +01:00
parent 3a7454b86f
commit aae730f0f1
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/views/conflicts-resolution/diff.ts
View file

@ -87,7 +87,21 @@ function diff(oldText: string, newText: string): DiffChunk[] {
}
}
return mergeDiffs(result);
return mergeDiffs(
result.map((chunk) => ({
...chunk,
startLeftLine: clampLine(chunk.startLeftLine, oldLines.length),
endLeftLine: clampLine(chunk.endLeftLine, oldLines.length),
startRightLine: clampLine(chunk.startRightLine, newLines.length),
endRightLine: clampLine(chunk.endRightLine, newLines.length),
})),
);
}
// Use to make sure the line number in the diff chunk doesn't exceed
// the number of lines of the document.
function clampLine(line: number, maxLines: number): number {
return Math.min(Math.max(1, line), maxLines + 1);
}
function mergeDiffs(chunks: DiffChunk[]): DiffChunk[] {