-
Notifications
You must be signed in to change notification settings - Fork 33
/
Copy pathdiff.jsf
422 lines (323 loc) · 7.07 KB
/
diff.jsf
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
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
# JOE syntax highlight file for diff/patch files
#
# 2007-05-11 :
#
# This file is just udiff.jsf, ndiff.jsf and cdiff.jsf merged together
# into one file, to handle cases where A) it's difficult to tell what
# type of diff might be inside the file to highlight and B) the file to
# highlight may contain hunks of different types of diffs (unlikely).
# Of course it can be used to replace the 3 abovementioned files
# completely. If you want that, you need to edit ftyperc accordingly.
#
# Dirk Schenkewitz <Dirk.Schenkewitz (AT) gmx.de>
#
# Color definitions
=Idle
=Garbage dim white
=DiffCmd blue
=FileOld bold red
=FileNew bold green
=HunkHead bold blue
=HunkMid bold blue
=DelLine red
=AddLine green
=ChgLine magenta
=CtxLine
:reset Idle
* garbage recolor=-1
"\n" reset
"d" garbage buffer recolor=-1 # may be a "diff" command
"-" udiff_o1 # may start a unified diff hunk
"*" cdiff_o1 # may start a context diff hunk
"0-9" ndiff_r0 mark recolor=-1 # may start a "normal" diff hunk
:garbage Garbage
* garbage strings
"diff" diff_cmd recolor=-3
done
"\n" reset
:diff_cmd DiffCmd
* diff_cmd
"\n" reset
#----------------------------------------------
# unified diffs:
:udiff_o1 Idle
* garbage recolor=-2 buffer
"-" udiff_o2
:udiff_o2 Idle
* garbage recolor=-3 buffer
"-" udiff_o3
:udiff_o3 Idle
* garbage recolor=-4 buffer
" " udiff_o4
:udiff_o4 Idle
* udiff_oldf recolor=-5
" " garbage recolor=-5 buffer
:udiff_n0 Idle
* garbage recolor=-1 buffer
"+" udiff_n1
:udiff_n1 Idle
* garbage recolor=-2 buffer
"+" udiff_n2
:udiff_n2 Idle
* garbage recolor=-3 buffer
"+" udiff_n3
:udiff_n3 Idle
* garbage recolor=-4 buffer
" " udiff_newf recolor=-4
:udiff_oldf FileOld
* udiff_oldf
"\n" udiff_n0
:udiff_newf FileNew
* udiff_newf
"\n" udiff_prehunk1
:udiff_prehunk1 Idle
* garbage
"@" udiff_prehunk2
"\n" reset
:udiff_prehunk2 Idle
* garbage recolor=-1
"@" udiff_prehunk3
"\n" reset
:udiff_prehunk3 Idle
* garbage recolor=-1
" " udiff_hunkhead recolor=-3
"\n" reset
:udiff_hunkhead HunkHead
* udiff_hunkhead
"\n" udiff_hunkbody
:udiff_hunkbody Idle
* reset noeat
"d" garbage recolor=-1 buffer
"-" udiff_minus1
"+" udiff_add recolor=-1
" " udiff_ctx recolor=-1
"@" udiff_prehunk2
:udiff_minus1 Idle
* udiff_del noeat recolor=-2
"-" udiff_minus2
:udiff_minus2 Idle
* udiff_del noeat recolor=-3
"-" udiff_minus3
:udiff_minus3 Idle
* udiff_del noeat recolor=-4
" " udiff_minus4
:udiff_minus4 Idle
* udiff_oldf recolor=-5
"\n" udiff_hunkbody
" " udiff_del recolor=-5
:udiff_del DelLine
* udiff_del
"\n" udiff_hunkbody
:udiff_add AddLine
* udiff_add
"\n" udiff_hunkbody
:udiff_ctx CtxLine
* udiff_ctx
"\n" udiff_hunkbody
#----------------------------------------------
# "normal" diffs:
:ndiff_r0 Idle
* garbage noeat recolormark
"0-9" ndiff_r0
"," ndiff_r1
"adc" ndiff_r2
"\n" reset markend
:ndiff_r1 Idle
* garbage recolormark
"0-9" ndiff_r1
"adc" ndiff_r2
"\n" reset markend
:ndiff_r2 Idle
* garbage noeat recolormark
"0-9" ndiff_r2
"," ndiff_r3
"\n" ndiff_re noeat recolormark
:ndiff_r3 Idle
* garbage noeat recolormark
"0-9" ndiff_r3
"\n" ndiff_re noeat recolormark
:ndiff_re HunkHead
"\n" ndiff_hunk0
:ndiff_hunk0 HunkHead
* reset noeat
"<" ndiff_o1
">" ndiff_n1
"\\" ndiff_t1
:ndiff_hunk1 HunkHead
* reset noeat
"<" ndiff_o1
">" ndiff_n1
"-" ndiff_m1 recolor=-1
"\\" ndiff_t1
:ndiff_t1 Idle
* garbage recolor=-3
"\n" reset
" " ndiff_txt recolor=-3
:ndiff_o1 Idle
* garbage recolor=-3
"\n" reset
" " ndiff_del recolor=-3
:ndiff_n1 Idle
* garbage recolor=-3
"\n" reset
" " ndiff_add recolor=-3
:ndiff_txt CtxLine
* ndiff_txt
"\n" ndiff_hunk1
:ndiff_del DelLine
* ndiff_del
"\n" ndiff_hunk1
:ndiff_add AddLine
* ndiff_add
"\n" ndiff_hunk1
:ndiff_m1 Idle
* garbage recolor=-2
"-" ndiff_m2
"\n" reset recolor=-2
:ndiff_m2 Idle
* garbage recolor=-3
"-" ndiff_m3 recolor=-3
:ndiff_m3 HunkMid
* garbage recolor=-4
"\n" ndiff_hunk0
#----------------------------------------------
# context diffs:
:cdiff_o1 Idle
* garbage recolor=-2 buffer
"*" cdiff_o2
:cdiff_o2 Idle
* garbage recolor=-3 buffer
"*" cdiff_o3
:cdiff_o3 Idle
* garbage recolor=-4 buffer
" " cdiff_o4
:cdiff_o4 Idle
* cdiff_oldf recolor=-5
" " garbage recolor=-5 buffer
:cdiff_oldf FileOld
* cdiff_oldf
"\n" cdiff_n0
:cdiff_n0 Idle
* garbage recolor=-1 buffer
"-" cdiff_n1
:cdiff_n1 Idle
* garbage recolor=-2 buffer
"-" cdiff_n2
:cdiff_n2 Idle
* garbage recolor=-3 buffer
"-" cdiff_n3
:cdiff_n3 Idle
* garbage recolor=-4 buffer
" " cdiff_newf recolor=-4
:cdiff_newf FileNew
* cdiff_newf
"\n" cdiff_prehunk0
:cdiff_prehunk0 Idle
* manystars buffer
:manystars Idle
* garbage noeat strings
"***************" cdiff_prehunk1
done
"*" manystars
:cdiff_prehunk1 HunkHead
* cdiff_ho0
:cdiff_ho0 Idle
* garbage recolor=-1 buffer
"*" cdiff_ho1
:cdiff_ho1 Idle
* garbage recolor=-2 buffer
"*" cdiff_ho2
:cdiff_ho2 Idle
* garbage recolor=-3 buffer
"*" cdiff_ho3
:cdiff_ho3 Idle
* garbage recolor=-4 buffer
" " cdiff_ho4 recolor=-4 mark
:cdiff_ho4 HunkHead
* garbage recolormark buffer
"0-9," cdiff_ho4
" " cdiff_ho5 recolormark buffer
"\n" reset markend
:cdiff_ho5 HunkHead
* garbage recolor=-1 buffer
"*" cdiff_ho6
:cdiff_ho6 Idle
* garbage recolor=-2 buffer
"*" cdiff_ho7
:cdiff_ho7 Idle
* garbage recolor=-3 buffer
"*" cdiff_ho8
:cdiff_ho8 Idle
* garbage recolor=-4 buffer
"*" cdiff_ho9 recolor=-4
:cdiff_ho9 HunkHead
* garbage recolor=-5 buffer
"\n" cdiff_hunk
:cdiff_hn0 Idle
* garbage recolor=-1 buffer
"-" cdiff_hn1
:cdiff_hn1 Idle
* garbage recolor=-2 buffer
"-" cdiff_hn2
:cdiff_hn2 Idle
* garbage recolor=-3 buffer
"-" cdiff_hn3
:cdiff_hn3 Idle
* garbage recolor=-4 buffer
" " cdiff_hn4 recolor=-4 mark
:cdiff_hn4 HunkHead
* garbage recolormark buffer
"0-9," cdiff_hn4
" " cdiff_hn5 recolormark buffer
"\n" reset markend
:cdiff_hn5 HunkHead
* garbage recolor=-1 buffer
"-" cdiff_hn6
:cdiff_hn6 Idle
* garbage recolor=-2 buffer
"-" cdiff_hn7
:cdiff_hn7 Idle
* garbage recolor=-3 buffer
"-" cdiff_hn8
:cdiff_hn8 Idle
* garbage recolor=-4 buffer
"-" cdiff_hn9 recolor=-4
:cdiff_hn9 HunkHead
* garbage recolor=-5 buffer
"\n" cdiff_hunk
:cdiff_hunk Idle
* garbage recolor=-1 buffer
" " cdiff_h_c0
"+" cdiff_h_p0
"!" cdiff_h_x0
"-" cdiff_h_m0
"*" manystars buffer
:cdiff_h_c0 Idle
* garbage recolor=-2 buffer
" " cdiff_h_c1 recolor=-2
"\n" reset
:cdiff_h_c1 CtxLine
* cdiff_h_c1
"\n" cdiff_hunk
:cdiff_h_p0 Idle
* garbage recolor=-2 buffer
" " cdiff_h_p1 recolor=-2
"\n" reset
:cdiff_h_p1 AddLine
* cdiff_h_p1
"\n" cdiff_hunk
:cdiff_h_x0 Idle
* garbage recolor=-2 buffer
" " cdiff_h_x1 recolor=-2
"\n" reset
:cdiff_h_x1 ChgLine
* cdiff_h_x1
"\n" cdiff_hunk
:cdiff_h_m0 Idle
* garbage recolor=-2 buffer
" " cdiff_h_m1 recolor=-2
"-" cdiff_hn2 recolor=-2
"\n" reset
:cdiff_h_m1 DelLine
* cdiff_h_m1
"\n" cdiff_hunk