merge.js 42 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082
  1. // CodeMirror, copyright (c) by Marijn Haverbeke and others
  2. // Distributed under an MIT license: https://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')
  6. // CommonJS
  7. mod(require('../../lib/codemirror'))
  8. // Note non-packaged dependency diff_match_patch
  9. else if (typeof define == 'function' && define.amd)
  10. // AMD
  11. define(['../../lib/codemirror', 'diff_match_patch'], mod)
  12. // Plain browser env
  13. else mod(CodeMirror)
  14. })(function (CodeMirror) {
  15. 'use strict'
  16. var Pos = CodeMirror.Pos
  17. var svgNS = 'http://www.w3.org/2000/svg'
  18. function DiffView(mv, type) {
  19. this.mv = mv
  20. this.type = type
  21. this.classes =
  22. type == 'left'
  23. ? {
  24. chunk: 'CodeMirror-merge-l-chunk',
  25. start: 'CodeMirror-merge-l-chunk-start',
  26. end: 'CodeMirror-merge-l-chunk-end',
  27. insert: 'CodeMirror-merge-l-inserted',
  28. del: 'CodeMirror-merge-l-deleted',
  29. connect: 'CodeMirror-merge-l-connect',
  30. }
  31. : {
  32. chunk: 'CodeMirror-merge-r-chunk',
  33. start: 'CodeMirror-merge-r-chunk-start',
  34. end: 'CodeMirror-merge-r-chunk-end',
  35. insert: 'CodeMirror-merge-r-inserted',
  36. del: 'CodeMirror-merge-r-deleted',
  37. connect: 'CodeMirror-merge-r-connect',
  38. }
  39. }
  40. DiffView.prototype = {
  41. constructor: DiffView,
  42. init: function (pane, orig, options) {
  43. this.edit = this.mv.edit
  44. ;(this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this)
  45. this.orig = CodeMirror(pane, copyObj({ value: orig, readOnly: !this.mv.options.allowEditingOriginals }, copyObj(options)))
  46. if (this.mv.options.connect == 'align') {
  47. if (!this.edit.state.trackAlignable) this.edit.state.trackAlignable = new TrackAlignable(this.edit)
  48. this.orig.state.trackAlignable = new TrackAlignable(this.orig)
  49. }
  50. this.lockButton.title = this.edit.phrase('Toggle locked scrolling')
  51. this.orig.state.diffViews = [this]
  52. var classLocation = options.chunkClassLocation || 'background'
  53. if (Object.prototype.toString.call(classLocation) != '[object Array]') classLocation = [classLocation]
  54. this.classes.classLocation = classLocation
  55. this.diff = getDiff(asString(orig), asString(options.value), this.mv.options.ignoreWhitespace)
  56. this.chunks = getChunks(this.diff)
  57. this.diffOutOfDate = this.dealigned = false
  58. this.needsScrollSync = null
  59. this.showDifferences = options.showDifferences !== false
  60. },
  61. registerEvents: function (otherDv) {
  62. this.forceUpdate = registerUpdate(this)
  63. setScrollLock(this, true, false)
  64. registerScroll(this, otherDv)
  65. },
  66. setShowDifferences: function (val) {
  67. val = val !== false
  68. if (val != this.showDifferences) {
  69. this.showDifferences = val
  70. this.forceUpdate('full')
  71. }
  72. },
  73. }
  74. function ensureDiff(dv) {
  75. if (dv.diffOutOfDate) {
  76. dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue(), dv.mv.options.ignoreWhitespace)
  77. dv.chunks = getChunks(dv.diff)
  78. dv.diffOutOfDate = false
  79. CodeMirror.signal(dv.edit, 'updateDiff', dv.diff)
  80. }
  81. }
  82. var updating = false
  83. function registerUpdate(dv) {
  84. var edit = { from: 0, to: 0, marked: [] }
  85. var orig = { from: 0, to: 0, marked: [] }
  86. var debounceChange,
  87. updatingFast = false
  88. function update(mode) {
  89. updating = true
  90. updatingFast = false
  91. if (mode == 'full') {
  92. if (dv.svg) clear(dv.svg)
  93. if (dv.copyButtons) clear(dv.copyButtons)
  94. clearMarks(dv.edit, edit.marked, dv.classes)
  95. clearMarks(dv.orig, orig.marked, dv.classes)
  96. edit.from = edit.to = orig.from = orig.to = 0
  97. }
  98. ensureDiff(dv)
  99. if (dv.showDifferences) {
  100. updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes)
  101. updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes)
  102. }
  103. if (dv.mv.options.connect == 'align') alignChunks(dv)
  104. makeConnections(dv)
  105. if (dv.needsScrollSync != null) syncScroll(dv, dv.needsScrollSync)
  106. updating = false
  107. }
  108. function setDealign(fast) {
  109. if (updating) return
  110. dv.dealigned = true
  111. set(fast)
  112. }
  113. function set(fast) {
  114. if (updating || updatingFast) return
  115. clearTimeout(debounceChange)
  116. if (fast === true) updatingFast = true
  117. debounceChange = setTimeout(update, fast === true ? 20 : 250)
  118. }
  119. function change(_cm, change) {
  120. if (!dv.diffOutOfDate) {
  121. dv.diffOutOfDate = true
  122. edit.from = edit.to = orig.from = orig.to = 0
  123. }
  124. // Update faster when a line was added/removed
  125. setDealign(change.text.length - 1 != change.to.line - change.from.line)
  126. }
  127. function swapDoc() {
  128. dv.diffOutOfDate = true
  129. dv.dealigned = true
  130. update('full')
  131. }
  132. dv.edit.on('change', change)
  133. dv.orig.on('change', change)
  134. dv.edit.on('swapDoc', swapDoc)
  135. dv.orig.on('swapDoc', swapDoc)
  136. if (dv.mv.options.connect == 'align') {
  137. CodeMirror.on(dv.edit.state.trackAlignable, 'realign', setDealign)
  138. CodeMirror.on(dv.orig.state.trackAlignable, 'realign', setDealign)
  139. }
  140. dv.edit.on('viewportChange', function () {
  141. set(false)
  142. })
  143. dv.orig.on('viewportChange', function () {
  144. set(false)
  145. })
  146. update()
  147. return update
  148. }
  149. function registerScroll(dv, otherDv) {
  150. dv.edit.on('scroll', function () {
  151. syncScroll(dv, true) && makeConnections(dv)
  152. })
  153. dv.orig.on('scroll', function () {
  154. syncScroll(dv, false) && makeConnections(dv)
  155. if (otherDv) syncScroll(otherDv, true) && makeConnections(otherDv)
  156. })
  157. }
  158. function syncScroll(dv, toOrig) {
  159. // Change handler will do a refresh after a timeout when diff is out of date
  160. if (dv.diffOutOfDate) {
  161. if (dv.lockScroll && dv.needsScrollSync == null) dv.needsScrollSync = toOrig
  162. return false
  163. }
  164. dv.needsScrollSync = null
  165. if (!dv.lockScroll) return true
  166. var editor,
  167. other,
  168. now = +new Date()
  169. if (toOrig) {
  170. editor = dv.edit
  171. other = dv.orig
  172. } else {
  173. editor = dv.orig
  174. other = dv.edit
  175. }
  176. // Don't take action if the position of this editor was recently set
  177. // (to prevent feedback loops)
  178. if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 250 > now) return false
  179. var sInfo = editor.getScrollInfo()
  180. if (dv.mv.options.connect == 'align') {
  181. targetPos = sInfo.top
  182. } else {
  183. var halfScreen = 0.5 * sInfo.clientHeight,
  184. midY = sInfo.top + halfScreen
  185. var mid = editor.lineAtHeight(midY, 'local')
  186. var around = chunkBoundariesAround(dv.chunks, mid, toOrig)
  187. var off = getOffsets(editor, toOrig ? around.edit : around.orig)
  188. var offOther = getOffsets(other, toOrig ? around.orig : around.edit)
  189. var ratio = (midY - off.top) / (off.bot - off.top)
  190. var targetPos = offOther.top - halfScreen + ratio * (offOther.bot - offOther.top)
  191. var botDist, mix
  192. // Some careful tweaking to make sure no space is left out of view
  193. // when scrolling to top or bottom.
  194. if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
  195. targetPos = targetPos * mix + sInfo.top * (1 - mix)
  196. } else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
  197. var otherInfo = other.getScrollInfo()
  198. var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos
  199. if (botDistOther > botDist && (mix = botDist / halfScreen) < 1) targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix)
  200. }
  201. }
  202. other.scrollTo(sInfo.left, targetPos)
  203. other.state.scrollSetAt = now
  204. other.state.scrollSetBy = dv
  205. return true
  206. }
  207. function getOffsets(editor, around) {
  208. var bot = around.after
  209. if (bot == null) bot = editor.lastLine() + 1
  210. return { top: editor.heightAtLine(around.before || 0, 'local'), bot: editor.heightAtLine(bot, 'local') }
  211. }
  212. function setScrollLock(dv, val, action) {
  213. dv.lockScroll = val
  214. if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv)
  215. ;(val ? CodeMirror.addClass : CodeMirror.rmClass)(dv.lockButton, 'CodeMirror-merge-scrolllock-enabled')
  216. }
  217. // Updating the marks for editor content
  218. function removeClass(editor, line, classes) {
  219. var locs = classes.classLocation
  220. for (var i = 0; i < locs.length; i++) {
  221. editor.removeLineClass(line, locs[i], classes.chunk)
  222. editor.removeLineClass(line, locs[i], classes.start)
  223. editor.removeLineClass(line, locs[i], classes.end)
  224. }
  225. }
  226. function clearMarks(editor, arr, classes) {
  227. for (var i = 0; i < arr.length; ++i) {
  228. var mark = arr[i]
  229. if (mark instanceof CodeMirror.TextMarker) mark.clear()
  230. else if (mark.parent) removeClass(editor, mark, classes)
  231. }
  232. arr.length = 0
  233. }
  234. // FIXME maybe add a margin around viewport to prevent too many updates
  235. function updateMarks(editor, diff, state, type, classes) {
  236. var vp = editor.getViewport()
  237. editor.operation(function () {
  238. if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
  239. clearMarks(editor, state.marked, classes)
  240. markChanges(editor, diff, type, state.marked, vp.from, vp.to, classes)
  241. state.from = vp.from
  242. state.to = vp.to
  243. } else {
  244. if (vp.from < state.from) {
  245. markChanges(editor, diff, type, state.marked, vp.from, state.from, classes)
  246. state.from = vp.from
  247. }
  248. if (vp.to > state.to) {
  249. markChanges(editor, diff, type, state.marked, state.to, vp.to, classes)
  250. state.to = vp.to
  251. }
  252. }
  253. })
  254. }
  255. function addClass(editor, lineNr, classes, main, start, end) {
  256. var locs = classes.classLocation,
  257. line = editor.getLineHandle(lineNr)
  258. for (var i = 0; i < locs.length; i++) {
  259. if (main) editor.addLineClass(line, locs[i], classes.chunk)
  260. if (start) editor.addLineClass(line, locs[i], classes.start)
  261. if (end) editor.addLineClass(line, locs[i], classes.end)
  262. }
  263. return line
  264. }
  265. function markChanges(editor, diff, type, marks, from, to, classes) {
  266. var pos = Pos(0, 0)
  267. var top = Pos(from, 0),
  268. bot = editor.clipPos(Pos(to - 1))
  269. var cls = type == DIFF_DELETE ? classes.del : classes.insert
  270. function markChunk(start, end) {
  271. var bfrom = Math.max(from, start),
  272. bto = Math.min(to, end)
  273. for (var i = bfrom; i < bto; ++i) marks.push(addClass(editor, i, classes, true, i == start, i == end - 1))
  274. // When the chunk is empty, make sure a horizontal line shows up
  275. if (start == end && bfrom == end && bto == end) {
  276. if (bfrom) marks.push(addClass(editor, bfrom - 1, classes, false, false, true))
  277. else marks.push(addClass(editor, bfrom, classes, false, true, false))
  278. }
  279. }
  280. var chunkStart = 0,
  281. pending = false
  282. for (var i = 0; i < diff.length; ++i) {
  283. var part = diff[i],
  284. tp = part[0],
  285. str = part[1]
  286. if (tp == DIFF_EQUAL) {
  287. var cleanFrom = pos.line + (startOfLineClean(diff, i) ? 0 : 1)
  288. moveOver(pos, str)
  289. var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0)
  290. if (cleanTo > cleanFrom) {
  291. if (pending) {
  292. markChunk(chunkStart, cleanFrom)
  293. pending = false
  294. }
  295. chunkStart = cleanTo
  296. }
  297. } else {
  298. pending = true
  299. if (tp == type) {
  300. var end = moveOver(pos, str, true)
  301. var a = posMax(top, pos),
  302. b = posMin(bot, end)
  303. if (!posEq(a, b)) marks.push(editor.markText(a, b, { className: cls }))
  304. pos = end
  305. }
  306. }
  307. }
  308. if (pending) markChunk(chunkStart, pos.line + 1)
  309. }
  310. // Updating the gap between editor and original
  311. function makeConnections(dv) {
  312. if (!dv.showDifferences) return
  313. if (dv.svg) {
  314. clear(dv.svg)
  315. var w = dv.gap.offsetWidth
  316. attrs(dv.svg, 'width', w, 'height', dv.gap.offsetHeight)
  317. }
  318. if (dv.copyButtons) clear(dv.copyButtons)
  319. var vpEdit = dv.edit.getViewport(),
  320. vpOrig = dv.orig.getViewport()
  321. var outerTop = dv.mv.wrap.getBoundingClientRect().top
  322. var sTopEdit = outerTop - dv.edit.getScrollerElement().getBoundingClientRect().top + dv.edit.getScrollInfo().top
  323. var sTopOrig = outerTop - dv.orig.getScrollerElement().getBoundingClientRect().top + dv.orig.getScrollInfo().top
  324. for (var i = 0; i < dv.chunks.length; i++) {
  325. var ch = dv.chunks[i]
  326. if (ch.editFrom <= vpEdit.to && ch.editTo >= vpEdit.from && ch.origFrom <= vpOrig.to && ch.origTo >= vpOrig.from) drawConnectorsForChunk(dv, ch, sTopOrig, sTopEdit, w)
  327. }
  328. }
  329. function getMatchingOrigLine(editLine, chunks) {
  330. var editStart = 0,
  331. origStart = 0
  332. for (var i = 0; i < chunks.length; i++) {
  333. var chunk = chunks[i]
  334. if (chunk.editTo > editLine && chunk.editFrom <= editLine) return null
  335. if (chunk.editFrom > editLine) break
  336. editStart = chunk.editTo
  337. origStart = chunk.origTo
  338. }
  339. return origStart + (editLine - editStart)
  340. }
  341. // Combines information about chunks and widgets/markers to return
  342. // an array of lines, in a single editor, that probably need to be
  343. // aligned with their counterparts in the editor next to it.
  344. function alignableFor(cm, chunks, isOrig) {
  345. var tracker = cm.state.trackAlignable
  346. var start = cm.firstLine(),
  347. trackI = 0
  348. var result = []
  349. for (var i = 0; ; i++) {
  350. var chunk = chunks[i]
  351. var chunkStart = !chunk ? 1e9 : isOrig ? chunk.origFrom : chunk.editFrom
  352. for (; trackI < tracker.alignable.length; trackI += 2) {
  353. var n = tracker.alignable[trackI] + 1
  354. if (n <= start) continue
  355. if (n <= chunkStart) result.push(n)
  356. else break
  357. }
  358. if (!chunk) break
  359. result.push((start = isOrig ? chunk.origTo : chunk.editTo))
  360. }
  361. return result
  362. }
  363. // Given information about alignable lines in two editors, fill in
  364. // the result (an array of three-element arrays) to reflect the
  365. // lines that need to be aligned with each other.
  366. function mergeAlignable(result, origAlignable, chunks, setIndex) {
  367. var rI = 0,
  368. origI = 0,
  369. chunkI = 0,
  370. diff = 0
  371. outer: for (; ; rI++) {
  372. var nextR = result[rI],
  373. nextO = origAlignable[origI]
  374. if (!nextR && nextO == null) break
  375. var rLine = nextR ? nextR[0] : 1e9,
  376. oLine = nextO == null ? 1e9 : nextO
  377. while (chunkI < chunks.length) {
  378. var chunk = chunks[chunkI]
  379. if (chunk.origFrom <= oLine && chunk.origTo > oLine) {
  380. origI++
  381. rI--
  382. continue outer
  383. }
  384. if (chunk.editTo > rLine) {
  385. if (chunk.editFrom <= rLine) continue outer
  386. break
  387. }
  388. diff += chunk.origTo - chunk.origFrom - (chunk.editTo - chunk.editFrom)
  389. chunkI++
  390. }
  391. if (rLine == oLine - diff) {
  392. nextR[setIndex] = oLine
  393. origI++
  394. } else if (rLine < oLine - diff) {
  395. nextR[setIndex] = rLine + diff
  396. } else {
  397. var record = [oLine - diff, null, null]
  398. record[setIndex] = oLine
  399. result.splice(rI, 0, record)
  400. origI++
  401. }
  402. }
  403. }
  404. function findAlignedLines(dv, other) {
  405. var alignable = alignableFor(dv.edit, dv.chunks, false),
  406. result = []
  407. if (other)
  408. for (var i = 0, j = 0; i < other.chunks.length; i++) {
  409. var n = other.chunks[i].editTo
  410. while (j < alignable.length && alignable[j] < n) j++
  411. if (j == alignable.length || alignable[j] != n) alignable.splice(j++, 0, n)
  412. }
  413. for (var i = 0; i < alignable.length; i++) result.push([alignable[i], null, null])
  414. mergeAlignable(result, alignableFor(dv.orig, dv.chunks, true), dv.chunks, 1)
  415. if (other) mergeAlignable(result, alignableFor(other.orig, other.chunks, true), other.chunks, 2)
  416. return result
  417. }
  418. function alignChunks(dv, force) {
  419. if (!dv.dealigned && !force) return
  420. if (!dv.orig.curOp)
  421. return dv.orig.operation(function () {
  422. alignChunks(dv, force)
  423. })
  424. dv.dealigned = false
  425. var other = dv.mv.left == dv ? dv.mv.right : dv.mv.left
  426. if (other) {
  427. ensureDiff(other)
  428. other.dealigned = false
  429. }
  430. var linesToAlign = findAlignedLines(dv, other)
  431. // Clear old aligners
  432. var aligners = dv.mv.aligners
  433. for (var i = 0; i < aligners.length; i++) aligners[i].clear()
  434. aligners.length = 0
  435. var cm = [dv.edit, dv.orig],
  436. scroll = [],
  437. offset = []
  438. if (other) cm.push(other.orig)
  439. for (var i = 0; i < cm.length; i++) {
  440. scroll.push(cm[i].getScrollInfo().top)
  441. offset.push(-cm[i].getScrollerElement().getBoundingClientRect().top)
  442. }
  443. if (offset[0] != offset[1] || (cm.length == 3 && offset[1] != offset[2])) alignLines(cm, offset, [0, 0, 0], aligners)
  444. for (var ln = 0; ln < linesToAlign.length; ln++) alignLines(cm, offset, linesToAlign[ln], aligners)
  445. for (var i = 0; i < cm.length; i++) cm[i].scrollTo(null, scroll[i])
  446. }
  447. function alignLines(cm, cmOffset, lines, aligners) {
  448. var maxOffset = -1e8,
  449. offset = []
  450. for (var i = 0; i < cm.length; i++)
  451. if (lines[i] != null) {
  452. var off = cm[i].heightAtLine(lines[i], 'local') - cmOffset[i]
  453. offset[i] = off
  454. maxOffset = Math.max(maxOffset, off)
  455. }
  456. for (var i = 0; i < cm.length; i++)
  457. if (lines[i] != null) {
  458. var diff = maxOffset - offset[i]
  459. if (diff > 1) aligners.push(padAbove(cm[i], lines[i], diff))
  460. }
  461. }
  462. function padAbove(cm, line, size) {
  463. var above = true
  464. if (line > cm.lastLine()) {
  465. line--
  466. above = false
  467. }
  468. var elt = document.createElement('div')
  469. elt.className = 'CodeMirror-merge-spacer'
  470. elt.style.height = size + 'px'
  471. elt.style.minWidth = '1px'
  472. return cm.addLineWidget(line, elt, { height: size, above: above, mergeSpacer: true, handleMouseEvents: true })
  473. }
  474. function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {
  475. var flip = dv.type == 'left'
  476. var top = dv.orig.heightAtLine(chunk.origFrom, 'local', true) - sTopOrig
  477. if (dv.svg) {
  478. var topLpx = top
  479. var topRpx = dv.edit.heightAtLine(chunk.editFrom, 'local', true) - sTopEdit
  480. if (flip) {
  481. var tmp = topLpx
  482. topLpx = topRpx
  483. topRpx = tmp
  484. }
  485. var botLpx = dv.orig.heightAtLine(chunk.origTo, 'local', true) - sTopOrig
  486. var botRpx = dv.edit.heightAtLine(chunk.editTo, 'local', true) - sTopEdit
  487. if (flip) {
  488. var tmp = botLpx
  489. botLpx = botRpx
  490. botRpx = tmp
  491. }
  492. var curveTop = ' C ' + w / 2 + ' ' + topRpx + ' ' + w / 2 + ' ' + topLpx + ' ' + (w + 2) + ' ' + topLpx
  493. var curveBot = ' C ' + w / 2 + ' ' + botLpx + ' ' + w / 2 + ' ' + botRpx + ' -1 ' + botRpx
  494. attrs(dv.svg.appendChild(document.createElementNS(svgNS, 'path')), 'd', 'M -1 ' + topRpx + curveTop + ' L ' + (w + 2) + ' ' + botLpx + curveBot + ' z', 'class', dv.classes.connect)
  495. }
  496. if (dv.copyButtons) {
  497. var copy = dv.copyButtons.appendChild(elt('div', dv.type == 'left' ? '\u21dd' : '\u21dc', 'CodeMirror-merge-copy'))
  498. var editOriginals = dv.mv.options.allowEditingOriginals
  499. copy.title = dv.edit.phrase(editOriginals ? 'Push to left' : 'Revert chunk')
  500. copy.chunk = chunk
  501. copy.style.top = (chunk.origTo > chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, 'local') - sTopEdit) + 'px'
  502. copy.setAttribute('role', 'button')
  503. if (editOriginals) {
  504. var topReverse = dv.edit.heightAtLine(chunk.editFrom, 'local') - sTopEdit
  505. var copyReverse = dv.copyButtons.appendChild(elt('div', dv.type == 'right' ? '\u21dd' : '\u21dc', 'CodeMirror-merge-copy-reverse'))
  506. copyReverse.title = 'Push to right'
  507. copyReverse.chunk = { editFrom: chunk.origFrom, editTo: chunk.origTo, origFrom: chunk.editFrom, origTo: chunk.editTo }
  508. copyReverse.style.top = topReverse + 'px'
  509. dv.type == 'right' ? (copyReverse.style.left = '2px') : (copyReverse.style.right = '2px')
  510. copyReverse.setAttribute('role', 'button')
  511. }
  512. }
  513. }
  514. function copyChunk(dv, to, from, chunk) {
  515. if (dv.diffOutOfDate) return
  516. var origStart = chunk.origTo > from.lastLine() ? Pos(chunk.origFrom - 1) : Pos(chunk.origFrom, 0)
  517. var origEnd = Pos(chunk.origTo, 0)
  518. var editStart = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
  519. var editEnd = Pos(chunk.editTo, 0)
  520. var handler = dv.mv.options.revertChunk
  521. if (handler) handler(dv.mv, from, origStart, origEnd, to, editStart, editEnd)
  522. else to.replaceRange(from.getRange(origStart, origEnd), editStart, editEnd)
  523. }
  524. // Merge view, containing 0, 1, or 2 diff views.
  525. var MergeView = (CodeMirror.MergeView = function (node, options) {
  526. if (!(this instanceof MergeView)) return new MergeView(node, options)
  527. this.options = options
  528. var origLeft = options.origLeft,
  529. origRight = options.origRight == null ? options.orig : options.origRight
  530. var hasLeft = origLeft != null,
  531. hasRight = origRight != null
  532. var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0)
  533. var wrap = [],
  534. left = (this.left = null),
  535. right = (this.right = null)
  536. var self = this
  537. if (hasLeft) {
  538. left = this.left = new DiffView(this, 'left')
  539. var leftPane = elt('div', null, 'CodeMirror-merge-pane CodeMirror-merge-left')
  540. wrap.push(leftPane)
  541. wrap.push(buildGap(left))
  542. }
  543. var editPane = elt('div', null, 'CodeMirror-merge-pane CodeMirror-merge-editor')
  544. wrap.push(editPane)
  545. if (hasRight) {
  546. right = this.right = new DiffView(this, 'right')
  547. wrap.push(buildGap(right))
  548. var rightPane = elt('div', null, 'CodeMirror-merge-pane CodeMirror-merge-right')
  549. wrap.push(rightPane)
  550. }
  551. ;(hasRight ? rightPane : editPane).className += ' CodeMirror-merge-pane-rightmost'
  552. wrap.push(elt('div', null, null, 'height: 0; clear: both;'))
  553. var wrapElt = (this.wrap = node.appendChild(elt('div', wrap, 'CodeMirror-merge CodeMirror-merge-' + panes + 'pane')))
  554. this.edit = CodeMirror(editPane, copyObj(options))
  555. if (left) left.init(leftPane, origLeft, options)
  556. if (right) right.init(rightPane, origRight, options)
  557. if (options.collapseIdentical)
  558. this.editor().operation(function () {
  559. collapseIdenticalStretches(self, options.collapseIdentical)
  560. })
  561. if (options.connect == 'align') {
  562. this.aligners = []
  563. alignChunks(this.left || this.right, true)
  564. }
  565. if (left) left.registerEvents(right)
  566. if (right) right.registerEvents(left)
  567. var onResize = function () {
  568. if (left) makeConnections(left)
  569. if (right) makeConnections(right)
  570. }
  571. CodeMirror.on(window, 'resize', onResize)
  572. var resizeInterval = setInterval(function () {
  573. for (var p = wrapElt.parentNode; p && p != document.body; p = p.parentNode) {}
  574. if (!p) {
  575. clearInterval(resizeInterval)
  576. CodeMirror.off(window, 'resize', onResize)
  577. }
  578. }, 5000)
  579. })
  580. function buildGap(dv) {
  581. var lock = (dv.lockButton = elt('div', null, 'CodeMirror-merge-scrolllock'))
  582. lock.setAttribute('role', 'button')
  583. var lockWrap = elt('div', [lock], 'CodeMirror-merge-scrolllock-wrap')
  584. CodeMirror.on(lock, 'click', function () {
  585. setScrollLock(dv, !dv.lockScroll)
  586. })
  587. var gapElts = [lockWrap]
  588. if (dv.mv.options.revertButtons !== false) {
  589. dv.copyButtons = elt('div', null, 'CodeMirror-merge-copybuttons-' + dv.type)
  590. CodeMirror.on(dv.copyButtons, 'click', function (e) {
  591. var node = e.target || e.srcElement
  592. if (!node.chunk) return
  593. if (node.className == 'CodeMirror-merge-copy-reverse') {
  594. copyChunk(dv, dv.orig, dv.edit, node.chunk)
  595. return
  596. }
  597. copyChunk(dv, dv.edit, dv.orig, node.chunk)
  598. })
  599. gapElts.unshift(dv.copyButtons)
  600. }
  601. if (dv.mv.options.connect != 'align') {
  602. var svg = document.createElementNS && document.createElementNS(svgNS, 'svg')
  603. if (svg && !svg.createSVGRect) svg = null
  604. dv.svg = svg
  605. if (svg) gapElts.push(svg)
  606. }
  607. return (dv.gap = elt('div', gapElts, 'CodeMirror-merge-gap'))
  608. }
  609. MergeView.prototype = {
  610. constructor: MergeView,
  611. editor: function () {
  612. return this.edit
  613. },
  614. rightOriginal: function () {
  615. return this.right && this.right.orig
  616. },
  617. leftOriginal: function () {
  618. return this.left && this.left.orig
  619. },
  620. setShowDifferences: function (val) {
  621. if (this.right) this.right.setShowDifferences(val)
  622. if (this.left) this.left.setShowDifferences(val)
  623. },
  624. rightChunks: function () {
  625. if (this.right) {
  626. ensureDiff(this.right)
  627. return this.right.chunks
  628. }
  629. },
  630. leftChunks: function () {
  631. if (this.left) {
  632. ensureDiff(this.left)
  633. return this.left.chunks
  634. }
  635. },
  636. }
  637. function asString(obj) {
  638. if (typeof obj == 'string') return obj
  639. else return obj.getValue()
  640. }
  641. // Operations on diffs
  642. var dmp
  643. function getDiff(a, b, ignoreWhitespace) {
  644. if (!dmp) dmp = new diff_match_patch()
  645. var diff = dmp.diff_main(a, b)
  646. // The library sometimes leaves in empty parts, which confuse the algorithm
  647. for (var i = 0; i < diff.length; ++i) {
  648. var part = diff[i]
  649. if (ignoreWhitespace ? !/[^ \t]/.test(part[1]) : !part[1]) {
  650. diff.splice(i--, 1)
  651. } else if (i && diff[i - 1][0] == part[0]) {
  652. diff.splice(i--, 1)
  653. diff[i][1] += part[1]
  654. }
  655. }
  656. return diff
  657. }
  658. function getChunks(diff) {
  659. var chunks = []
  660. if (!diff.length) return chunks
  661. var startEdit = 0,
  662. startOrig = 0
  663. var edit = Pos(0, 0),
  664. orig = Pos(0, 0)
  665. for (var i = 0; i < diff.length; ++i) {
  666. var part = diff[i],
  667. tp = part[0]
  668. if (tp == DIFF_EQUAL) {
  669. var startOff = !startOfLineClean(diff, i) || edit.line < startEdit || orig.line < startOrig ? 1 : 0
  670. var cleanFromEdit = edit.line + startOff,
  671. cleanFromOrig = orig.line + startOff
  672. moveOver(edit, part[1], null, orig)
  673. var endOff = endOfLineClean(diff, i) ? 1 : 0
  674. var cleanToEdit = edit.line + endOff,
  675. cleanToOrig = orig.line + endOff
  676. if (cleanToEdit > cleanFromEdit) {
  677. if (i) chunks.push({ origFrom: startOrig, origTo: cleanFromOrig, editFrom: startEdit, editTo: cleanFromEdit })
  678. startEdit = cleanToEdit
  679. startOrig = cleanToOrig
  680. }
  681. } else {
  682. moveOver(tp == DIFF_INSERT ? edit : orig, part[1])
  683. }
  684. }
  685. if (startEdit <= edit.line || startOrig <= orig.line) chunks.push({ origFrom: startOrig, origTo: orig.line + 1, editFrom: startEdit, editTo: edit.line + 1 })
  686. return chunks
  687. }
  688. function endOfLineClean(diff, i) {
  689. if (i == diff.length - 1) return true
  690. var next = diff[i + 1][1]
  691. if ((next.length == 1 && i < diff.length - 2) || next.charCodeAt(0) != 10) return false
  692. if (i == diff.length - 2) return true
  693. next = diff[i + 2][1]
  694. return (next.length > 1 || i == diff.length - 3) && next.charCodeAt(0) == 10
  695. }
  696. function startOfLineClean(diff, i) {
  697. if (i == 0) return true
  698. var last = diff[i - 1][1]
  699. if (last.charCodeAt(last.length - 1) != 10) return false
  700. if (i == 1) return true
  701. last = diff[i - 2][1]
  702. return last.charCodeAt(last.length - 1) == 10
  703. }
  704. function chunkBoundariesAround(chunks, n, nInEdit) {
  705. var beforeE, afterE, beforeO, afterO
  706. for (var i = 0; i < chunks.length; i++) {
  707. var chunk = chunks[i]
  708. var fromLocal = nInEdit ? chunk.editFrom : chunk.origFrom
  709. var toLocal = nInEdit ? chunk.editTo : chunk.origTo
  710. if (afterE == null) {
  711. if (fromLocal > n) {
  712. afterE = chunk.editFrom
  713. afterO = chunk.origFrom
  714. } else if (toLocal > n) {
  715. afterE = chunk.editTo
  716. afterO = chunk.origTo
  717. }
  718. }
  719. if (toLocal <= n) {
  720. beforeE = chunk.editTo
  721. beforeO = chunk.origTo
  722. } else if (fromLocal <= n) {
  723. beforeE = chunk.editFrom
  724. beforeO = chunk.origFrom
  725. }
  726. }
  727. return { edit: { before: beforeE, after: afterE }, orig: { before: beforeO, after: afterO } }
  728. }
  729. function collapseSingle(cm, from, to) {
  730. cm.addLineClass(from, 'wrap', 'CodeMirror-merge-collapsed-line')
  731. var widget = document.createElement('span')
  732. widget.className = 'CodeMirror-merge-collapsed-widget'
  733. widget.title = cm.phrase('Identical text collapsed. Click to expand.')
  734. var mark = cm.markText(Pos(from, 0), Pos(to - 1), {
  735. inclusiveLeft: true,
  736. inclusiveRight: true,
  737. replacedWith: widget,
  738. clearOnEnter: true,
  739. })
  740. function clear() {
  741. mark.clear()
  742. cm.removeLineClass(from, 'wrap', 'CodeMirror-merge-collapsed-line')
  743. }
  744. if (mark.explicitlyCleared) clear()
  745. CodeMirror.on(widget, 'click', clear)
  746. mark.on('clear', clear)
  747. CodeMirror.on(widget, 'click', clear)
  748. return { mark: mark, clear: clear }
  749. }
  750. function collapseStretch(size, editors) {
  751. var marks = []
  752. function clear() {
  753. for (var i = 0; i < marks.length; i++) marks[i].clear()
  754. }
  755. for (var i = 0; i < editors.length; i++) {
  756. var editor = editors[i]
  757. var mark = collapseSingle(editor.cm, editor.line, editor.line + size)
  758. marks.push(mark)
  759. mark.mark.on('clear', clear)
  760. }
  761. return marks[0].mark
  762. }
  763. function unclearNearChunks(dv, margin, off, clear) {
  764. for (var i = 0; i < dv.chunks.length; i++) {
  765. var chunk = dv.chunks[i]
  766. for (var l = chunk.editFrom - margin; l < chunk.editTo + margin; l++) {
  767. var pos = l + off
  768. if (pos >= 0 && pos < clear.length) clear[pos] = false
  769. }
  770. }
  771. }
  772. function collapseIdenticalStretches(mv, margin) {
  773. if (typeof margin != 'number') margin = 2
  774. var clear = [],
  775. edit = mv.editor(),
  776. off = edit.firstLine()
  777. for (var l = off, e = edit.lastLine(); l <= e; l++) clear.push(true)
  778. if (mv.left) unclearNearChunks(mv.left, margin, off, clear)
  779. if (mv.right) unclearNearChunks(mv.right, margin, off, clear)
  780. for (var i = 0; i < clear.length; i++) {
  781. if (clear[i]) {
  782. var line = i + off
  783. for (var size = 1; i < clear.length - 1 && clear[i + 1]; i++, size++) {}
  784. if (size > margin) {
  785. var editors = [{ line: line, cm: edit }]
  786. if (mv.left) editors.push({ line: getMatchingOrigLine(line, mv.left.chunks), cm: mv.left.orig })
  787. if (mv.right) editors.push({ line: getMatchingOrigLine(line, mv.right.chunks), cm: mv.right.orig })
  788. var mark = collapseStretch(size, editors)
  789. if (mv.options.onCollapse) mv.options.onCollapse(mv, line, size, mark)
  790. }
  791. }
  792. }
  793. }
  794. // General utilities
  795. function elt(tag, content, className, style) {
  796. var e = document.createElement(tag)
  797. if (className) e.className = className
  798. if (style) e.style.cssText = style
  799. if (typeof content == 'string') e.appendChild(document.createTextNode(content))
  800. else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i])
  801. return e
  802. }
  803. function clear(node) {
  804. for (var count = node.childNodes.length; count > 0; --count) node.removeChild(node.firstChild)
  805. }
  806. function attrs(elt) {
  807. for (var i = 1; i < arguments.length; i += 2) elt.setAttribute(arguments[i], arguments[i + 1])
  808. }
  809. function copyObj(obj, target) {
  810. if (!target) target = {}
  811. for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop]
  812. return target
  813. }
  814. function moveOver(pos, str, copy, other) {
  815. var out = copy ? Pos(pos.line, pos.ch) : pos,
  816. at = 0
  817. for (;;) {
  818. var nl = str.indexOf('\n', at)
  819. if (nl == -1) break
  820. ++out.line
  821. if (other) ++other.line
  822. at = nl + 1
  823. }
  824. out.ch = (at ? 0 : out.ch) + (str.length - at)
  825. if (other) other.ch = (at ? 0 : other.ch) + (str.length - at)
  826. return out
  827. }
  828. // Tracks collapsed markers and line widgets, in order to be able to
  829. // accurately align the content of two editors.
  830. var F_WIDGET = 1,
  831. F_WIDGET_BELOW = 2,
  832. F_MARKER = 4
  833. function TrackAlignable(cm) {
  834. this.cm = cm
  835. this.alignable = []
  836. this.height = cm.doc.height
  837. var self = this
  838. cm.on('markerAdded', function (_, marker) {
  839. if (!marker.collapsed) return
  840. var found = marker.find(1)
  841. if (found != null) self.set(found.line, F_MARKER)
  842. })
  843. cm.on('markerCleared', function (_, marker, _min, max) {
  844. if (max != null && marker.collapsed) self.check(max, F_MARKER, self.hasMarker)
  845. })
  846. cm.on('markerChanged', this.signal.bind(this))
  847. cm.on('lineWidgetAdded', function (_, widget, lineNo) {
  848. if (widget.mergeSpacer) return
  849. if (widget.above) self.set(lineNo - 1, F_WIDGET_BELOW)
  850. else self.set(lineNo, F_WIDGET)
  851. })
  852. cm.on('lineWidgetCleared', function (_, widget, lineNo) {
  853. if (widget.mergeSpacer) return
  854. if (widget.above) self.check(lineNo - 1, F_WIDGET_BELOW, self.hasWidgetBelow)
  855. else self.check(lineNo, F_WIDGET, self.hasWidget)
  856. })
  857. cm.on('lineWidgetChanged', this.signal.bind(this))
  858. cm.on('change', function (_, change) {
  859. var start = change.from.line,
  860. nBefore = change.to.line - change.from.line
  861. var nAfter = change.text.length - 1,
  862. end = start + nAfter
  863. if (nBefore || nAfter) self.map(start, nBefore, nAfter)
  864. self.check(end, F_MARKER, self.hasMarker)
  865. if (nBefore || nAfter) self.check(change.from.line, F_MARKER, self.hasMarker)
  866. })
  867. cm.on('viewportChange', function () {
  868. if (self.cm.doc.height != self.height) self.signal()
  869. })
  870. }
  871. TrackAlignable.prototype = {
  872. signal: function () {
  873. CodeMirror.signal(this, 'realign')
  874. this.height = this.cm.doc.height
  875. },
  876. set: function (n, flags) {
  877. var pos = -1
  878. for (; pos < this.alignable.length; pos += 2) {
  879. var diff = this.alignable[pos] - n
  880. if (diff == 0) {
  881. if ((this.alignable[pos + 1] & flags) == flags) return
  882. this.alignable[pos + 1] |= flags
  883. this.signal()
  884. return
  885. }
  886. if (diff > 0) break
  887. }
  888. this.signal()
  889. this.alignable.splice(pos, 0, n, flags)
  890. },
  891. find: function (n) {
  892. for (var i = 0; i < this.alignable.length; i += 2) if (this.alignable[i] == n) return i
  893. return -1
  894. },
  895. check: function (n, flag, pred) {
  896. var found = this.find(n)
  897. if (found == -1 || !(this.alignable[found + 1] & flag)) return
  898. if (!pred.call(this, n)) {
  899. this.signal()
  900. var flags = this.alignable[found + 1] & ~flag
  901. if (flags) this.alignable[found + 1] = flags
  902. else this.alignable.splice(found, 2)
  903. }
  904. },
  905. hasMarker: function (n) {
  906. var handle = this.cm.getLineHandle(n)
  907. if (handle.markedSpans) for (var i = 0; i < handle.markedSpans.length; i++) if (handle.markedSpans[i].marker.collapsed && handle.markedSpans[i].to != null) return true
  908. return false
  909. },
  910. hasWidget: function (n) {
  911. var handle = this.cm.getLineHandle(n)
  912. if (handle.widgets) for (var i = 0; i < handle.widgets.length; i++) if (!handle.widgets[i].above && !handle.widgets[i].mergeSpacer) return true
  913. return false
  914. },
  915. hasWidgetBelow: function (n) {
  916. if (n == this.cm.lastLine()) return false
  917. var handle = this.cm.getLineHandle(n + 1)
  918. if (handle.widgets) for (var i = 0; i < handle.widgets.length; i++) if (handle.widgets[i].above && !handle.widgets[i].mergeSpacer) return true
  919. return false
  920. },
  921. map: function (from, nBefore, nAfter) {
  922. var diff = nAfter - nBefore,
  923. to = from + nBefore,
  924. widgetFrom = -1,
  925. widgetTo = -1
  926. for (var i = 0; i < this.alignable.length; i += 2) {
  927. var n = this.alignable[i]
  928. if (n == from && this.alignable[i + 1] & F_WIDGET_BELOW) widgetFrom = i
  929. if (n == to && this.alignable[i + 1] & F_WIDGET_BELOW) widgetTo = i
  930. if (n <= from) continue
  931. else if (n < to) this.alignable.splice(i--, 2)
  932. else this.alignable[i] += diff
  933. }
  934. if (widgetFrom > -1) {
  935. var flags = this.alignable[widgetFrom + 1]
  936. if (flags == F_WIDGET_BELOW) this.alignable.splice(widgetFrom, 2)
  937. else this.alignable[widgetFrom + 1] = flags & ~F_WIDGET_BELOW
  938. }
  939. if (widgetTo > -1 && nAfter) this.set(from + nAfter, F_WIDGET_BELOW)
  940. },
  941. }
  942. function posMin(a, b) {
  943. return (a.line - b.line || a.ch - b.ch) < 0 ? a : b
  944. }
  945. function posMax(a, b) {
  946. return (a.line - b.line || a.ch - b.ch) > 0 ? a : b
  947. }
  948. function posEq(a, b) {
  949. return a.line == b.line && a.ch == b.ch
  950. }
  951. function findPrevDiff(chunks, start, isOrig) {
  952. for (var i = chunks.length - 1; i >= 0; i--) {
  953. var chunk = chunks[i]
  954. var to = (isOrig ? chunk.origTo : chunk.editTo) - 1
  955. if (to < start) return to
  956. }
  957. }
  958. function findNextDiff(chunks, start, isOrig) {
  959. for (var i = 0; i < chunks.length; i++) {
  960. var chunk = chunks[i]
  961. var from = isOrig ? chunk.origFrom : chunk.editFrom
  962. if (from > start) return from
  963. }
  964. }
  965. function goNearbyDiff(cm, dir) {
  966. var found = null,
  967. views = cm.state.diffViews,
  968. line = cm.getCursor().line
  969. if (views)
  970. for (var i = 0; i < views.length; i++) {
  971. var dv = views[i],
  972. isOrig = cm == dv.orig
  973. ensureDiff(dv)
  974. var pos = dir < 0 ? findPrevDiff(dv.chunks, line, isOrig) : findNextDiff(dv.chunks, line, isOrig)
  975. if (pos != null && (found == null || (dir < 0 ? pos > found : pos < found))) found = pos
  976. }
  977. if (found != null) cm.setCursor(found, 0)
  978. else return CodeMirror.Pass
  979. }
  980. CodeMirror.commands.goNextDiff = function (cm) {
  981. return goNearbyDiff(cm, 1)
  982. }
  983. CodeMirror.commands.goPrevDiff = function (cm) {
  984. return goNearbyDiff(cm, -1)
  985. }
  986. })