scriptoriumadmin/GitNexus
1
0
Fork 0
mirror of https://github.com/abhigyanpatwari/GitNexus.git synced 2026-09-14 23:22:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix: map deleted files to indexed symbol ranges (#3269)

Browse source 
Co-authored-by: Gergő Magyar <gergomagyar@icloud.com>
This commit is contained in:
Parafee41 2026-09-12 14:14:13 +08:00 • committed by GitHub
parent 75cc8dddbc
commit 68eca0ced8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gitnexus/src/storage/git.ts
View file

@ -964,12 +964,16 @@ export function parseDiffHunksResult(diffOutput: string): DiffHunkParseResult {
// `+++` after the first `@@` of a file is hunk body (`+` plus source text
// that itself starts `++ …`), not another file header.
let inHunk = false;
// A deleted file has no new-side coordinates. Its indexed symbols still use
// the pre-delete file, so map those hunks with the old-side range instead.
let currentFileDeleted = false;
for (const line of diffOutput.split('\n')) {
if (line.startsWith(DIFF_GIT_PREFIX)) {
// Drop the previous file first: an unparsed header must not leave
// `current` live for a later `@@` / quoted `+++` to steal.
current = null;
inHunk = false;
currentFileDeleted = false;
const filePath = filePathFromGitHeader(line);
if (filePath) {
current = { filePath, hunks: [] };
@ -985,6 +989,8 @@ export function parseDiffHunksResult(diffOutput: string): DiffHunkParseResult {
current = { filePath, hunks: [] };
files.push(current);
}
} else if (!inHunk && line === '+++ /dev/null') {
currentFileDeleted = true;
} else if (!inHunk && line.startsWith('+++ ')) {
const filePath = pathFromPlusPlusPlus(line);
if (!filePath) continue;
@ -994,10 +1000,12 @@ export function parseDiffHunksResult(diffOutput: string): DiffHunkParseResult {
}
} else if (line.startsWith('@@') && current) {
inHunk = true;
const match = line.match(/@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/);
const match = line.match(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
if (match) {
const start = parseInt(match[1], 10);
const count = match[2] !== undefined ? parseInt(match[2], 10) : 1;
const sideOffset = currentFileDeleted ? 1 : 3;
const start = parseInt(match[sideOffset], 10);
const rawCount = match[sideOffset + 1];
const count = rawCount !== undefined ? parseInt(rawCount, 10) : 1;
if (count > 0) {
current.hunks.push({ startLine: start, endLine: start + count - 1 });
} else {

14
gitnexus/test/unit/parse-diff-hunks.test.ts
View file

@ -93,6 +93,20 @@ describe('parseDiffHunks', () => {
expect(result[0].hunks).toEqual([{ startLine: 1, endLine: 1 }]);
});
it('maps a whole-file deletion to the old-side range', () => {
const diff = [
'diff --git a/src/deleted.ts b/src/deleted.ts',
'deleted file mode 100644',
'--- a/src/deleted.ts',
'+++ /dev/null',
'@@ -1,9 +0,0 @@',
'-export function removed() {}',
].join('\n');
expect(parseDiffHunks(diff)).toEqual([
{ filePath: 'src/deleted.ts', hunks: [{ startLine: 1, endLine: 9 }] },
]);
});
it('returns empty array for empty diff output', () => {
expect(parseDiffHunks('')).toEqual([]);
});