Skip to content
Navigation Menu
{{ message }}
forked from atom/github
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathpatch-buffer.test.js
More file actions
509 lines (433 loc) · 18.5 KB
/
Copy pathpatch-buffer.test.js
File metadata and controls
509 lines (433 loc) · 18.5 KB
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
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
import dedent from 'dedent-js';
import PatchBuffer from '../../../lib/models/patch/patch-buffer';
import {assertMarkerRanges} from '../../helpers';
describe('PatchBuffer', function() {
let patchBuffer;
beforeEach(function() {
patchBuffer = new PatchBuffer();
patchBuffer.getBuffer().setText(TEXT);
});
it('has simple accessors', function() {
assert.strictEqual(patchBuffer.getBuffer().getText(), TEXT);
assert.deepEqual(patchBuffer.getInsertionPoint().serialize(), [10, 0]);
assert.isDefined(patchBuffer.getLayer('patch'));
});
it('creates and finds markers on specified layers', function() {
const patchMarker = patchBuffer.markRange('patch', [[1, 0], [2, 4]]);
const hunkMarker = patchBuffer.markRange('hunk', [[2, 0], [3, 4]]);
assert.sameDeepMembers(patchBuffer.findMarkers('patch', {}), [patchMarker]);
assert.sameDeepMembers(patchBuffer.findMarkers('hunk', {}), [hunkMarker]);
assert.sameDeepMembers(patchBuffer.findAllMarkers({}), [patchMarker, hunkMarker]);
});
it('clears markers from all layers at once', function() {
patchBuffer.markRange('patch', [[0, 0], [0, 4]]);
patchBuffer.markPosition('hunk', [0, 1]);
patchBuffer.clearAllLayers();
assert.lengthOf(patchBuffer.findMarkers('patch', {}), 0);
assert.lengthOf(patchBuffer.findMarkers('hunk', {}), 0);
});
describe('createSubBuffer', function() {
it('creates a new PatchBuffer containing a subset of the original', function() {
const m0 = patchBuffer.markRange('patch', [[1, 0], [3, 0]]); // before
const m1 = patchBuffer.markRange('hunk', [[2, 0], [4, 2]]); // before, ending at the extraction point
const m2 = patchBuffer.markRange('hunk', [[4, 2], [5, 0]]); // within
const m3 = patchBuffer.markRange('patch', [[6, 0], [7, 1]]); // within
const m4 = patchBuffer.markRange('hunk', [[7, 1], [9, 0]]); // after, starting at the extraction point
const m5 = patchBuffer.markRange('patch', [[8, 0], [10, 0]]); // after
const {patchBuffer: subPatchBuffer, markerMap} = patchBuffer.createSubBuffer([[4, 2], [7, 1]]);
// Original PatchBuffer should not be modified
assert.strictEqual(patchBuffer.getBuffer().getText(), TEXT);
assert.deepEqual(
patchBuffer.findMarkers('patch', {}).map(m => m.getRange().serialize()),
[[[1, 0], [3, 0]], [[6, 0], [7, 1]], [[8, 0], [10, 0]]],
);
assert.deepEqual(
patchBuffer.findMarkers('hunk', {}).map(m => m.getRange().serialize()),
[[[2, 0], [4, 2]], [[4, 2], [5, 0]], [[7, 1], [9, 0]]],
);
assert.deepEqual(m0.getRange().serialize(), [[1, 0], [3, 0]]);
assert.deepEqual(m1.getRange().serialize(), [[2, 0], [4, 2]]);
assert.deepEqual(m2.getRange().serialize(), [[4, 2], [5, 0]]);
assert.deepEqual(m3.getRange().serialize(), [[6, 0], [7, 1]]);
assert.deepEqual(m4.getRange().serialize(), [[7, 1], [9, 0]]);
assert.deepEqual(m5.getRange().serialize(), [[8, 0], [10, 0]]);
assert.isFalse(markerMap.has(m0));
assert.isFalse(markerMap.has(m1));
assert.isFalse(markerMap.has(m4));
assert.isFalse(markerMap.has(m5));
assert.strictEqual(subPatchBuffer.getBuffer().getText(), dedent`
04
0005
0006
0
`);
assert.deepEqual(
subPatchBuffer.findMarkers('hunk', {}).map(m => m.getRange().serialize()),
[[[0, 0], [1, 0]]],
);
assert.deepEqual(
subPatchBuffer.findMarkers('patch', {}).map(m => m.getRange().serialize()),
[[[2, 0], [3, 1]]],
);
assert.deepEqual(markerMap.get(m2).getRange().serialize(), [[0, 0], [1, 0]]);
assert.deepEqual(markerMap.get(m3).getRange().serialize(), [[2, 0], [3, 1]]);
});
it('includes markers that cross into or across the chosen range', function() {
patchBuffer.markRange('patch', [[0, 0], [4, 2]]); // before -> within
patchBuffer.markRange('hunk', [[6, 1], [8, 0]]); // within -> after
patchBuffer.markRange('addition', [[1, 0], [9, 4]]); // before -> after
const {patchBuffer: subPatchBuffer} = patchBuffer.createSubBuffer([[3, 1], [7, 3]]);
assert.strictEqual(subPatchBuffer.getBuffer().getText(), dedent`
003
0004
0005
0006
000
`);
assertMarkerRanges(subPatchBuffer.getLayer('patch'), [[0, 0], [1, 2]]);
assertMarkerRanges(subPatchBuffer.getLayer('hunk'), [[3, 1], [4, 3]]);
assertMarkerRanges(subPatchBuffer.getLayer('addition'), [[0, 0], [4, 3]]);
});
});
describe('extractPatchBuffer', function() {
it('extracts a subset of the buffer and layers as a new PatchBuffer', function() {
const m0 = patchBuffer.markRange('patch', [[1, 0], [3, 0]]); // before
const m1 = patchBuffer.markRange('hunk', [[2, 0], [4, 2]]); // before, ending at the extraction point
const m2 = patchBuffer.markRange('hunk', [[4, 2], [5, 0]]); // within
const m3 = patchBuffer.markRange('patch', [[6, 0], [7, 1]]); // within
const m4 = patchBuffer.markRange('hunk', [[7, 1], [9, 0]]); // after, starting at the extraction point
const m5 = patchBuffer.markRange('patch', [[8, 0], [10, 0]]); // after
const {patchBuffer: subPatchBuffer, markerMap} = patchBuffer.extractPatchBuffer([[4, 2], [7, 1]]);
assert.strictEqual(patchBuffer.getBuffer().getText(), dedent`
0000
0001
0002
0003
00007
0008
0009
`);
assert.deepEqual(
patchBuffer.findMarkers('patch', {}).map(m => m.getRange().serialize()),
[[[1, 0], [3, 0]], [[5, 0], [7, 0]]],
);
assert.deepEqual(
patchBuffer.findMarkers('hunk', {}).map(m => m.getRange().serialize()),
[[[2, 0], [4, 2]], [[4, 2], [6, 0]]],
);
assert.deepEqual(m0.getRange().serialize(), [[1, 0], [3, 0]]);
assert.deepEqual(m1.getRange().serialize(), [[2, 0], [4, 2]]);
assert.isTrue(m2.isDestroyed());
assert.isTrue(m3.isDestroyed());
assert.deepEqual(m4.getRange().serialize(), [[4, 2], [6, 0]]);
assert.deepEqual(m5.getRange().serialize(), [[5, 0], [7, 0]]);
assert.isFalse(markerMap.has(m0));
assert.isFalse(markerMap.has(m1));
assert.isFalse(markerMap.has(m4));
assert.isFalse(markerMap.has(m5));
assert.strictEqual(subPatchBuffer.getBuffer().getText(), dedent`
04
0005
0006
0
`);
assert.deepEqual(
subPatchBuffer.findMarkers('hunk', {}).map(m => m.getRange().serialize()),
[[[0, 0], [1, 0]]],
);
assert.deepEqual(
subPatchBuffer.findMarkers('patch', {}).map(m => m.getRange().serialize()),
[[[2, 0], [3, 1]]],
);
assert.deepEqual(markerMap.get(m2).getRange().serialize(), [[0, 0], [1, 0]]);
assert.deepEqual(markerMap.get(m3).getRange().serialize(), [[2, 0], [3, 1]]);
});
it("does not destroy excluded markers at the extraction range's boundaries", function() {
const before0 = patchBuffer.markRange('patch', [[2, 0], [2, 0]]);
const before1 = patchBuffer.markRange('patch', [[2, 0], [2, 0]]);
const within0 = patchBuffer.markRange('patch', [[2, 0], [2, 1]]);
const within1 = patchBuffer.markRange('patch', [[3, 0], [3, 4]]);
const within2 = patchBuffer.markRange('patch', [[4, 0], [4, 0]]);
const after0 = patchBuffer.markRange('patch', [[4, 0], [4, 0]]);
const after1 = patchBuffer.markRange('patch', [[4, 0], [4, 0]]);
const {patchBuffer: subPatchBuffer, markerMap} = patchBuffer.extractPatchBuffer([[2, 0], [4, 0]], {
exclude: new Set([before0, before1, after0, after1]),
});
assert.strictEqual(patchBuffer.getBuffer().getText(), dedent`
0000
0001
0004
0005
0006
0007
0008
0009
`);
assert.deepEqual(
patchBuffer.findMarkers('patch', {}).map(m => m.getRange().serialize()),
[[[2, 0], [2, 0]], [[2, 0], [2, 0]], [[2, 0], [2, 0]], [[2, 0], [2, 0]]],
);
assert.strictEqual(subPatchBuffer.getBuffer().getText(), dedent`
0002
0003
`);
assert.deepEqual(
subPatchBuffer.findMarkers('patch', {}).map(m => m.getRange().serialize()),
[[[0, 0], [0, 1]], [[1, 0], [1, 4]], [[2, 0], [2, 0]]],
);
assert.isFalse(markerMap.has(before0));
assert.isFalse(markerMap.has(before1));
assert.isTrue(markerMap.has(within0));
assert.isTrue(markerMap.has(within1));
assert.isTrue(markerMap.has(within2));
assert.isFalse(markerMap.has(after0));
assert.isFalse(markerMap.has(after1));
assert.isFalse(before0.isDestroyed());
assert.isFalse(before1.isDestroyed());
assert.isTrue(within0.isDestroyed());
assert.isTrue(within1.isDestroyed());
assert.isTrue(within2.isDestroyed());
assert.isFalse(after0.isDestroyed());
assert.isFalse(after1.isDestroyed());
});
});
describe('deleteLastNewline', function() {
it('is a no-op on an empty buffer', function() {
const empty = new PatchBuffer();
assert.strictEqual(empty.getBuffer().getText(), '');
empty.deleteLastNewline();
assert.strictEqual(empty.getBuffer().getText(), '');
});
it('is a no-op if the buffer does not end with a newline', function() {
const endsWithoutNL = new PatchBuffer();
endsWithoutNL.getBuffer().setText('0\n1\n2\n3');
endsWithoutNL.deleteLastNewline();
assert.strictEqual(endsWithoutNL.getBuffer().getText(), '0\n1\n2\n3');
});
it('deletes the final newline', function() {
const endsWithNL = new PatchBuffer();
endsWithNL.getBuffer().setText('0\n1\n2\n3\n');
endsWithNL.deleteLastNewline();
assert.strictEqual(endsWithNL.getBuffer().getText(), '0\n1\n2\n3');
});
it('deletes at most one trailing newline', function() {
const endsWithMultiNL = new PatchBuffer();
endsWithMultiNL.getBuffer().setText('0\n1\n2\n3\n\n\n');
endsWithMultiNL.deleteLastNewline();
assert.strictEqual(endsWithMultiNL.getBuffer().getText(), '0\n1\n2\n3\n\n');
});
});
describe('adopt', function() {
it('destroys existing content and markers and replaces them with those from the argument', function() {
const original = new PatchBuffer();
original.getBuffer().setText(dedent`
before 0
before 1
before 2
`);
const originalMarkers = [
original.markRange('patch', [[0, 0], [2, 3]]),
original.markRange('patch', [[1, 3], [2, 0]]),
original.markRange('hunk', [[0, 0], [0, 7]]),
];
const adoptee = new PatchBuffer();
adoptee.getBuffer().setText(dedent`
after 0
after 1
after 2
after 3
`);
const adopteeMarkers = [
adoptee.markRange('addition', [[2, 0], [3, 7]]),
adoptee.markRange('patch', [[1, 0], [2, 0]]),
];
const map = original.adopt(adoptee);
assert.strictEqual(original.getBuffer().getText(), dedent`
after 0
after 1
after 2
after 3
`);
assert.sameDeepMembers(
original.findMarkers('patch', {}).map(m => m.getRange().serialize()),
[[[1, 0], [2, 0]]],
);
assert.sameDeepMembers(
original.findMarkers('addition', {}).map(m => m.getRange().serialize()),
[[[2, 0], [3, 7]]],
);
assert.lengthOf(original.findMarkers('hunk', {}), 0);
for (const originalMarker of originalMarkers) {
assert.isFalse(map.has(originalMarker));
assert.isTrue(originalMarker.isDestroyed());
}
for (const adopteeMarker of adopteeMarkers) {
assert.isTrue(map.has(adopteeMarker));
assert.isFalse(adopteeMarker.isDestroyed());
assert.isFalse(map.get(adopteeMarker).isDestroyed());
assert.deepEqual(adopteeMarker.getRange().serialize(), map.get(adopteeMarker).getRange().serialize());
}
});
});
describe('deferred-marking modifications', function() {
it('performs multiple modifications and only creates markers at the end', function() {
const inserter = patchBuffer.createInserterAtEnd();
const cb0 = sinon.spy();
const cb1 = sinon.spy();
const cb2 = sinon.spy();
inserter.markWhile('addition', () => {
inserter.insert('0010\n');
inserter.insertMarked('0011\n', 'patch', {invalidate: 'never', callback: cb0});
inserter.insert('0012\n');
inserter.insertMarked('0013\n0014\n', 'hunk', {invalidate: 'surround', callback: cb1});
}, {invalidate: 'never', callback: cb2});
assert.strictEqual(patchBuffer.getBuffer().getText(), dedent`
${TEXT}0010
0011
0012
0013
0014
`);
assert.isFalse(cb0.called);
assert.isFalse(cb1.called);
assert.isFalse(cb2.called);
assert.lengthOf(patchBuffer.findMarkers('addition', {}), 0);
assert.lengthOf(patchBuffer.findMarkers('patch', {}), 0);
assert.lengthOf(patchBuffer.findMarkers('hunk', {}), 0);
inserter.apply();
assert.lengthOf(patchBuffer.findMarkers('patch', {}), 1);
const [marker0] = patchBuffer.findMarkers('patch', {});
assert.isTrue(cb0.calledWith(marker0));
assert.lengthOf(patchBuffer.findMarkers('hunk', {}), 1);
const [marker1] = patchBuffer.findMarkers('hunk', {});
assert.isTrue(cb1.calledWith(marker1));
assert.lengthOf(patchBuffer.findMarkers('addition', {}), 1);
const [marker2] = patchBuffer.findMarkers('addition', {});
assert.isTrue(cb2.calledWith(marker2));
});
it('inserts into the middle of an existing buffer', function() {
const inserter = patchBuffer.createInserterAt([4, 2]);
const callback = sinon.spy();
inserter.insert('aa\nbbbb\n');
inserter.insertMarked('-patch-\n-patch-\n', 'patch', {callback});
inserter.insertMarked('-hunk-\ndd', 'hunk', {});
assert.strictEqual(patchBuffer.getBuffer().getText(), dedent`
0000
0001
0002
0003
00aa
bbbb
-patch-
-patch-
-hunk-
dd04
0005
0006
0007
0008
0009
`);
assert.lengthOf(patchBuffer.findMarkers('patch', {}), 0);
assert.lengthOf(patchBuffer.findMarkers('hunk', {}), 0);
assert.isFalse(callback.called);
inserter.apply();
assert.lengthOf(patchBuffer.findMarkers('patch', {}), 1);
const [marker] = patchBuffer.findMarkers('patch', {});
assert.isTrue(callback.calledWith(marker));
});
it('preserves markers that should be before or after the modification region', function() {
const invalidBefore = patchBuffer.markRange('patch', [[1, 0], [1, 0]]);
const before0 = patchBuffer.markRange('patch', [[1, 0], [4, 0]], {exclusive: true});
const before1 = patchBuffer.markRange('hunk', [[4, 0], [4, 0]], {exclusive: true});
const before2 = patchBuffer.markRange('addition', [[3, 0], [4, 0]], {exclusive: true, reversed: true});
const before3 = patchBuffer.markRange('nonewline', [[4, 0], [4, 0]], {exclusive: true, reversed: true});
const after0 = patchBuffer.markPosition('patch', [4, 0], {exclusive: true});
const after1 = patchBuffer.markRange('patch', [[4, 0], [4, 3]], {exclusive: true});
const after2 = patchBuffer.markRange('deletion', [[4, 0], [5, 0]], {exclusive: true, reversed: true});
const after3 = patchBuffer.markRange('nonewline', [[4, 0], [4, 0]], {exclusive: true, reversed: true});
const invalidAfter = patchBuffer.markRange('hunk', [[5, 0], [6, 0]]);
const inserter = patchBuffer.createInserterAt([4, 0]);
inserter.keepBefore([before0, before1, before2, before3, invalidBefore]);
inserter.keepAfter([after0, after1, after2, after3, invalidAfter]);
let marker = null;
const callback = m => { marker = m; };
inserter.insertMarked('A\nB\nC\nD\nE\n', 'addition', {callback});
inserter.apply();
assert.deepEqual(before0.getRange().serialize(), [[1, 0], [4, 0]]);
assert.deepEqual(before1.getRange().serialize(), [[4, 0], [4, 0]]);
assert.deepEqual(before2.getRange().serialize(), [[3, 0], [4, 0]]);
assert.deepEqual(before3.getRange().serialize(), [[4, 0], [4, 0]]);
assert.deepEqual(marker.getRange().serialize(), [[4, 0], [9, 0]]);
assert.deepEqual(after0.getRange().serialize(), [[9, 0], [9, 0]]);
assert.deepEqual(after1.getRange().serialize(), [[9, 0], [9, 3]]);
assert.deepEqual(after2.getRange().serialize(), [[9, 0], [10, 0]]);
assert.deepEqual(after3.getRange().serialize(), [[9, 0], [9, 0]]);
assert.deepEqual(invalidBefore.getRange().serialize(), [[1, 0], [1, 0]]);
assert.deepEqual(invalidAfter.getRange().serialize(), [[10, 0], [11, 0]]);
});
it('appends another PatchBuffer at its insertion point', function() {
const subPatchBuffer = new PatchBuffer();
subPatchBuffer.getBuffer().setText(dedent`
aaaa
bbbb
cc
`);
const m0 = subPatchBuffer.markPosition('patch', [0, 0]);
const m1 = subPatchBuffer.markRange('hunk', [[0, 0], [1, 4]]);
const m2 = subPatchBuffer.markRange('addition', [[1, 2], [2, 2]]);
const mBefore = patchBuffer.markRange('deletion', [[0, 0], [2, 0]]);
const mAfter = patchBuffer.markRange('deletion', [[7, 0], [7, 4]]);
let markerMap;
patchBuffer
.createInserterAt([3, 2])
.insertPatchBuffer(subPatchBuffer, {callback: m => { markerMap = m; }})
.apply();
assert.strictEqual(patchBuffer.getBuffer().getText(), dedent`
0000
0001
0002
00aaaa
bbbb
cc03
0004
0005
0006
0007
0008
0009
`);
assert.deepEqual(mBefore.getRange().serialize(), [[0, 0], [2, 0]]);
assert.deepEqual(mAfter.getRange().serialize(), [[9, 0], [9, 4]]);
assert.isFalse(markerMap.has(mBefore));
assert.isFalse(markerMap.has(mAfter));
assert.deepEqual(
patchBuffer.findMarkers('patch', {}).map(m => m.getRange().serialize()),
[[[3, 2], [3, 2]]],
);
assert.deepEqual(
patchBuffer.findMarkers('hunk', {}).map(m => m.getRange().serialize()),
[[[3, 2], [4, 4]]],
);
assert.deepEqual(
patchBuffer.findMarkers('addition', {}).map(m => m.getRange().serialize()),
[[[4, 2], [5, 2]]],
);
assert.deepEqual(markerMap.get(m0).getRange().serialize(), [[3, 2], [3, 2]]);
assert.deepEqual(markerMap.get(m1).getRange().serialize(), [[3, 2], [4, 4]]);
assert.deepEqual(markerMap.get(m2).getRange().serialize(), [[4, 2], [5, 2]]);
});
});
});
const TEXT = dedent`
0000
0001
0002
0003
0004
0005
0006
0007
0008
0009
`;
You can’t perform that action at this time.