merge.js 18 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474
  1. (function() {
  2. "use strict";
  3. // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
  4. var Pos = CodeMirror.Pos;
  5. var svgNS = "http://www.w3.org/2000/svg";
  6. function DiffView(mv, type) {
  7. this.mv = mv;
  8. this.type = type;
  9. this.classes = type == "left"
  10. ? {chunk: "CodeMirror-merge-l-chunk",
  11. start: "CodeMirror-merge-l-chunk-start",
  12. end: "CodeMirror-merge-l-chunk-end",
  13. insert: "CodeMirror-merge-l-inserted",
  14. del: "CodeMirror-merge-l-deleted",
  15. connect: "CodeMirror-merge-l-connect"}
  16. : {chunk: "CodeMirror-merge-r-chunk",
  17. start: "CodeMirror-merge-r-chunk-start",
  18. end: "CodeMirror-merge-r-chunk-end",
  19. insert: "CodeMirror-merge-r-inserted",
  20. del: "CodeMirror-merge-r-deleted",
  21. connect: "CodeMirror-merge-r-connect"};
  22. }
  23. DiffView.prototype = {
  24. constructor: DiffView,
  25. init: function(pane, orig, options) {
  26. this.edit = this.mv.edit;
  27. this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: true}, copyObj(options)));
  28. this.diff = getDiff(orig, options.value);
  29. this.diffOutOfDate = false;
  30. this.showDifferences = options.showDifferences !== false;
  31. this.forceUpdate = registerUpdate(this);
  32. setScrollLock(this, true, false);
  33. registerScroll(this);
  34. },
  35. setShowDifferences: function(val) {
  36. val = val !== false;
  37. if (val != this.showDifferences) {
  38. this.showDifferences = val;
  39. this.forceUpdate("full");
  40. }
  41. }
  42. };
  43. function registerUpdate(dv) {
  44. var edit = {from: 0, to: 0, marked: []};
  45. var orig = {from: 0, to: 0, marked: []};
  46. var debounceChange;
  47. function update(mode) {
  48. if (mode == "full") {
  49. if (dv.svg) clear(dv.svg);
  50. clear(dv.copyButtons);
  51. clearMarks(dv.edit, edit.marked, dv.classes);
  52. clearMarks(dv.orig, orig.marked, dv.classes);
  53. edit.from = edit.to = orig.from = orig.to = 0;
  54. }
  55. if (dv.diffOutOfDate) {
  56. dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
  57. dv.diffOutOfDate = false;
  58. CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
  59. }
  60. if (dv.showDifferences) {
  61. updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
  62. updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
  63. }
  64. drawConnectors(dv);
  65. }
  66. function set(slow) {
  67. clearTimeout(debounceChange);
  68. debounceChange = setTimeout(update, slow == true ? 250 : 100);
  69. }
  70. function change() {
  71. if (!dv.diffOutOfDate) {
  72. dv.diffOutOfDate = true;
  73. edit.from = edit.to = orig.from = orig.to = 0;
  74. }
  75. set(true);
  76. }
  77. dv.edit.on("change", change);
  78. dv.orig.on("change", change);
  79. dv.edit.on("viewportChange", set);
  80. dv.orig.on("viewportChange", set);
  81. update();
  82. return update;
  83. }
  84. function registerScroll(dv) {
  85. dv.edit.on("scroll", function() {
  86. syncScroll(dv, DIFF_INSERT) && drawConnectors(dv);
  87. });
  88. dv.orig.on("scroll", function() {
  89. syncScroll(dv, DIFF_DELETE) && drawConnectors(dv);
  90. });
  91. }
  92. function syncScroll(dv, type) {
  93. // Change handler will do a refresh after a timeout when diff is out of date
  94. if (dv.diffOutOfDate) return false;
  95. if (!dv.lockScroll) return true;
  96. var editor, other, now = +new Date;
  97. if (type == DIFF_INSERT) { editor = dv.edit; other = dv.orig; }
  98. else { editor = dv.orig; other = dv.edit; }
  99. // Don't take action if the position of this editor was recently set
  100. // (to prevent feedback loops)
  101. if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 50 > now) return false;
  102. var sInfo = editor.getScrollInfo(), halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
  103. var mid = editor.lineAtHeight(midY, "local");
  104. var around = chunkBoundariesAround(dv.diff, mid, type == DIFF_INSERT);
  105. var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
  106. var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
  107. var ratio = (midY - off.top) / (off.bot - off.top);
  108. var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
  109. var botDist, mix;
  110. // Some careful tweaking to make sure no space is left out of view
  111. // when scrolling to top or bottom.
  112. if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
  113. targetPos = targetPos * mix + sInfo.top * (1 - mix);
  114. } else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
  115. var otherInfo = other.getScrollInfo();
  116. var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos;
  117. if (botDistOther > botDist && (mix = botDist / halfScreen) < 1)
  118. targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
  119. }
  120. other.scrollTo(sInfo.left, targetPos);
  121. other.state.scrollSetAt = now;
  122. other.state.scrollSetBy = dv;
  123. return true;
  124. }
  125. function getOffsets(editor, around) {
  126. var bot = around.after;
  127. if (bot == null) bot = editor.lastLine() + 1;
  128. return {top: editor.heightAtLine(around.before || 0, "local"),
  129. bot: editor.heightAtLine(bot, "local")};
  130. }
  131. function setScrollLock(dv, val, action) {
  132. dv.lockScroll = val;
  133. if (val && action != false) syncScroll(dv, DIFF_INSERT) && drawConnectors(dv);
  134. dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db&nbsp;&nbsp;\u21da";
  135. }
  136. // Updating the marks for editor content
  137. function clearMarks(editor, arr, classes) {
  138. for (var i = 0; i < arr.length; ++i) {
  139. var mark = arr[i];
  140. if (mark instanceof CodeMirror.TextMarker) {
  141. mark.clear();
  142. } else {
  143. editor.removeLineClass(mark, "background", classes.chunk);
  144. editor.removeLineClass(mark, "background", classes.start);
  145. editor.removeLineClass(mark, "background", classes.end);
  146. }
  147. }
  148. arr.length = 0;
  149. }
  150. // FIXME maybe add a margin around viewport to prevent too many updates
  151. function updateMarks(editor, diff, state, type, classes) {
  152. var vp = editor.getViewport();
  153. editor.operation(function() {
  154. if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
  155. clearMarks(editor, state.marked, classes);
  156. markChanges(editor, diff, type, state.marked, vp.from, vp.to, classes);
  157. state.from = vp.from; state.to = vp.to;
  158. } else {
  159. if (vp.from < state.from) {
  160. markChanges(editor, diff, type, state.marked, vp.from, state.from, classes);
  161. state.from = vp.from;
  162. }
  163. if (vp.to > state.to) {
  164. markChanges(editor, diff, type, state.marked, state.to, vp.to, classes);
  165. state.to = vp.to;
  166. }
  167. }
  168. });
  169. }
  170. function markChanges(editor, diff, type, marks, from, to, classes) {
  171. var pos = Pos(0, 0);
  172. var top = Pos(from, 0), bot = editor.clipPos(Pos(to - 1));
  173. var cls = type == DIFF_DELETE ? classes.del : classes.insert;
  174. function markChunk(start, end) {
  175. var bfrom = Math.max(from, start), bto = Math.min(to, end);
  176. for (var i = bfrom; i < bto; ++i) {
  177. var line = editor.addLineClass(i, "background", classes.chunk);
  178. if (i == start) editor.addLineClass(line, "background", classes.start);
  179. if (i == end - 1) editor.addLineClass(line, "background", classes.end);
  180. marks.push(line);
  181. }
  182. // When the chunk is empty, make sure a horizontal line shows up
  183. if (start == end && bfrom == end && bto == end) {
  184. if (bfrom)
  185. marks.push(editor.addLineClass(bfrom - 1, "background", classes.end));
  186. else
  187. marks.push(editor.addLineClass(bfrom, "background", classes.start));
  188. }
  189. }
  190. var chunkStart = 0;
  191. for (var i = 0; i < diff.length; ++i) {
  192. var part = diff[i], tp = part[0], str = part[1];
  193. if (tp == DIFF_EQUAL) {
  194. var cleanFrom = pos.line + (startOfLineClean(diff, i) ? 0 : 1);
  195. moveOver(pos, str);
  196. var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0);
  197. if (cleanTo > cleanFrom) {
  198. if (i) markChunk(chunkStart, cleanFrom);
  199. chunkStart = cleanTo;
  200. }
  201. } else {
  202. if (tp == type) {
  203. var end = moveOver(pos, str, true);
  204. var a = posMax(top, pos), b = posMin(bot, end);
  205. if (!posEq(a, b))
  206. marks.push(editor.markText(a, b, {className: cls}));
  207. pos = end;
  208. }
  209. }
  210. }
  211. if (chunkStart <= pos.line) markChunk(chunkStart, pos.line + 1);
  212. }
  213. // Updating the gap between editor and original
  214. function drawConnectors(dv) {
  215. if (!dv.showDifferences) return;
  216. if (dv.svg) {
  217. clear(dv.svg);
  218. var w = dv.gap.offsetWidth;
  219. attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
  220. }
  221. clear(dv.copyButtons);
  222. var flip = dv.type == "left";
  223. var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
  224. var sTopEdit = dv.edit.getScrollInfo().top, sTopOrig = dv.orig.getScrollInfo().top;
  225. iterateChunks(dv.diff, function(topOrig, botOrig, topEdit, botEdit) {
  226. if (topEdit > vpEdit.to || botEdit < vpEdit.from ||
  227. topOrig > vpOrig.to || botOrig < vpOrig.from)
  228. return;
  229. var topLpx = dv.orig.heightAtLine(topOrig, "local") - sTopOrig, top = topLpx;
  230. if (dv.svg) {
  231. var topRpx = dv.edit.heightAtLine(topEdit, "local") - sTopEdit;
  232. if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
  233. var botLpx = dv.orig.heightAtLine(botOrig, "local") - sTopOrig;
  234. var botRpx = dv.edit.heightAtLine(botEdit, "local") - sTopEdit;
  235. if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
  236. var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
  237. var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
  238. attrs(dv.svg.appendChild(document.createElementNS(svgNS, "path")),
  239. "d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
  240. "class", dv.classes.connect);
  241. }
  242. var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
  243. "CodeMirror-merge-copy"));
  244. copy.title = "Revert chunk";
  245. copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
  246. copy.style.top = top + "px";
  247. });
  248. }
  249. function copyChunk(dv, chunk) {
  250. if (dv.diffOutOfDate) return;
  251. dv.edit.replaceRange(dv.orig.getRange(Pos(chunk.topOrig, 0), Pos(chunk.botOrig, 0)),
  252. Pos(chunk.topEdit, 0), Pos(chunk.botEdit, 0));
  253. }
  254. // Merge view, containing 0, 1, or 2 diff views.
  255. var MergeView = CodeMirror.MergeView = function(node, options) {
  256. if (!(this instanceof MergeView)) return new MergeView(node, options);
  257. var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
  258. var hasLeft = origLeft != null, hasRight = origRight != null;
  259. var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
  260. var wrap = [], left = this.left = null, right = this.right = null;
  261. if (hasLeft) {
  262. left = this.left = new DiffView(this, "left");
  263. var leftPane = elt("div", null, "CodeMirror-merge-pane");
  264. wrap.push(leftPane);
  265. wrap.push(buildGap(left));
  266. }
  267. var editPane = elt("div", null, "CodeMirror-merge-pane");
  268. wrap.push(editPane);
  269. if (hasRight) {
  270. right = this.right = new DiffView(this, "right");
  271. wrap.push(buildGap(right));
  272. var rightPane = elt("div", null, "CodeMirror-merge-pane");
  273. wrap.push(rightPane);
  274. }
  275. (hasRight ? rightPane : editPane).className += " CodeMirror-merge-pane-rightmost";
  276. wrap.push(elt("div", null, null, "height: 0; clear: both;"));
  277. var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-merge CodeMirror-merge-" + panes + "pane"));
  278. this.edit = CodeMirror(editPane, copyObj(options));
  279. if (left) left.init(leftPane, origLeft, options);
  280. if (right) right.init(rightPane, origRight, options);
  281. var onResize = function() {
  282. if (left) drawConnectors(left);
  283. if (right) drawConnectors(right);
  284. };
  285. CodeMirror.on(window, "resize", onResize);
  286. var resizeInterval = setInterval(function() {
  287. for (var p = wrapElt.parentNode; p && p != document.body; p = p.parentNode) {}
  288. if (!p) { clearInterval(resizeInterval); CodeMirror.off(window, "resize", onResize); }
  289. }, 5000);
  290. };
  291. function buildGap(dv) {
  292. var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
  293. lock.title = "Toggle locked scrolling";
  294. var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
  295. CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
  296. dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
  297. CodeMirror.on(dv.copyButtons, "click", function(e) {
  298. var node = e.target || e.srcElement;
  299. if (node.chunk) copyChunk(dv, node.chunk);
  300. });
  301. var gapElts = [dv.copyButtons, lockWrap];
  302. var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
  303. if (svg && !svg.createSVGRect) svg = null;
  304. dv.svg = svg;
  305. if (svg) gapElts.push(svg);
  306. return dv.gap = elt("div", gapElts, "CodeMirror-merge-gap");
  307. }
  308. MergeView.prototype = {
  309. constuctor: MergeView,
  310. editor: function() { return this.edit; },
  311. rightOriginal: function() { return this.right && this.right.orig; },
  312. leftOriginal: function() { return this.left && this.left.orig; },
  313. setShowDifferences: function(val) {
  314. if (this.right) this.right.setShowDifferences(val);
  315. if (this.left) this.left.setShowDifferences(val);
  316. }
  317. };
  318. // Operations on diffs
  319. var dmp = new diff_match_patch();
  320. function getDiff(a, b) {
  321. var diff = dmp.diff_main(a, b);
  322. dmp.diff_cleanupSemantic(diff);
  323. // The library sometimes leaves in empty parts, which confuse the algorithm
  324. for (var i = 0; i < diff.length; ++i) {
  325. var part = diff[i];
  326. if (!part[1]) {
  327. diff.splice(i--, 1);
  328. } else if (i && diff[i - 1][0] == part[0]) {
  329. diff.splice(i--, 1);
  330. diff[i][1] += part[1];
  331. }
  332. }
  333. return diff;
  334. }
  335. function iterateChunks(diff, f) {
  336. var startEdit = 0, startOrig = 0;
  337. var edit = Pos(0, 0), orig = Pos(0, 0);
  338. for (var i = 0; i < diff.length; ++i) {
  339. var part = diff[i], tp = part[0];
  340. if (tp == DIFF_EQUAL) {
  341. var startOff = startOfLineClean(diff, i) ? 0 : 1;
  342. var cleanFromEdit = edit.line + startOff, cleanFromOrig = orig.line + startOff;
  343. moveOver(edit, part[1], null, orig);
  344. var endOff = endOfLineClean(diff, i) ? 1 : 0;
  345. var cleanToEdit = edit.line + endOff, cleanToOrig = orig.line + endOff;
  346. if (cleanToEdit > cleanFromEdit) {
  347. if (i) f(startOrig, cleanFromOrig, startEdit, cleanFromEdit);
  348. startEdit = cleanToEdit; startOrig = cleanToOrig;
  349. }
  350. } else {
  351. moveOver(tp == DIFF_INSERT ? edit : orig, part[1]);
  352. }
  353. }
  354. if (startEdit <= edit.line || startOrig <= orig.line)
  355. f(startOrig, orig.line + 1, startEdit, edit.line + 1);
  356. }
  357. function endOfLineClean(diff, i) {
  358. if (i == diff.length - 1) return true;
  359. var next = diff[i + 1][1];
  360. if (next.length == 1 || next.charCodeAt(0) != 10) return false;
  361. if (i == diff.length - 2) return true;
  362. next = diff[i + 2][1];
  363. return next.length > 1 && next.charCodeAt(0) == 10;
  364. }
  365. function startOfLineClean(diff, i) {
  366. if (i == 0) return true;
  367. var last = diff[i - 1][1];
  368. if (last.charCodeAt(last.length - 1) != 10) return false;
  369. if (i == 1) return true;
  370. last = diff[i - 2][1];
  371. return last.charCodeAt(last.length - 1) == 10;
  372. }
  373. function chunkBoundariesAround(diff, n, nInEdit) {
  374. var beforeE, afterE, beforeO, afterO;
  375. iterateChunks(diff, function(fromOrig, toOrig, fromEdit, toEdit) {
  376. var fromLocal = nInEdit ? fromEdit : fromOrig;
  377. var toLocal = nInEdit ? toEdit : toOrig;
  378. if (afterE == null) {
  379. if (fromLocal > n) { afterE = fromEdit; afterO = fromOrig; }
  380. else if (toLocal > n) { afterE = toEdit; afterO = toOrig; }
  381. }
  382. if (toLocal <= n) { beforeE = toEdit; beforeO = toOrig; }
  383. else if (fromLocal <= n) { beforeE = fromEdit; beforeO = fromOrig; }
  384. });
  385. return {edit: {before: beforeE, after: afterE}, orig: {before: beforeO, after: afterO}};
  386. }
  387. // General utilities
  388. function elt(tag, content, className, style) {
  389. var e = document.createElement(tag);
  390. if (className) e.className = className;
  391. if (style) e.style.cssText = style;
  392. if (typeof content == "string") e.appendChild(document.createTextNode(content));
  393. else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
  394. return e;
  395. }
  396. function clear(node) {
  397. for (var count = node.childNodes.length; count > 0; --count)
  398. node.removeChild(node.firstChild);
  399. }
  400. function attrs(elt) {
  401. for (var i = 1; i < arguments.length; i += 2)
  402. elt.setAttribute(arguments[i], arguments[i+1]);
  403. }
  404. function copyObj(obj, target) {
  405. if (!target) target = {};
  406. for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
  407. return target;
  408. }
  409. function moveOver(pos, str, copy, other) {
  410. var out = copy ? Pos(pos.line, pos.ch) : pos, at = 0;
  411. for (;;) {
  412. var nl = str.indexOf("\n", at);
  413. if (nl == -1) break;
  414. ++out.line;
  415. if (other) ++other.line;
  416. at = nl + 1;
  417. }
  418. out.ch = (at ? 0 : out.ch) + (str.length - at);
  419. if (other) other.ch = (at ? 0 : other.ch) + (str.length - at);
  420. return out;
  421. }
  422. function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
  423. function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
  424. function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
  425. })();