merge.js 29 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795
  1. // CodeMirror, copyright (c) by Marijn Haverbeke and others
  2. // Distributed under an MIT license: http://codemirror.net/LICENSE
  3. // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
  4. (function(mod) {
  5. if (typeof exports == "object" && typeof module == "object") // CommonJS
  6. mod(require("../../lib/codemirror")); // Note non-packaged dependency diff_match_patch
  7. else if (typeof define == "function" && define.amd) // AMD
  8. define(["../../lib/codemirror", "diff_match_patch"], mod);
  9. else // Plain browser env
  10. mod(CodeMirror);
  11. })(function(CodeMirror) {
  12. "use strict";
  13. var Pos = CodeMirror.Pos;
  14. var svgNS = "http://www.w3.org/2000/svg";
  15. function DiffView(mv, type) {
  16. this.mv = mv;
  17. this.type = type;
  18. this.classes = type == "left"
  19. ? {chunk: "CodeMirror-merge-l-chunk",
  20. start: "CodeMirror-merge-l-chunk-start",
  21. end: "CodeMirror-merge-l-chunk-end",
  22. insert: "CodeMirror-merge-l-inserted",
  23. del: "CodeMirror-merge-l-deleted",
  24. connect: "CodeMirror-merge-l-connect"}
  25. : {chunk: "CodeMirror-merge-r-chunk",
  26. start: "CodeMirror-merge-r-chunk-start",
  27. end: "CodeMirror-merge-r-chunk-end",
  28. insert: "CodeMirror-merge-r-inserted",
  29. del: "CodeMirror-merge-r-deleted",
  30. connect: "CodeMirror-merge-r-connect"};
  31. }
  32. DiffView.prototype = {
  33. constructor: DiffView,
  34. init: function(pane, orig, options) {
  35. this.edit = this.mv.edit;
  36. (this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
  37. this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
  38. this.orig.state.diffViews = [this];
  39. var classLocation = options.chunkClassLocation || "background";
  40. if (Object.prototype.toString.call(classLocation) != "[object Array]") classLocation = [classLocation]
  41. this.classes.classLocation = classLocation
  42. this.diff = getDiff(asString(orig), asString(options.value));
  43. this.chunks = getChunks(this.diff);
  44. this.diffOutOfDate = this.dealigned = false;
  45. this.showDifferences = options.showDifferences !== false;
  46. },
  47. registerEvents: function() {
  48. this.forceUpdate = registerUpdate(this);
  49. setScrollLock(this, true, false);
  50. registerScroll(this);
  51. },
  52. setShowDifferences: function(val) {
  53. val = val !== false;
  54. if (val != this.showDifferences) {
  55. this.showDifferences = val;
  56. this.forceUpdate("full");
  57. }
  58. }
  59. };
  60. function ensureDiff(dv) {
  61. if (dv.diffOutOfDate) {
  62. dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
  63. dv.chunks = getChunks(dv.diff);
  64. dv.diffOutOfDate = false;
  65. CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
  66. }
  67. }
  68. var updating = false;
  69. function registerUpdate(dv) {
  70. var edit = {from: 0, to: 0, marked: []};
  71. var orig = {from: 0, to: 0, marked: []};
  72. var debounceChange, updatingFast = false;
  73. function update(mode) {
  74. updating = true;
  75. updatingFast = false;
  76. if (mode == "full") {
  77. if (dv.svg) clear(dv.svg);
  78. if (dv.copyButtons) clear(dv.copyButtons);
  79. clearMarks(dv.edit, edit.marked, dv.classes);
  80. clearMarks(dv.orig, orig.marked, dv.classes);
  81. edit.from = edit.to = orig.from = orig.to = 0;
  82. }
  83. ensureDiff(dv);
  84. if (dv.showDifferences) {
  85. updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
  86. updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
  87. }
  88. if (dv.mv.options.connect == "align")
  89. alignChunks(dv);
  90. makeConnections(dv);
  91. updating = false;
  92. }
  93. function setDealign(fast) {
  94. if (updating) return;
  95. dv.dealigned = true;
  96. set(fast);
  97. }
  98. function set(fast) {
  99. if (updating || updatingFast) return;
  100. clearTimeout(debounceChange);
  101. if (fast === true) updatingFast = true;
  102. debounceChange = setTimeout(update, fast === true ? 20 : 250);
  103. }
  104. function change(_cm, change) {
  105. if (!dv.diffOutOfDate) {
  106. dv.diffOutOfDate = true;
  107. edit.from = edit.to = orig.from = orig.to = 0;
  108. }
  109. // Update faster when a line was added/removed
  110. setDealign(change.text.length - 1 != change.to.line - change.from.line);
  111. }
  112. function swapDoc() {
  113. dv.diffOutOfDate = true;
  114. update("full");
  115. }
  116. dv.edit.on("change", change);
  117. dv.orig.on("change", change);
  118. dv.edit.on("swapDoc", swapDoc);
  119. dv.orig.on("swapDoc", swapDoc);
  120. dv.edit.on("markerAdded", setDealign);
  121. dv.edit.on("markerCleared", setDealign);
  122. dv.orig.on("markerAdded", setDealign);
  123. dv.orig.on("markerCleared", setDealign);
  124. dv.edit.on("viewportChange", function() { set(false); });
  125. dv.orig.on("viewportChange", function() { set(false); });
  126. update();
  127. return update;
  128. }
  129. function registerScroll(dv) {
  130. dv.edit.on("scroll", function() {
  131. syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
  132. });
  133. dv.orig.on("scroll", function() {
  134. syncScroll(dv, DIFF_DELETE) && makeConnections(dv);
  135. });
  136. }
  137. function syncScroll(dv, type) {
  138. // Change handler will do a refresh after a timeout when diff is out of date
  139. if (dv.diffOutOfDate) return false;
  140. if (!dv.lockScroll) return true;
  141. var editor, other, now = +new Date;
  142. if (type == DIFF_INSERT) { editor = dv.edit; other = dv.orig; }
  143. else { editor = dv.orig; other = dv.edit; }
  144. // Don't take action if the position of this editor was recently set
  145. // (to prevent feedback loops)
  146. if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 50 > now) return false;
  147. var sInfo = editor.getScrollInfo();
  148. if (dv.mv.options.connect == "align") {
  149. targetPos = sInfo.top;
  150. } else {
  151. var halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
  152. var mid = editor.lineAtHeight(midY, "local");
  153. var around = chunkBoundariesAround(dv.chunks, mid, type == DIFF_INSERT);
  154. var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
  155. var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
  156. var ratio = (midY - off.top) / (off.bot - off.top);
  157. var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
  158. var botDist, mix;
  159. // Some careful tweaking to make sure no space is left out of view
  160. // when scrolling to top or bottom.
  161. if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
  162. targetPos = targetPos * mix + sInfo.top * (1 - mix);
  163. } else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
  164. var otherInfo = other.getScrollInfo();
  165. var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos;
  166. if (botDistOther > botDist && (mix = botDist / halfScreen) < 1)
  167. targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
  168. }
  169. }
  170. other.scrollTo(sInfo.left, targetPos);
  171. other.state.scrollSetAt = now;
  172. other.state.scrollSetBy = dv;
  173. return true;
  174. }
  175. function getOffsets(editor, around) {
  176. var bot = around.after;
  177. if (bot == null) bot = editor.lastLine() + 1;
  178. return {top: editor.heightAtLine(around.before || 0, "local"),
  179. bot: editor.heightAtLine(bot, "local")};
  180. }
  181. function setScrollLock(dv, val, action) {
  182. dv.lockScroll = val;
  183. if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
  184. dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db&nbsp;&nbsp;\u21da";
  185. }
  186. // Updating the marks for editor content
  187. function removeClass(editor, line, classes) {
  188. var locs = classes.classLocation
  189. for (var i = 0; i < locs.length; i++) {
  190. editor.removeLineClass(line, locs[i], classes.chunk);
  191. editor.removeLineClass(line, locs[i], classes.start);
  192. editor.removeLineClass(line, locs[i], classes.end);
  193. }
  194. }
  195. function clearMarks(editor, arr, classes) {
  196. for (var i = 0; i < arr.length; ++i) {
  197. var mark = arr[i];
  198. if (mark instanceof CodeMirror.TextMarker)
  199. mark.clear();
  200. else if (mark.parent)
  201. removeClass(editor, mark, classes);
  202. }
  203. arr.length = 0;
  204. }
  205. // FIXME maybe add a margin around viewport to prevent too many updates
  206. function updateMarks(editor, diff, state, type, classes) {
  207. var vp = editor.getViewport();
  208. editor.operation(function() {
  209. if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
  210. clearMarks(editor, state.marked, classes);
  211. markChanges(editor, diff, type, state.marked, vp.from, vp.to, classes);
  212. state.from = vp.from; state.to = vp.to;
  213. } else {
  214. if (vp.from < state.from) {
  215. markChanges(editor, diff, type, state.marked, vp.from, state.from, classes);
  216. state.from = vp.from;
  217. }
  218. if (vp.to > state.to) {
  219. markChanges(editor, diff, type, state.marked, state.to, vp.to, classes);
  220. state.to = vp.to;
  221. }
  222. }
  223. });
  224. }
  225. function addClass(editor, lineNr, classes, main, start, end) {
  226. var locs = classes.classLocation, line = editor.getLineHandle(lineNr);
  227. for (var i = 0; i < locs.length; i++) {
  228. if (main) editor.addLineClass(line, locs[i], classes.chunk);
  229. if (start) editor.addLineClass(line, locs[i], classes.start);
  230. if (end) editor.addLineClass(line, locs[i], classes.end);
  231. }
  232. return line;
  233. }
  234. function markChanges(editor, diff, type, marks, from, to, classes) {
  235. var pos = Pos(0, 0);
  236. var top = Pos(from, 0), bot = editor.clipPos(Pos(to - 1));
  237. var cls = type == DIFF_DELETE ? classes.del : classes.insert;
  238. function markChunk(start, end) {
  239. var bfrom = Math.max(from, start), bto = Math.min(to, end);
  240. for (var i = bfrom; i < bto; ++i)
  241. marks.push(addClass(editor, i, classes, true, i == start, i == end - 1));
  242. // When the chunk is empty, make sure a horizontal line shows up
  243. if (start == end && bfrom == end && bto == end) {
  244. if (bfrom)
  245. marks.push(addClass(editor, bfrom - 1, classes, false, false, true));
  246. else
  247. marks.push(addClass(editor, bfrom, classes, false, true, false));
  248. }
  249. }
  250. var chunkStart = 0;
  251. for (var i = 0; i < diff.length; ++i) {
  252. var part = diff[i], tp = part[0], str = part[1];
  253. if (tp == DIFF_EQUAL) {
  254. var cleanFrom = pos.line + (startOfLineClean(diff, i) ? 0 : 1);
  255. moveOver(pos, str);
  256. var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0);
  257. if (cleanTo > cleanFrom) {
  258. if (i) markChunk(chunkStart, cleanFrom);
  259. chunkStart = cleanTo;
  260. }
  261. } else {
  262. if (tp == type) {
  263. var end = moveOver(pos, str, true);
  264. var a = posMax(top, pos), b = posMin(bot, end);
  265. if (!posEq(a, b))
  266. marks.push(editor.markText(a, b, {className: cls}));
  267. pos = end;
  268. }
  269. }
  270. }
  271. if (chunkStart <= pos.line) markChunk(chunkStart, pos.line + 1);
  272. }
  273. // Updating the gap between editor and original
  274. function makeConnections(dv) {
  275. if (!dv.showDifferences) return;
  276. if (dv.svg) {
  277. clear(dv.svg);
  278. var w = dv.gap.offsetWidth;
  279. attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
  280. }
  281. if (dv.copyButtons) clear(dv.copyButtons);
  282. var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
  283. var outerTop = dv.mv.wrap.getBoundingClientRect().top
  284. var sTopEdit = outerTop - dv.edit.getScrollerElement().getBoundingClientRect().top + dv.edit.getScrollInfo().top
  285. var sTopOrig = outerTop - dv.orig.getScrollerElement().getBoundingClientRect().top + dv.orig.getScrollInfo().top;
  286. for (var i = 0; i < dv.chunks.length; i++) {
  287. var ch = dv.chunks[i];
  288. if (ch.editFrom <= vpEdit.to && ch.editTo >= vpEdit.from &&
  289. ch.origFrom <= vpOrig.to && ch.origTo >= vpOrig.from)
  290. drawConnectorsForChunk(dv, ch, sTopOrig, sTopEdit, w);
  291. }
  292. }
  293. function getMatchingOrigLine(editLine, chunks) {
  294. var editStart = 0, origStart = 0;
  295. for (var i = 0; i < chunks.length; i++) {
  296. var chunk = chunks[i];
  297. if (chunk.editTo > editLine && chunk.editFrom <= editLine) return null;
  298. if (chunk.editFrom > editLine) break;
  299. editStart = chunk.editTo;
  300. origStart = chunk.origTo;
  301. }
  302. return origStart + (editLine - editStart);
  303. }
  304. function findAlignedLines(dv, other) {
  305. var linesToAlign = [];
  306. for (var i = 0; i < dv.chunks.length; i++) {
  307. var chunk = dv.chunks[i];
  308. linesToAlign.push([chunk.origTo, chunk.editTo, other ? getMatchingOrigLine(chunk.editTo, other.chunks) : null]);
  309. }
  310. if (other) {
  311. chunkLoop: for (var i = 0; i < other.chunks.length; i++) {
  312. var chunk = other.chunks[i];
  313. for (var j = 0; j < linesToAlign.length; j++) {
  314. var diff = linesToAlign[j][1] - chunk.editTo;
  315. if (diff == 0) continue chunkLoop
  316. if (diff > 0) break;
  317. }
  318. linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
  319. }
  320. }
  321. return linesToAlign;
  322. }
  323. function alignChunks(dv, force) {
  324. if (!dv.dealigned && !force) return;
  325. if (!dv.orig.curOp) return dv.orig.operation(function() {
  326. alignChunks(dv, force);
  327. });
  328. dv.dealigned = false;
  329. var other = dv.mv.left == dv ? dv.mv.right : dv.mv.left;
  330. if (other) {
  331. ensureDiff(other);
  332. other.dealigned = false;
  333. }
  334. var linesToAlign = findAlignedLines(dv, other);
  335. // Clear old aligners
  336. var aligners = dv.mv.aligners;
  337. for (var i = 0; i < aligners.length; i++)
  338. aligners[i].clear();
  339. aligners.length = 0;
  340. var cm = [dv.orig, dv.edit], scroll = [];
  341. if (other) cm.push(other.orig);
  342. for (var i = 0; i < cm.length; i++)
  343. scroll.push(cm[i].getScrollInfo().top);
  344. for (var ln = 0; ln < linesToAlign.length; ln++)
  345. alignLines(cm, linesToAlign[ln], aligners);
  346. for (var i = 0; i < cm.length; i++)
  347. cm[i].scrollTo(null, scroll[i]);
  348. }
  349. function alignLines(cm, lines, aligners) {
  350. var maxOffset = 0, offset = [];
  351. for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
  352. var off = cm[i].heightAtLine(lines[i], "local");
  353. offset[i] = off;
  354. maxOffset = Math.max(maxOffset, off);
  355. }
  356. for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
  357. var diff = maxOffset - offset[i];
  358. if (diff > 1)
  359. aligners.push(padAbove(cm[i], lines[i], diff));
  360. }
  361. }
  362. function padAbove(cm, line, size) {
  363. var above = true;
  364. if (line > cm.lastLine()) {
  365. line--;
  366. above = false;
  367. }
  368. var elt = document.createElement("div");
  369. elt.className = "CodeMirror-merge-spacer";
  370. elt.style.height = size + "px"; elt.style.minWidth = "1px";
  371. return cm.addLineWidget(line, elt, {height: size, above: above});
  372. }
  373. function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {
  374. var flip = dv.type == "left";
  375. var top = dv.orig.heightAtLine(chunk.origFrom, "local", true) - sTopOrig;
  376. if (dv.svg) {
  377. var topLpx = top;
  378. var topRpx = dv.edit.heightAtLine(chunk.editFrom, "local", true) - sTopEdit;
  379. if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
  380. var botLpx = dv.orig.heightAtLine(chunk.origTo, "local", true) - sTopOrig;
  381. var botRpx = dv.edit.heightAtLine(chunk.editTo, "local", true) - sTopEdit;
  382. if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
  383. var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
  384. var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
  385. attrs(dv.svg.appendChild(document.createElementNS(svgNS, "path")),
  386. "d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
  387. "class", dv.classes.connect);
  388. }
  389. if (dv.copyButtons) {
  390. var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
  391. "CodeMirror-merge-copy"));
  392. var editOriginals = dv.mv.options.allowEditingOriginals;
  393. copy.title = editOriginals ? "Push to left" : "Revert chunk";
  394. copy.chunk = chunk;
  395. copy.style.top = (chunk.origTo > chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
  396. if (editOriginals) {
  397. var topReverse = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
  398. var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
  399. "CodeMirror-merge-copy-reverse"));
  400. copyReverse.title = "Push to right";
  401. copyReverse.chunk = {editFrom: chunk.origFrom, editTo: chunk.origTo,
  402. origFrom: chunk.editFrom, origTo: chunk.editTo};
  403. copyReverse.style.top = topReverse + "px";
  404. dv.type == "right" ? copyReverse.style.left = "2px" : copyReverse.style.right = "2px";
  405. }
  406. }
  407. }
  408. function copyChunk(dv, to, from, chunk) {
  409. if (dv.diffOutOfDate) return;
  410. var editStart = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
  411. var origStart = chunk.origTo > from.lastLine() ? Pos(chunk.origFrom - 1) : Pos(chunk.origFrom, 0)
  412. to.replaceRange(from.getRange(origStart, Pos(chunk.origTo, 0)), editStart, Pos(chunk.editTo, 0))
  413. }
  414. // Merge view, containing 0, 1, or 2 diff views.
  415. var MergeView = CodeMirror.MergeView = function(node, options) {
  416. if (!(this instanceof MergeView)) return new MergeView(node, options);
  417. this.options = options;
  418. var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
  419. var hasLeft = origLeft != null, hasRight = origRight != null;
  420. var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
  421. var wrap = [], left = this.left = null, right = this.right = null;
  422. var self = this;
  423. if (hasLeft) {
  424. left = this.left = new DiffView(this, "left");
  425. var leftPane = elt("div", null, "CodeMirror-merge-pane CodeMirror-merge-left");
  426. wrap.push(leftPane);
  427. wrap.push(buildGap(left));
  428. }
  429. var editPane = elt("div", null, "CodeMirror-merge-pane CodeMirror-merge-editor");
  430. wrap.push(editPane);
  431. if (hasRight) {
  432. right = this.right = new DiffView(this, "right");
  433. wrap.push(buildGap(right));
  434. var rightPane = elt("div", null, "CodeMirror-merge-pane CodeMirror-merge-right");
  435. wrap.push(rightPane);
  436. }
  437. (hasRight ? rightPane : editPane).className += " CodeMirror-merge-pane-rightmost";
  438. wrap.push(elt("div", null, null, "height: 0; clear: both;"));
  439. var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-merge CodeMirror-merge-" + panes + "pane"));
  440. this.edit = CodeMirror(editPane, copyObj(options));
  441. if (left) left.init(leftPane, origLeft, options);
  442. if (right) right.init(rightPane, origRight, options);
  443. if (options.collapseIdentical)
  444. this.editor().operation(function() {
  445. collapseIdenticalStretches(self, options.collapseIdentical);
  446. });
  447. if (options.connect == "align") {
  448. this.aligners = [];
  449. alignChunks(this.left || this.right, true);
  450. }
  451. if (left) left.registerEvents()
  452. if (right) right.registerEvents()
  453. var onResize = function() {
  454. if (left) makeConnections(left);
  455. if (right) makeConnections(right);
  456. };
  457. CodeMirror.on(window, "resize", onResize);
  458. var resizeInterval = setInterval(function() {
  459. for (var p = wrapElt.parentNode; p && p != document.body; p = p.parentNode) {}
  460. if (!p) { clearInterval(resizeInterval); CodeMirror.off(window, "resize", onResize); }
  461. }, 5000);
  462. };
  463. function buildGap(dv) {
  464. var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
  465. lock.title = "Toggle locked scrolling";
  466. var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
  467. CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
  468. var gapElts = [lockWrap];
  469. if (dv.mv.options.revertButtons !== false) {
  470. dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
  471. CodeMirror.on(dv.copyButtons, "click", function(e) {
  472. var node = e.target || e.srcElement;
  473. if (!node.chunk) return;
  474. if (node.className == "CodeMirror-merge-copy-reverse") {
  475. copyChunk(dv, dv.orig, dv.edit, node.chunk);
  476. return;
  477. }
  478. copyChunk(dv, dv.edit, dv.orig, node.chunk);
  479. });
  480. gapElts.unshift(dv.copyButtons);
  481. }
  482. if (dv.mv.options.connect != "align") {
  483. var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
  484. if (svg && !svg.createSVGRect) svg = null;
  485. dv.svg = svg;
  486. if (svg) gapElts.push(svg);
  487. }
  488. return dv.gap = elt("div", gapElts, "CodeMirror-merge-gap");
  489. }
  490. MergeView.prototype = {
  491. constructor: MergeView,
  492. editor: function() { return this.edit; },
  493. rightOriginal: function() { return this.right && this.right.orig; },
  494. leftOriginal: function() { return this.left && this.left.orig; },
  495. setShowDifferences: function(val) {
  496. if (this.right) this.right.setShowDifferences(val);
  497. if (this.left) this.left.setShowDifferences(val);
  498. },
  499. rightChunks: function() {
  500. if (this.right) { ensureDiff(this.right); return this.right.chunks; }
  501. },
  502. leftChunks: function() {
  503. if (this.left) { ensureDiff(this.left); return this.left.chunks; }
  504. }
  505. };
  506. function asString(obj) {
  507. if (typeof obj == "string") return obj;
  508. else return obj.getValue();
  509. }
  510. // Operations on diffs
  511. var dmp = new diff_match_patch();
  512. function getDiff(a, b) {
  513. var diff = dmp.diff_main(a, b);
  514. // The library sometimes leaves in empty parts, which confuse the algorithm
  515. for (var i = 0; i < diff.length; ++i) {
  516. var part = diff[i];
  517. if (!part[1]) {
  518. diff.splice(i--, 1);
  519. } else if (i && diff[i - 1][0] == part[0]) {
  520. diff.splice(i--, 1);
  521. diff[i][1] += part[1];
  522. }
  523. }
  524. return diff;
  525. }
  526. function getChunks(diff) {
  527. var chunks = [];
  528. var startEdit = 0, startOrig = 0;
  529. var edit = Pos(0, 0), orig = Pos(0, 0);
  530. for (var i = 0; i < diff.length; ++i) {
  531. var part = diff[i], tp = part[0];
  532. if (tp == DIFF_EQUAL) {
  533. var startOff = startOfLineClean(diff, i) ? 0 : 1;
  534. var cleanFromEdit = edit.line + startOff, cleanFromOrig = orig.line + startOff;
  535. moveOver(edit, part[1], null, orig);
  536. var endOff = endOfLineClean(diff, i) ? 1 : 0;
  537. var cleanToEdit = edit.line + endOff, cleanToOrig = orig.line + endOff;
  538. if (cleanToEdit > cleanFromEdit) {
  539. if (i) chunks.push({origFrom: startOrig, origTo: cleanFromOrig,
  540. editFrom: startEdit, editTo: cleanFromEdit});
  541. startEdit = cleanToEdit; startOrig = cleanToOrig;
  542. }
  543. } else {
  544. moveOver(tp == DIFF_INSERT ? edit : orig, part[1]);
  545. }
  546. }
  547. if (startEdit <= edit.line || startOrig <= orig.line)
  548. chunks.push({origFrom: startOrig, origTo: orig.line + 1,
  549. editFrom: startEdit, editTo: edit.line + 1});
  550. return chunks;
  551. }
  552. function endOfLineClean(diff, i) {
  553. if (i == diff.length - 1) return true;
  554. var next = diff[i + 1][1];
  555. if (next.length == 1 || next.charCodeAt(0) != 10) return false;
  556. if (i == diff.length - 2) return true;
  557. next = diff[i + 2][1];
  558. return next.length > 1 && next.charCodeAt(0) == 10;
  559. }
  560. function startOfLineClean(diff, i) {
  561. if (i == 0) return true;
  562. var last = diff[i - 1][1];
  563. if (last.charCodeAt(last.length - 1) != 10) return false;
  564. if (i == 1) return true;
  565. last = diff[i - 2][1];
  566. return last.charCodeAt(last.length - 1) == 10;
  567. }
  568. function chunkBoundariesAround(chunks, n, nInEdit) {
  569. var beforeE, afterE, beforeO, afterO;
  570. for (var i = 0; i < chunks.length; i++) {
  571. var chunk = chunks[i];
  572. var fromLocal = nInEdit ? chunk.editFrom : chunk.origFrom;
  573. var toLocal = nInEdit ? chunk.editTo : chunk.origTo;
  574. if (afterE == null) {
  575. if (fromLocal > n) { afterE = chunk.editFrom; afterO = chunk.origFrom; }
  576. else if (toLocal > n) { afterE = chunk.editTo; afterO = chunk.origTo; }
  577. }
  578. if (toLocal <= n) { beforeE = chunk.editTo; beforeO = chunk.origTo; }
  579. else if (fromLocal <= n) { beforeE = chunk.editFrom; beforeO = chunk.origFrom; }
  580. }
  581. return {edit: {before: beforeE, after: afterE}, orig: {before: beforeO, after: afterO}};
  582. }
  583. function collapseSingle(cm, from, to) {
  584. cm.addLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
  585. var widget = document.createElement("span");
  586. widget.className = "CodeMirror-merge-collapsed-widget";
  587. widget.title = "Identical text collapsed. Click to expand.";
  588. var mark = cm.markText(Pos(from, 0), Pos(to - 1), {
  589. inclusiveLeft: true,
  590. inclusiveRight: true,
  591. replacedWith: widget,
  592. clearOnEnter: true
  593. });
  594. function clear() {
  595. mark.clear();
  596. cm.removeLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
  597. }
  598. CodeMirror.on(widget, "click", clear);
  599. return {mark: mark, clear: clear};
  600. }
  601. function collapseStretch(size, editors) {
  602. var marks = [];
  603. function clear() {
  604. for (var i = 0; i < marks.length; i++) marks[i].clear();
  605. }
  606. for (var i = 0; i < editors.length; i++) {
  607. var editor = editors[i];
  608. var mark = collapseSingle(editor.cm, editor.line, editor.line + size);
  609. marks.push(mark);
  610. mark.mark.on("clear", clear);
  611. }
  612. return marks[0].mark;
  613. }
  614. function unclearNearChunks(dv, margin, off, clear) {
  615. for (var i = 0; i < dv.chunks.length; i++) {
  616. var chunk = dv.chunks[i];
  617. for (var l = chunk.editFrom - margin; l < chunk.editTo + margin; l++) {
  618. var pos = l + off;
  619. if (pos >= 0 && pos < clear.length) clear[pos] = false;
  620. }
  621. }
  622. }
  623. function collapseIdenticalStretches(mv, margin) {
  624. if (typeof margin != "number") margin = 2;
  625. var clear = [], edit = mv.editor(), off = edit.firstLine();
  626. for (var l = off, e = edit.lastLine(); l <= e; l++) clear.push(true);
  627. if (mv.left) unclearNearChunks(mv.left, margin, off, clear);
  628. if (mv.right) unclearNearChunks(mv.right, margin, off, clear);
  629. for (var i = 0; i < clear.length; i++) {
  630. if (clear[i]) {
  631. var line = i + off;
  632. for (var size = 1; i < clear.length - 1 && clear[i + 1]; i++, size++) {}
  633. if (size > margin) {
  634. var editors = [{line: line, cm: edit}];
  635. if (mv.left) editors.push({line: getMatchingOrigLine(line, mv.left.chunks), cm: mv.left.orig});
  636. if (mv.right) editors.push({line: getMatchingOrigLine(line, mv.right.chunks), cm: mv.right.orig});
  637. var mark = collapseStretch(size, editors);
  638. if (mv.options.onCollapse) mv.options.onCollapse(mv, line, size, mark);
  639. }
  640. }
  641. }
  642. }
  643. // General utilities
  644. function elt(tag, content, className, style) {
  645. var e = document.createElement(tag);
  646. if (className) e.className = className;
  647. if (style) e.style.cssText = style;
  648. if (typeof content == "string") e.appendChild(document.createTextNode(content));
  649. else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
  650. return e;
  651. }
  652. function clear(node) {
  653. for (var count = node.childNodes.length; count > 0; --count)
  654. node.removeChild(node.firstChild);
  655. }
  656. function attrs(elt) {
  657. for (var i = 1; i < arguments.length; i += 2)
  658. elt.setAttribute(arguments[i], arguments[i+1]);
  659. }
  660. function copyObj(obj, target) {
  661. if (!target) target = {};
  662. for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
  663. return target;
  664. }
  665. function moveOver(pos, str, copy, other) {
  666. var out = copy ? Pos(pos.line, pos.ch) : pos, at = 0;
  667. for (;;) {
  668. var nl = str.indexOf("\n", at);
  669. if (nl == -1) break;
  670. ++out.line;
  671. if (other) ++other.line;
  672. at = nl + 1;
  673. }
  674. out.ch = (at ? 0 : out.ch) + (str.length - at);
  675. if (other) other.ch = (at ? 0 : other.ch) + (str.length - at);
  676. return out;
  677. }
  678. function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
  679. function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
  680. function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
  681. function findPrevDiff(chunks, start, isOrig) {
  682. for (var i = chunks.length - 1; i >= 0; i--) {
  683. var chunk = chunks[i];
  684. var to = (isOrig ? chunk.origTo : chunk.editTo) - 1;
  685. if (to < start) return to;
  686. }
  687. }
  688. function findNextDiff(chunks, start, isOrig) {
  689. for (var i = 0; i < chunks.length; i++) {
  690. var chunk = chunks[i];
  691. var from = (isOrig ? chunk.origFrom : chunk.editFrom);
  692. if (from > start) return from;
  693. }
  694. }
  695. function goNearbyDiff(cm, dir) {
  696. var found = null, views = cm.state.diffViews, line = cm.getCursor().line;
  697. if (views) for (var i = 0; i < views.length; i++) {
  698. var dv = views[i], isOrig = cm == dv.orig;
  699. ensureDiff(dv);
  700. var pos = dir < 0 ? findPrevDiff(dv.chunks, line, isOrig) : findNextDiff(dv.chunks, line, isOrig);
  701. if (pos != null && (found == null || (dir < 0 ? pos > found : pos < found)))
  702. found = pos;
  703. }
  704. if (found != null)
  705. cm.setCursor(found, 0);
  706. else
  707. return CodeMirror.Pass;
  708. }
  709. CodeMirror.commands.goNextDiff = function(cm) {
  710. return goNearbyDiff(cm, 1);
  711. };
  712. CodeMirror.commands.goPrevDiff = function(cm) {
  713. return goNearbyDiff(cm, -1);
  714. };
  715. });