Single line change parse issue with "normal" chunk headers

[DavisVaughan]

See parkerbxyz/suggest-changes#50 (comment)

The TLDR is that it seems like parse-git-diff can handle @@ -74,2 +74 @@, but for 1 line changes git will omit the ,1 and just report @@ -74 +74 @@ and that causes the regex handling in parse-git-diff to break.

I see the "normal" chunk regex here:

parse-git-diff/src/parse-git-diff.ts

Lines 223 to 224 in e8ed56d

	const normalChunkExec =
	/^@@\s\-(\d+),?(\d+)?\s\+(\d+),?(\d+)?\s@@\s?(.+)?/.exec(line);

Which gets expanded out here:

parse-git-diff/src/parse-git-diff.ts

Lines 268 to 269 in e8ed56d

	const [all, delStart, delLines, addStart, addLines, context] =
	normalChunkExec;

I'm no expert here but I think whats happening is that it has an optional capture group for the ,<digit> which should become delLines, but that's missing here so instead the next capture group actually gets put in as delLines, which happens to be addStart, which is 94, so it reports 94 lines in fromFileRange 😢

[yeonjuan]

Sorry for the late response. I'll make the correction.

[yeonjuan]

Hi @DavisVaughan , It's not reproduced in v0.0.17. Maybe it was fixed in #34?

(updated) I've noticed that it reproduces in 0.0.16 but not in 0.0.17. Updating the version should resolve it.

• input

diff --git a/R/hop2.R b/R/hop2.R
index 7f5e285..2658b32 100644
--- a/R/hop2.R
+++ b/R/hop2.R
@@ -94 +94 @@ hop2_vec <- function(.x, .y, .starts, .stops, .f, ..., .ptype = NULL) {
-  vec_simplify(  out, .ptype)
+  vec_simplify(out, .ptype)

• output

{
  "files": [
    {
      "chunks": [
        {
          "changes": [
            {
              "content": "  vec_simplify(  out, .ptype)",
              "lineBefore": 94,
              "type": "DeletedLine",
            },
            {
              "content": "  vec_simplify(out, .ptype)",
              "lineAfter": 94,
              "type": "AddedLine",
            },
          ],
          "context": "hop2_vec <- function(.x, .y, .starts, .stops, .f, ..., .ptype = NULL) {",
          "fromFileRange": {
            "lines": 1,
            "start": 94,
          },
          "toFileRange": {
            "lines": 1,
            "start": 94,
          },
          "type": "Chunk",
        },
      ],
      "path": "R/hop2.R",
      "type": "ChangedFile",
    },
  ],
  "type": "GitDiff",
}

[DavisVaughan]

Looks like suggest-changes's tag hasn't been updated since October 2024, even though main has incorporated your update. So it will probably resolve there when they do a new release, thanks!