make structuredDiffForFile for BitBucketServer the same as the others #1201
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
berlysia
commented
Jan 24, 2022
| chunks: | ||
| diff.hunks && | ||
| diff.hunks.map(hunk => ({ | ||
| content: `@@ -${hunk.sourceLine},${hunk.sourceSpan} +${hunk.destinationLine},${hunk.destinationSpan} @@`, |
Author
There was a problem hiding this comment.
💭 Is that too much? https://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html
Member
There was a problem hiding this comment.
Nah, that looks right enough to me
Comment on lines
+142
to
+178
| oldStart: hunk.sourceLine, | ||
| oldLines: hunk.sourceSpan, | ||
| newStart: hunk.destinationLine, | ||
| newLines: hunk.destinationSpan, | ||
| changes: hunk.segments | ||
| .map(segment => | ||
| segment.lines.map(line => ({ | ||
| type: segmentValues[segment.type] as "add" | "del" | "normal", | ||
| content: line.line, | ||
| sourceLine: line.source, | ||
| destinationLine: line.destination, | ||
| })) | ||
| ) | ||
| .reduce((a, b) => a.concat(b), []), | ||
| .map(segment => { | ||
| const type = segmentValues[segment.type] | ||
| if (type === "add") { | ||
| return segment.lines.map(line => { | ||
| return { | ||
| type, | ||
| add: true as const, | ||
| content: line.line, | ||
| ln: line.destination, | ||
| } | ||
| }) | ||
| } | ||
| if (type === "del") { | ||
| return segment.lines.map(line => { | ||
| return { | ||
| type, | ||
| del: true as const, | ||
| content: line.line, | ||
| ln: line.source, | ||
| } | ||
| }) | ||
| } | ||
| if (type === "normal") { | ||
| return segment.lines.map(line => { | ||
| return { | ||
| type, | ||
| normal: true as const, | ||
| content: line.line, | ||
| ln1: line.source, | ||
| ln2: line.destination, | ||
| } | ||
| }) |
Author
There was a problem hiding this comment.
These transformation is based on https://docs.atlassian.com/bitbucket-server/rest/7.19.3/bitbucket-rest.html#idp261
a4e4035 to
dc54972
Compare
Author
|
|
Member
|
Perfect, all this looks great - thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1200
structuredDiffForFilefor BitBucketServer the same as the othersanyfromStructuredDiff