merge.js 20 KB

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