Not able to parse some diffText

[lomse]

Hi All,
Thanks for this amazing library.
I'm having hard time understanding why it is not able to parse the strings below:

@@ -7,6 +7,9 @@ stages:
 #  - scan
   - deploy
 
+include:
+  - template: depl/config.yml
+
 unit tests:
   image: maven:3-jdk-8
   stage: test

@@ -7,6 +7,9 @@ stages:
 #  - scan
   - deploy
 
+include:
+  - template: depl/config-2.yml
+
 unit tests:
   image: maven:3-jdk-8
   stage: test

I keep getting the error as shown on the screenshot below:

What am I missing please? Below is my implementation

type ChangesProps = {
  diffs: DiffType[]
}

export const Changes: React.FC<ChangesProps> = ({ diffs }) => {

  return (
    <React.Fragment>
      {diffs.map((diffObj, index) => {
        const diffText = diffObj.diff;
        console.log(diffText)
        const files = parseDiff(diffText) // Error thrown here.

        console.log({files})

        const renderFile = ({ oldRevision, newRevision, type, hunks }) => (
          <Diff key={oldRevision + '-' + newRevision} viewType="unified" diffType={type} hunks={hunks}>
            {hunks => hunks.map(hunk => <Hunk key={hunk.content} hunk={hunk} />)}
          </Diff>
        )

        return (
          <div key={index}>
            {files.map(renderFile)}
          </div>
        )
      })}
    </React.Fragment>
  )
}

[lomse]

Any feedback on this issue?

[otakustay]

This should definitely be a bug in our parser, I'll take a look at it tomorrow

[otakustay]

I did a little dig into this issue, this library currently support 2 format of diff.

Git diff:

diff --git a/test/fixture/test/ci.go b/test/fixture/test/ci.go
index 6829b8a2..4c565f1b 100644
--- a/test/fixture/test/ci.go
+++ b/test/fixture/test/ci.go
[content]

Or unidiff:

--- /test/fixture/test/ci.go 2002-02-21 23:30:39.942229878 -0800
+++ /test/fixture/test/ci.go 2002-02-21 23:30:50.442260588 -0800
[content]

Note both of them have some lines of header containing metadata like changed filename, when git diff is not detected, this library assume it as a unidiff and try to parse filenames from header lines, then normalize it to a git diff for further parse.

In your case, the diff text doesn't contain either git diff header nor unidiff header, we cannot detect a filename from it, this causes a malform of normalized diff structure, which raises an error.

I'd receomment you to add a git diff header manually to your diff text, the filename inside it can be mocked to any path like:

const CONTANT_GIT_DIFF_HEADER = `diff --git a/config.yml b/config.yml
index 1111111..2222222 100644
--- a/config.yml
+++ b/config.yml`;

const diffText = CONTENT_GIT_DIFF_HEADER + '\n' + rawDiffText;

[stale]

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.