Skip to content

Commit d35e6e6

Browse files
committed
Add formatter uncompleted
1 parent cb39487 commit d35e6e6

File tree

8 files changed

+393
-127
lines changed

8 files changed

+393
-127
lines changed

cmd/gendiff/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
code "code/src"
4+
"code/src"
55
"context"
66
"fmt"
77
"log"
@@ -30,7 +30,7 @@ func main() {
3030
path2 = cmd.Args().Get(1)
3131
}
3232
format := cmd.String("format")
33-
str, err := code.GenDiff(path1, path2, format)
33+
str, err := src.GenDiff(path1, path2, format)
3434
if err != nil {
3535
log.Println(err)
3636
}

compare.json

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
[
2+
{
3+
"Message": "",
4+
"DifTest": {
5+
"common": [
6+
{
7+
"Message": " # Добавлена",
8+
"DifTest": {
9+
"follow": false
10+
}
11+
},
12+
{
13+
"Message": "",
14+
"DifTest": {
15+
"setting1": "Value 1"
16+
}
17+
},
18+
{
19+
"Message": " # Удалена",
20+
"DifTest": {
21+
"setting2": 200
22+
}
23+
},
24+
{
25+
"Message": " # Старое значение",
26+
"DifTest": {
27+
"setting3": true
28+
}
29+
},
30+
{
31+
"Message": " # Новое значение",
32+
"DifTest": {
33+
"setting3": null
34+
}
35+
},
36+
{
37+
"Message": " # Добавлена",
38+
"DifTest": {
39+
"setting4": "blah blah"
40+
}
41+
},
42+
{
43+
"Message": " # Добавлена",
44+
"DifTest": {
45+
"setting5": {
46+
"key5": "value5"
47+
}
48+
}
49+
},
50+
{
51+
"Message": "",
52+
"DifTest": {
53+
"setting6": [
54+
{
55+
"Message": "",
56+
"DifTest": {
57+
"doge": [
58+
{
59+
"Message": " # Старое значение",
60+
"DifTest": {
61+
"wow": ""
62+
}
63+
},
64+
{
65+
"Message": " # Новое значение",
66+
"DifTest": {
67+
"wow": "so much"
68+
}
69+
}
70+
]
71+
}
72+
},
73+
{
74+
"Message": "",
75+
"DifTest": {
76+
"key": "value"
77+
}
78+
},
79+
{
80+
"Message": " # Добавлена",
81+
"DifTest": {
82+
"ops": "vops"
83+
}
84+
}
85+
]
86+
}
87+
}
88+
]
89+
}
90+
},
91+
{
92+
"Message": "",
93+
"DifTest": {
94+
"group1": [
95+
{
96+
"Message": " # Старое значение",
97+
"DifTest": {
98+
"baz": "bas"
99+
}
100+
},
101+
{
102+
"Message": " # Новое значение",
103+
"DifTest": {
104+
"baz": "bars"
105+
}
106+
},
107+
{
108+
"Message": "",
109+
"DifTest": {
110+
"foo": "bar"
111+
}
112+
},
113+
{
114+
"Message": " # Старое значение",
115+
"DifTest": {
116+
"nest": {
117+
"key": "value"
118+
}
119+
}
120+
},
121+
{
122+
"Message": " # Новое значение",
123+
"DifTest": {
124+
"nest": "str"
125+
}
126+
}
127+
]
128+
}
129+
},
130+
{
131+
"Message": " # Удалена",
132+
"DifTest": {
133+
"group2": {
134+
"abc": 12345,
135+
"deep": {
136+
"id": 45
137+
}
138+
}
139+
}
140+
},
141+
{
142+
"Message": " # Добавлена",
143+
"DifTest": {
144+
"group3": {
145+
"deep": {
146+
"id": {
147+
"number": 45
148+
}
149+
},
150+
"fee": 100500
151+
}
152+
}
153+
}
154+
]

src/compare.go

Lines changed: 0 additions & 115 deletions
This file was deleted.

0 commit comments

Comments
 (0)