Skip to content

Commit 9a85f7e

Browse files
yeonjuanyeonjuan
authored
feat: handle conflict (#8)
* fix: handle conflict diff * feat: change range prop name
1 parent 7ad7dbc commit 9a85f7e

File tree

10 files changed

+248
-68
lines changed

10 files changed

+248
-68
lines changed

‎src/__fixtures__/conflict-file‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --cc README.md
2+
index 2445f65,f4b8569..0000000
3+
--- a/README.md
4+
+++ b/README.md
5+
@@@ -8,7 -8,7 +8,11 @@@
6+
npm install parse-git-diff
7+
```
8+
9+
++<<<<<<< HEAD
10+
+## a
11+
++=======
12+
+ ## b
13+
++>>>>>>> branch-b
14+
15+
- [demo](https://yeonjuan.github.io/parse-git-diff/)
16+
17+

‎src/__tests__/__snapshots__/all.test.ts.snap‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Object {
1919
"type": "DeletedLine",
2020
},
2121
],
22-
"rangeAfter": Object {
23-
"lines": 1,
22+
"fromFileRange": Object {
23+
"lines": 2,
2424
"start": 1,
2525
},
26-
"rangeBefore": Object {
27-
"lines": 2,
26+
"toFileRange": Object {
27+
"lines": 1,
2828
"start": 1,
2929
},
3030
"type": "Chunk",
@@ -43,14 +43,14 @@ Object {
4343
"type": "DeletedLine",
4444
},
4545
],
46-
"rangeAfter": Object {
47-
"lines": 0,
48-
"start": 0,
49-
},
50-
"rangeBefore": Object {
46+
"fromFileRange": Object {
5147
"lines": 1,
5248
"start": 1,
5349
},
50+
"toFileRange": Object {
51+
"lines": 0,
52+
"start": 0,
53+
},
5454
"type": "Chunk",
5555
},
5656
],
@@ -67,14 +67,14 @@ Object {
6767
"type": "AddedLine",
6868
},
6969
],
70-
"rangeAfter": Object {
71-
"lines": 1,
72-
"start": 1,
73-
},
74-
"rangeBefore": Object {
70+
"fromFileRange": Object {
7571
"lines": 0,
7672
"start": 0,
7773
},
74+
"toFileRange": Object {
75+
"lines": 1,
76+
"start": 1,
77+
},
7878
"type": "Chunk",
7979
},
8080
],
@@ -97,12 +97,12 @@ Object {
9797
"type": "AddedLine",
9898
},
9999
],
100-
"rangeAfter": Object {
101-
"lines": 2,
100+
"fromFileRange": Object {
101+
"lines": 1,
102102
"start": 1,
103103
},
104-
"rangeBefore": Object {
105-
"lines": 1,
104+
"toFileRange": Object {
105+
"lines": 2,
106106
"start": 1,
107107
},
108108
"type": "Chunk",

‎src/__tests__/__snapshots__/conflict-file.test.ts.snap‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`conflict-file parse \`conflict-file\` 1`] = `
4+
Object {
5+
"files": Array [
6+
Object {
7+
"chunks": Array [
8+
Object {
9+
"changes": Array [
10+
Object {
11+
"content": " npm install parse-git-diff",
12+
"lineAfter": 8,
13+
"lineBefore": 8,
14+
"type": "UnchangedLine",
15+
},
16+
Object {
17+
"content": " \`\`\`",
18+
"lineAfter": 9,
19+
"lineBefore": 9,
20+
"type": "UnchangedLine",
21+
},
22+
Object {
23+
"content": " ",
24+
"lineAfter": 10,
25+
"lineBefore": 10,
26+
"type": "UnchangedLine",
27+
},
28+
Object {
29+
"content": "+<<<<<<< HEAD",
30+
"lineAfter": 11,
31+
"type": "AddedLine",
32+
},
33+
Object {
34+
"content": "+## a",
35+
"lineAfter": 12,
36+
"lineBefore": 11,
37+
"type": "UnchangedLine",
38+
},
39+
Object {
40+
"content": "+=======",
41+
"lineAfter": 13,
42+
"type": "AddedLine",
43+
},
44+
Object {
45+
"content": " ## b",
46+
"lineAfter": 14,
47+
"type": "AddedLine",
48+
},
49+
Object {
50+
"content": "+>>>>>>> branch-b",
51+
"lineAfter": 15,
52+
"type": "AddedLine",
53+
},
54+
Object {
55+
"content": " ",
56+
"lineAfter": 16,
57+
"lineBefore": 12,
58+
"type": "UnchangedLine",
59+
},
60+
Object {
61+
"content": " - [demo](https://yeonjuan.github.io/parse-git-diff/)",
62+
"lineAfter": 17,
63+
"lineBefore": 13,
64+
"type": "UnchangedLine",
65+
},
66+
Object {
67+
"content": " ",
68+
"lineAfter": 18,
69+
"lineBefore": 14,
70+
"type": "UnchangedLine",
71+
},
72+
Object {
73+
"content": " ",
74+
"lineAfter": 19,
75+
"lineBefore": 15,
76+
"type": "UnchangedLine",
77+
},
78+
],
79+
"fromFileRangeA": Object {
80+
"lines": 7,
81+
"start": 8,
82+
},
83+
"fromFileRangeB": Object {
84+
"lines": 7,
85+
"start": 8,
86+
},
87+
"toFileRange": Object {
88+
"lines": 11,
89+
"start": 8,
90+
},
91+
"type": "CombinedChunk",
92+
},
93+
],
94+
"path": "README.md",
95+
"type": "ChangedFile",
96+
},
97+
],
98+
"type": "GitDiff",
99+
}
100+
`;

‎src/__tests__/__snapshots__/deleted-file.test.ts.snap‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ Object {
1313
"type": "DeletedLine",
1414
},
1515
],
16-
"rangeAfter": Object {
17-
"lines": 0,
18-
"start": 0,
19-
},
20-
"rangeBefore": Object {
16+
"fromFileRange": Object {
2117
"lines": 1,
2218
"start": 1,
2319
},
20+
"toFileRange": Object {
21+
"lines": 0,
22+
"start": 0,
23+
},
2424
"type": "Chunk",
2525
},
2626
],

‎src/__tests__/__snapshots__/deleted-line.test.ts.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Object {
1919
"type": "DeletedLine",
2020
},
2121
],
22-
"rangeAfter": Object {
23-
"lines": 1,
22+
"fromFileRange": Object {
23+
"lines": 2,
2424
"start": 1,
2525
},
26-
"rangeBefore": Object {
27-
"lines": 2,
26+
"toFileRange": Object {
27+
"lines": 1,
2828
"start": 1,
2929
},
3030
"type": "Chunk",

‎src/__tests__/__snapshots__/new-file.test.ts.snap‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ Object {
1313
"type": "AddedLine",
1414
},
1515
],
16-
"rangeAfter": Object {
17-
"lines": 1,
18-
"start": 1,
19-
},
20-
"rangeBefore": Object {
16+
"fromFileRange": Object {
2117
"lines": 0,
2218
"start": 0,
2319
},
20+
"toFileRange": Object {
21+
"lines": 1,
22+
"start": 1,
23+
},
2424
"type": "Chunk",
2525
},
2626
],

‎src/__tests__/__snapshots__/new-line.test.ts.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Object {
1919
"type": "AddedLine",
2020
},
2121
],
22-
"rangeAfter": Object {
23-
"lines": 2,
22+
"fromFileRange": Object {
23+
"lines": 1,
2424
"start": 1,
2525
},
26-
"rangeBefore": Object {
27-
"lines": 1,
26+
"toFileRange": Object {
27+
"lines": 2,
2828
"start": 1,
2929
},
3030
"type": "Chunk",

‎src/__tests__/conflict-file.test.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { getFixture } from './test-utils';
2+
import parseGitDiff from '../parse-git-diff';
3+
4+
describe('conflict-file', () => {
5+
const fixture = getFixture('conflict-file');
6+
7+
it('parse `conflict-file`', () => {
8+
expect(parseGitDiff(fixture)).toMatchSnapshot();
9+
});
10+
});

0 commit comments

Comments
 (0)