-
Notifications
You must be signed in to change notification settings - Fork 4.7k
/
diff.go
172 lines (148 loc) · 3.98 KB
/
diff.go
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package diff
import (
"bytes"
"strings"
"github.com/sergi/go-diff/diffmatchpatch"
"k8s.io/klog/v2"
)
func FormatDiff(lString, rString string) string {
results := buildDiffLines(lString, rString)
return renderText(results, 2)
}
func renderText(results []lineRecord, context int) string {
keep := make([]bool, len(results))
for i := range results {
if results[i].Type == diffmatchpatch.DiffEqual {
continue
}
for j := i - context; j <= i+context; j++ {
if j >= 0 && j < len(keep) {
keep[j] = true
}
}
}
var b bytes.Buffer
wroteSkip := false
for i := range results {
if !keep[i] {
if !wroteSkip {
b.WriteString("...\n")
wroteSkip = true
}
continue
}
switch results[i].Type {
case diffmatchpatch.DiffDelete:
b.WriteString("- ")
case diffmatchpatch.DiffInsert:
b.WriteString("+ ")
case diffmatchpatch.DiffEqual:
b.WriteString(" ")
}
b.WriteString(results[i].Line)
b.WriteString("\n")
wroteSkip = false
}
return b.String()
}
type lineRecord struct {
Type diffmatchpatch.Operation
Line string
}
func buildDiffLines(lString, rString string) []lineRecord {
dmp := diffmatchpatch.New()
diffs := dmp.DiffMain(lString, rString, false)
// We do need to cleanup, as otherwise we get some spurious changes on complex diffs
diffs = dmp.DiffCleanupSemantic(diffs)
var l, r string
var results []lineRecord
for _, diff := range diffs {
lines := strings.Split(diff.Text, "\n")
switch diff.Type {
case diffmatchpatch.DiffInsert:
if len(lines) > 0 {
r += lines[0]
if len(lines) > 1 {
results = append(results, lineRecord{Type: diffmatchpatch.DiffInsert, Line: r})
r = ""
}
}
for i := 1; i < len(lines)-1; i++ {
line := lines[i]
results = append(results, lineRecord{Type: diffmatchpatch.DiffInsert, Line: line})
}
if len(lines) > 1 {
r = lines[len(lines)-1]
}
case diffmatchpatch.DiffDelete:
if len(lines) > 0 {
l += lines[0]
if len(lines) > 1 {
results = append(results, lineRecord{Type: diffmatchpatch.DiffDelete, Line: l})
l = ""
}
}
for i := 1; i < len(lines)-1; i++ {
line := lines[i]
results = append(results, lineRecord{Type: diffmatchpatch.DiffDelete, Line: line})
}
if len(lines) > 1 {
l = lines[len(lines)-1]
}
case diffmatchpatch.DiffEqual:
if len(lines) == 1 {
l += lines[0]
r += lines[0]
}
if len(lines) > 1 {
if l != "" || r != "" {
l += lines[0]
r += lines[0]
} else {
results = append(results, lineRecord{Type: diffmatchpatch.DiffEqual, Line: lines[0]})
}
if r != "" {
results = append(results, lineRecord{Type: diffmatchpatch.DiffInsert, Line: r})
r = ""
}
if l != "" {
results = append(results, lineRecord{Type: diffmatchpatch.DiffDelete, Line: l})
l = ""
}
}
for i := 1; i < len(lines)-1; i++ {
line := lines[i]
results = append(results, lineRecord{Type: diffmatchpatch.DiffEqual, Line: line})
}
if len(lines) > 1 {
l = lines[len(lines)-1]
r = lines[len(lines)-1]
}
default:
klog.Fatalf("unexpected dmp type: %v", diff.Type)
}
}
if l != "" && l == r {
results = append(results, lineRecord{Type: diffmatchpatch.DiffEqual, Line: l})
} else {
if l != "" {
results = append(results, lineRecord{Type: diffmatchpatch.DiffDelete, Line: l})
}
if r != "" {
results = append(results, lineRecord{Type: diffmatchpatch.DiffInsert, Line: r})
}
}
return results
}