MCPcopy Create free account
hub / github.com/bigcode-project/jupytercoder / mutualChange

Function mutualChange

src/diff.js:1309–1337  ·  view source on GitHub ↗
(hunk, mine, their)

Source from the content-addressed store, hash-verified

1307 }
1308
1309 function mutualChange(hunk, mine, their) {
1310 var myChanges = collectChange(mine),
1311 theirChanges = collectChange(their);
1312
1313 if (allRemoves(myChanges) && allRemoves(theirChanges)) {
1314 // Special case for remove changes that are supersets of one another
1315 if (arrayStartsWith(myChanges, theirChanges) && skipRemoveSuperset(their, myChanges, myChanges.length - theirChanges.length)) {
1316 var _hunk$lines3;
1317
1318 (_hunk$lines3 = hunk.lines).push.apply(_hunk$lines3, _toConsumableArray(myChanges));
1319
1320 return;
1321 } else if (arrayStartsWith(theirChanges, myChanges) && skipRemoveSuperset(mine, theirChanges, theirChanges.length - myChanges.length)) {
1322 var _hunk$lines4;
1323
1324 (_hunk$lines4 = hunk.lines).push.apply(_hunk$lines4, _toConsumableArray(theirChanges));
1325
1326 return;
1327 }
1328 } else if (arrayEqual(myChanges, theirChanges)) {
1329 var _hunk$lines5;
1330
1331 (_hunk$lines5 = hunk.lines).push.apply(_hunk$lines5, _toConsumableArray(myChanges));
1332
1333 return;
1334 }
1335
1336 conflict(hunk, myChanges, theirChanges);
1337 }
1338
1339 function removal(hunk, mine, their, swap) {
1340 var myChanges = collectChange(mine),

Callers 1

mergeLinesFunction · 0.85

Calls 7

collectChangeFunction · 0.85
allRemovesFunction · 0.85
arrayStartsWithFunction · 0.85
skipRemoveSupersetFunction · 0.85
_toConsumableArrayFunction · 0.85
arrayEqualFunction · 0.85
conflictFunction · 0.85

Tested by

no test coverage detected