{"files":[{"status":"M","path":"docs\/_js\/live_editor.js"},{"status":"M","path":"docs\/js\/codemirror.js"}],"parents":["1155aa9ac01bec072709a61be5aa8916814acf82","b2e51c6e0172890033bb2c9cb11c50b8cc239290"],"commit":{"subject":"Merge pull request #755 from spicyj\/cm-scroll","shortRevision":"96782fc836","revision":"96782fc836715b6fbab50f4e74a0071e026ee013","authorEmail":"vjeuxx@gmail.com","authoredAt":"2013-12-30T20:56:59-08:00","authorName":"Christopher Chedeau"},"body":"Upgrade codemirror and enable line wrapping","patch":"diff --git a\/docs\/_js\/live_editor.js b\/docs\/_js\/live_editor.js\nindex 4370cf8595..aebeadec06 100644\n--- a\/docs\/_js\/live_editor.js\n+++ b\/docs\/_js\/live_editor.js\n@@ -21,6 +21,7 @@ var CodeMirrorEditor = React.createClass({\n this.editor = CodeMirror.fromTextArea(this.refs.editor.getDOMNode(), {\n mode: 'javascript',\n lineNumbers: false,\n+ lineWrapping: true,\n matchBrackets: true,\n theme: 'solarized-light',\n readOnly: this.props.readOnly\ndiff --git a\/docs\/js\/codemirror.js b\/docs\/js\/codemirror.js\nindex acabd861dc..086f84151e 100644\n--- a\/docs\/js\/codemirror.js\n+++ b\/docs\/js\/codemirror.js\n@@ -7,9 +7,13 @@ window.CodeMirror = (function() {\n \/\/ Crude, but necessary to handle a number of hard-to-feature-detect\n \/\/ bugs and behavior differences.\n var gecko = \/gecko\\\/\\d\/i.test(navigator.userAgent);\n+ \/\/ IE11 currently doesn't count as 'ie', since it has almost none of\n+ \/\/ the same bugs as earlier versions. Use ie_gt10 to handle\n+ \/\/ incompatibilities in that version.\n var ie = \/MSIE \\d\/.test(navigator.userAgent);\n var ie_lt8 = ie && (document.documentMode == null || document.documentMode < 8);\n var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);\n+ var ie_gt10 = \/Trident\\\/([7-9]|\\d{2,})\\.\/.test(navigator.userAgent);\n var webkit = \/WebKit\\\/\/.test(navigator.userAgent);\n var qtwebkit = webkit && \/Qt\\\/\\d+\\.\\d+\/.test(navigator.userAgent);\n var chrome = \/Chrome\\\/\/.test(navigator.userAgent);\n@@ -24,10 +28,11 @@ window.CodeMirror = (function() {\n \/\/ This is woefully incomplete. Suggestions for alternative methods welcome.\n var mobile = ios || \/Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile\/i.test(navigator.userAgent);\n var mac = ios || \/Mac\/.test(navigator.platform);\n- var windows = \/windows\/i.test(navigator.platform);\n+ var windows = \/win\/i.test(navigator.platform);\n \n var opera_version = opera && navigator.userAgent.match(\/Version\\\/(\\d*\\.\\d*)\/);\n if (opera_version) opera_version = Number(opera_version[1]);\n+ if (opera_version && opera_version >= 15) { opera = false; webkit = true; }\n \/\/ Some browsers use the wrong event properties to signal cmd\/ctrl on OS X\n var flipCtrlCmd = mac && (qtwebkit || opera && (opera_version == null || opera_version < 12.11));\n var captureMiddleClick = gecko || (ie && !ie_lt9);\n@@ -39,7 +44,7 @@ window.CodeMirror = (function() {\n \n function CodeMirror(place, options) {\n if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);\n- \n+\n this.options = options = options || {};\n \/\/ Determine effective options based on given values and defaults.\n for (var opt in defaults) if (!options.hasOwnProperty(opt) && defaults.hasOwnProperty(opt))\n@@ -60,7 +65,6 @@ window.CodeMirror = (function() {\n draggingText: false,\n highlight: new Delayed()};\n \n- this.nextOpId = 0;\n themeChanged(this);\n if (options.lineWrapping)\n this.display.wrapper.className += \" CodeMirror-wrap\";\n@@ -92,18 +96,23 @@ window.CodeMirror = (function() {\n \n function makeDisplay(place, docStart) {\n var d = {};\n- var input = d.input = elt(\"textarea\", null, null, \"position: absolute; padding: 0; width: 1px; height: 1em; outline: none;\");\n+\n+ var input = d.input = elt(\"textarea\", null, null, \"position: absolute; padding: 0; width: 1px; height: 1em; outline: none; font-size: 4px;\");\n if (webkit) input.style.width = \"1000px\";\n else input.setAttribute(\"wrap\", \"off\");\n- input.setAttribute(\"autocorrect\", \"off\"); input.setAttribute(\"autocapitalize\", \"off\");\n+ \/\/ if border: 0; -- iOS fails to open keyboard (issue #1287)\n+ if (ios) input.style.border = \"1px solid black\";\n+ input.setAttribute(\"autocorrect\", \"off\"); input.setAttribute(\"autocapitalize\", \"off\"); input.setAttribute(\"spellcheck\", \"false\");\n+\n \/\/ Wraps and hides input textarea\n d.inputDiv = elt(\"div\", [input], null, \"overflow: hidden; position: relative; width: 3px; height: 0px;\");\n \/\/ The actual fake scrollbars.\n d.scrollbarH = elt(\"div\", [elt(\"div\", null, null, \"height: 1px\")], \"CodeMirror-hscrollbar\");\n d.scrollbarV = elt(\"div\", [elt(\"div\", null, null, \"width: 1px\")], \"CodeMirror-vscrollbar\");\n d.scrollbarFiller = elt(\"div\", null, \"CodeMirror-scrollbar-filler\");\n+ d.gutterFiller = elt(\"div\", null, \"CodeMirror-gutter-filler\");\n \/\/ DIVs containing the selection and the actual code\n- d.lineDiv = elt(\"div\");\n+ d.lineDiv = elt(\"div\", null, \"CodeMirror-code\");\n d.selectionDiv = elt(\"div\", null, null, \"position: relative; z-index: 1\");\n \/\/ Blinky cursor, and element used to ensure cursor fits at the end of a line\n d.cursor = elt(\"div\", \"\\u00a0\", \"CodeMirror-cursor\");\n@@ -119,18 +128,16 @@ window.CodeMirror = (function() {\n \/\/ Set to the height of the text, causes scrolling\n d.sizer = elt(\"div\", [d.mover], \"CodeMirror-sizer\");\n \/\/ D is needed because behavior of elts with overflow: auto and padding is inconsistent across browsers\n- d.heightForcer = elt(\"div\", \"\\u00a0\", null, \"position: absolute; height: \" + scrollerCutOff + \"px\");\n+ d.heightForcer = elt(\"div\", null, null, \"position: absolute; height: \" + scrollerCutOff + \"px; width: 1px;\");\n \/\/ Will contain the gutters, if any\n d.gutters = elt(\"div\", null, \"CodeMirror-gutters\");\n d.lineGutter = null;\n- \/\/ Helper element to properly size the gutter backgrounds\n- var scrollerInner = elt(\"div\", [d.sizer, d.heightForcer, d.gutters], null, \"position: relative; min-height: 100%\");\n \/\/ Provides scrolling\n- d.scroller = elt(\"div\", [scrollerInner], \"CodeMirror-scroll\");\n+ d.scroller = elt(\"div\", [d.sizer, d.heightForcer, d.gutters], \"CodeMirror-scroll\");\n d.scroller.setAttribute(\"tabIndex\", \"-1\");\n \/\/ The element in which the editor lives.\n d.wrapper = elt(\"div\", [d.inputDiv, d.scrollbarH, d.scrollbarV,\n- d.scrollbarFiller, d.scroller], \"CodeMirror\");\n+ d.scrollbarFiller, d.gutterFiller, d.scroller], \"CodeMirror\");\n \/\/ Work around IE7 z-index bug\n if (ie_lt8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }\n if (place.appendChild) place.appendChild(d.wrapper); else place(d.wrapper);\n@@ -161,8 +168,6 @@ window.CodeMirror = (function() {\n d.pollingFast = false;\n \/\/ Self-resetting timeout for the poller\n d.poll = new Delayed();\n- \/\/ True when a drag from the editor is active\n- d.draggingText = false;\n \n d.cachedCharWidth = d.cachedTextHeight = null;\n d.measureLineCache = [];\n@@ -180,7 +185,7 @@ window.CodeMirror = (function() {\n \n \/\/ Used for measuring wheel scrolling granularity\n d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;\n- \n+\n return d;\n }\n \n@@ -211,7 +216,7 @@ window.CodeMirror = (function() {\n estimateLineHeights(cm);\n regChange(cm);\n clearCaches(cm);\n- setTimeout(function(){updateScrollbars(cm.display, cm.doc.height);}, 100);\n+ setTimeout(function(){updateScrollbars(cm);}, 100);\n }\n \n function estimateHeight(cm) {\n@@ -236,9 +241,11 @@ window.CodeMirror = (function() {\n }\n \n function keyMapChanged(cm) {\n- var style = keyMap[cm.options.keyMap].style;\n+ var map = keyMap[cm.options.keyMap], style = map.style;\n cm.display.wrapper.className = cm.display.wrapper.className.replace(\/\\s*cm-keymap-\\S+\/g, \"\") +\n (style ? \" cm-keymap-\" + style : \"\");\n+ if (cm.state.disableInput && !map.disableInput) resetInput(cm, true);\n+ cm.state.disableInput = map.disableInput;\n }\n \n function themeChanged(cm) {\n@@ -250,6 +257,7 @@ window.CodeMirror = (function() {\n function guttersChanged(cm) {\n updateGutters(cm);\n regChange(cm);\n+ setTimeout(function(){alignHorizontally(cm);}, 20);\n }\n \n function updateGutters(cm) {\n@@ -301,46 +309,59 @@ window.CodeMirror = (function() {\n \/\/ Make sure the gutters options contains the element\n \/\/ \"CodeMirror-linenumbers\" when the lineNumbers option is true.\n function setGuttersForLineNumbers(options) {\n- var found = false;\n- for (var i = 0; i < options.gutters.length; ++i) {\n- if (options.gutters[i] == \"CodeMirror-linenumbers\") {\n- if (options.lineNumbers) found = true;\n- else options.gutters.splice(i--, 1);\n- }\n+ var found = indexOf(options.gutters, \"CodeMirror-linenumbers\");\n+ if (found == -1 && options.lineNumbers) {\n+ options.gutters = options.gutters.concat([\"CodeMirror-linenumbers\"]);\n+ } else if (found > -1 && !options.lineNumbers) {\n+ options.gutters = options.gutters.slice(0);\n+ options.gutters.splice(found, 1);\n }\n- if (!found && options.lineNumbers)\n- options.gutters.push(\"CodeMirror-linenumbers\");\n }\n \n \/\/ SCROLLBARS\n \n \/\/ Re-synchronize the fake scrollbars with the actual size of the\n \/\/ content. Optionally force a scrollTop.\n- function updateScrollbars(d \/* display *\/, docHeight) {\n- var totalHeight = docHeight + 2 * paddingTop(d);\n+ function updateScrollbars(cm) {\n+ var d = cm.display, docHeight = cm.doc.height;\n+ var totalHeight = docHeight + paddingVert(d);\n d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + \"px\";\n+ d.gutters.style.height = Math.max(totalHeight, d.scroller.clientHeight - scrollerCutOff) + \"px\";\n var scrollHeight = Math.max(totalHeight, d.scroller.scrollHeight);\n- var needsH = d.scroller.scrollWidth > d.scroller.clientWidth;\n- var needsV = scrollHeight > d.scroller.clientHeight;\n+ var needsH = d.scroller.scrollWidth > (d.scroller.clientWidth + 1);\n+ var needsV = scrollHeight > (d.scroller.clientHeight + 1);\n if (needsV) {\n d.scrollbarV.style.display = \"block\";\n d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + \"px\" : \"0\";\n- d.scrollbarV.firstChild.style.height = \n+ d.scrollbarV.firstChild.style.height =\n (scrollHeight - d.scroller.clientHeight + d.scrollbarV.clientHeight) + \"px\";\n- } else d.scrollbarV.style.display = \"\";\n+ } else {\n+ d.scrollbarV.style.display = \"\";\n+ d.scrollbarV.firstChild.style.height = \"0\";\n+ }\n if (needsH) {\n d.scrollbarH.style.display = \"block\";\n d.scrollbarH.style.right = needsV ? scrollbarWidth(d.measure) + \"px\" : \"0\";\n d.scrollbarH.firstChild.style.width =\n (d.scroller.scrollWidth - d.scroller.clientWidth + d.scrollbarH.clientWidth) + \"px\";\n- } else d.scrollbarH.style.display = \"\";\n+ } else {\n+ d.scrollbarH.style.display = \"\";\n+ d.scrollbarH.firstChild.style.width = \"0\";\n+ }\n if (needsH && needsV) {\n d.scrollbarFiller.style.display = \"block\";\n d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = scrollbarWidth(d.measure) + \"px\";\n } else d.scrollbarFiller.style.display = \"\";\n+ if (needsH && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {\n+ d.gutterFiller.style.display = \"block\";\n+ d.gutterFiller.style.height = scrollbarWidth(d.measure) + \"px\";\n+ d.gutterFiller.style.width = d.gutters.offsetWidth + \"px\";\n+ } else d.gutterFiller.style.display = \"\";\n \n- if (mac_geLion && scrollbarWidth(d.measure) === 0)\n+ if (mac_geLion && scrollbarWidth(d.measure) === 0) {\n d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? \"18px\" : \"12px\";\n+ d.scrollbarV.style.pointerEvents = d.scrollbarH.style.pointerEvents = \"none\";\n+ }\n }\n \n function visibleLines(display, doc, viewPort) {\n@@ -387,42 +408,57 @@ window.CodeMirror = (function() {\n return String(options.lineNumberFormatter(i + options.firstLineNumber));\n }\n function compensateForHScroll(display) {\n- return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left;\n+ return getRect(display.scroller).left - getRect(display.sizer).left;\n }\n \n \/\/ DISPLAY DRAWING\n \n- function updateDisplay(cm, changes, viewPort) {\n- var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo;\n- var updated = updateDisplayInner(cm, changes, viewPort);\n+ function updateDisplay(cm, changes, viewPort, forced) {\n+ var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo, updated;\n+ var visible = visibleLines(cm.display, cm.doc, viewPort);\n+ for (var first = true;; first = false) {\n+ var oldWidth = cm.display.scroller.clientWidth;\n+ if (!updateDisplayInner(cm, changes, visible, forced)) break;\n+ updated = true;\n+ changes = [];\n+ updateSelection(cm);\n+ updateScrollbars(cm);\n+ if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {\n+ forced = true;\n+ continue;\n+ }\n+ forced = false;\n+\n+ \/\/ Clip forced viewport to actual scrollable area\n+ if (viewPort)\n+ viewPort = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight,\n+ typeof viewPort == \"number\" ? viewPort : viewPort.top);\n+ visible = visibleLines(cm.display, cm.doc, viewPort);\n+ if (visible.from >= cm.display.showingFrom && visible.to <= cm.display.showingTo)\n+ break;\n+ }\n+\n if (updated) {\n signalLater(cm, \"update\", cm);\n if (cm.display.showingFrom != oldFrom || cm.display.showingTo != oldTo)\n signalLater(cm, \"viewportChange\", cm, cm.display.showingFrom, cm.display.showingTo);\n }\n- updateSelection(cm);\n- updateScrollbars(cm.display, cm.doc.height);\n-\n return updated;\n }\n \n \/\/ Uses a set of changes plus the current scroll position to\n \/\/ determine which DOM updates have to be made, and makes the\n \/\/ updates.\n- function updateDisplayInner(cm, changes, viewPort) {\n+ function updateDisplayInner(cm, changes, visible, forced) {\n var display = cm.display, doc = cm.doc;\n- if (!display.wrapper.clientWidth) {\n+ if (!display.wrapper.offsetWidth) {\n display.showingFrom = display.showingTo = doc.first;\n display.viewOffset = 0;\n return;\n }\n \n- \/\/ Compute the new visible window\n- \/\/ If scrollTop is specified, use that to determine which lines\n- \/\/ to render instead of the current scrollbar position.\n- var visible = visibleLines(display, doc, viewPort);\n \/\/ Bail out if the visible area is already rendered and nothing changed.\n- if (changes.length == 0 &&\n+ if (!forced && changes.length == 0 &&\n visible.from > display.showingFrom && visible.to < display.showingTo)\n return;\n \n@@ -431,23 +467,11 @@ window.CodeMirror = (function() {\n var gutterW = display.sizer.style.marginLeft = display.gutters.offsetWidth + \"px\";\n display.scrollbarH.style.left = cm.options.fixedGutter ? gutterW : \"0\";\n \n- \/\/ When merged lines are present, the line that needs to be\n- \/\/ redrawn might not be the one that was changed.\n- if (sawCollapsedSpans)\n- for (var i = 0; i < changes.length; ++i) {\n- var ch = changes[i], merged;\n- while (merged = collapsedSpanAtStart(getLine(doc, ch.from))) {\n- var from = merged.find().from.line;\n- if (ch.diff) ch.diff -= ch.from - from;\n- ch.from = from;\n- }\n- }\n-\n \/\/ Used to determine which lines need their line numbers updated\n var positionsChangedFrom = Infinity;\n if (cm.options.lineNumbers)\n for (var i = 0; i < changes.length; ++i)\n- if (changes[i].diff) { positionsChangedFrom = changes[i].from; break; }\n+ if (changes[i].diff && changes[i].from < positionsChangedFrom) { positionsChangedFrom = changes[i].from; }\n \n var end = doc.first + doc.size;\n var from = Math.max(visible.from - cm.options.viewportMargin, doc.first);\n@@ -461,7 +485,22 @@ window.CodeMirror = (function() {\n \n \/\/ Create a range of theoretically intact lines, and punch holes\n \/\/ in that using the change info.\n- var intact = computeIntact([{from: display.showingFrom, to: display.showingTo}], changes);\n+ var intact = [{from: Math.max(display.showingFrom, doc.first),\n+ to: Math.min(display.showingTo, end)}];\n+ if (intact[0].from >= intact[0].to) intact = [];\n+ else intact = computeIntact(intact, changes);\n+ \/\/ When merged lines are present, we might have to reduce the\n+ \/\/ intact ranges because changes in continued fragments of the\n+ \/\/ intact lines do require the lines to be redrawn.\n+ if (sawCollapsedSpans)\n+ for (var i = 0; i < intact.length; ++i) {\n+ var range = intact[i], merged;\n+ while (merged = collapsedSpanAtEnd(getLine(doc, range.to - 1))) {\n+ var newTo = merged.find().from.line;\n+ if (newTo > range.from) range.to = newTo;\n+ else { intact.splice(i--, 1); break; }\n+ }\n+ }\n \n \/\/ Clip off the parts that won't be visible\n var intactLines = 0;\n@@ -472,26 +511,40 @@ window.CodeMirror = (function() {\n if (range.from >= range.to) intact.splice(i--, 1);\n else intactLines += range.to - range.from;\n }\n- if (intactLines == to - from && from == display.showingFrom && to == display.showingTo) {\n+ if (!forced && intactLines == to - from && from == display.showingFrom && to == display.showingTo) {\n updateViewOffset(cm);\n return;\n }\n intact.sort(function(a, b) {return a.from - b.from;});\n \n- var focused = document.activeElement;\n+ \/\/ Avoid crashing on IE's \"unspecified error\" when in iframes\n+ try {\n+ var focused = document.activeElement;\n+ } catch(e) {}\n if (intactLines < (to - from) * .7) display.lineDiv.style.display = \"none\";\n patchDisplay(cm, from, to, intact, positionsChangedFrom);\n display.lineDiv.style.display = \"\";\n- if (document.activeElement != focused && focused.offsetHeight) focused.focus();\n+ if (focused && document.activeElement != focused && focused.offsetHeight) focused.focus();\n \n var different = from != display.showingFrom || to != display.showingTo ||\n display.lastSizeC != display.wrapper.clientHeight;\n \/\/ This is just a bogus formula that detects when the editor is\n \/\/ resized or the font size changes.\n- if (different) display.lastSizeC = display.wrapper.clientHeight;\n+ if (different) {\n+ display.lastSizeC = display.wrapper.clientHeight;\n+ startWorker(cm, 400);\n+ }\n display.showingFrom = from; display.showingTo = to;\n- startWorker(cm, 100);\n \n+ display.gutters.style.height = \"\";\n+ updateHeightsInViewport(cm);\n+ updateViewOffset(cm);\n+\n+ return true;\n+ }\n+\n+ function updateHeightsInViewport(cm) {\n+ var display = cm.display;\n var prevBottom = display.lineDiv.offsetTop;\n for (var node = display.lineDiv.firstChild, height; node; node = node.nextSibling) if (node.lineObj) {\n if (ie_lt8) {\n@@ -499,7 +552,7 @@ window.CodeMirror = (function() {\n height = bot - prevBottom;\n prevBottom = bot;\n } else {\n- var box = node.getBoundingClientRect();\n+ var box = getRect(node);\n height = box.bottom - box.top;\n }\n var diff = node.lineObj.height - height;\n@@ -511,11 +564,6 @@ window.CodeMirror = (function() {\n widgets[i].height = widgets[i].node.offsetHeight;\n }\n }\n- updateViewOffset(cm);\n-\n- if (visibleLines(display, doc, viewPort).to >= to)\n- updateDisplayInner(cm, [], viewPort);\n- return true;\n }\n \n function updateViewOffset(cm) {\n@@ -581,8 +629,9 @@ window.CodeMirror = (function() {\n if (nextIntact && nextIntact.to == lineN) nextIntact = intact.shift();\n if (lineIsHidden(cm.doc, line)) {\n if (line.height != 0) updateLineHeight(line, 0);\n- if (line.widgets && cur.previousSibling) for (var i = 0; i < line.widgets.length; ++i)\n- if (line.widgets[i].showIfHidden) {\n+ if (line.widgets && cur && cur.previousSibling) for (var i = 0; i < line.widgets.length; ++i) {\n+ var w = line.widgets[i];\n+ if (w.showIfHidden) {\n var prev = cur.previousSibling;\n if (\/pre\/i.test(prev.nodeName)) {\n var wrap = elt(\"div\", null, null, \"position: relative\");\n@@ -590,9 +639,11 @@ window.CodeMirror = (function() {\n wrap.appendChild(prev);\n prev = wrap;\n }\n- var wnode = prev.appendChild(elt(\"div\", [line.widgets[i].node], \"CodeMirror-linewidget\"));\n- positionLineWidget(line.widgets[i], wnode, prev, dims);\n+ var wnode = prev.appendChild(elt(\"div\", [w.node], \"CodeMirror-linewidget\"));\n+ if (!w.handleMouseEvents) wnode.ignoreEvents = true;\n+ positionLineWidget(w, wnode, prev, dims);\n }\n+ }\n } else if (nextIntact && nextIntact.from <= lineN && nextIntact.to > lineN) {\n \/\/ This line is intact. Skip to the actual node. Update its\n \/\/ line number if needed.\n@@ -623,37 +674,38 @@ window.CodeMirror = (function() {\n }\n \n function buildLineElement(cm, line, lineNo, dims, reuse) {\n- var lineElement = lineContent(cm, line);\n+ var built = buildLineContent(cm, line), lineElement = built.pre;\n var markers = line.gutterMarkers, display = cm.display, wrap;\n \n- if (!cm.options.lineNumbers && !markers && !line.bgClass && !line.wrapClass && !line.widgets)\n+ var bgClass = built.bgClass ? built.bgClass + \" \" + (line.bgClass || \"\") : line.bgClass;\n+ if (!cm.options.lineNumbers && !markers && !bgClass && !line.wrapClass && !line.widgets)\n return lineElement;\n \n \/\/ Lines with gutter elements, widgets or a background class need\n \/\/ to be wrapped again, and have the extra elements added to the\n \/\/ wrapper div\n- \n+\n if (reuse) {\n reuse.alignable = null;\n- var isOk = true, widgetsSeen = 0;\n+ var isOk = true, widgetsSeen = 0, insertBefore = null;\n for (var n = reuse.firstChild, next; n; n = next) {\n next = n.nextSibling;\n if (!\/\\bCodeMirror-linewidget\\b\/.test(n.className)) {\n reuse.removeChild(n);\n } else {\n- for (var i = 0, first = true; i < line.widgets.length; ++i) {\n- var widget = line.widgets[i], isFirst = false;\n- if (!widget.above) { isFirst = first; first = false; }\n+ for (var i = 0; i < line.widgets.length; ++i) {\n+ var widget = line.widgets[i];\n if (widget.node == n.firstChild) {\n+ if (!widget.above && !insertBefore) insertBefore = n;\n positionLineWidget(widget, n, reuse, dims);\n ++widgetsSeen;\n- if (isFirst) reuse.insertBefore(lineElement, n);\n break;\n }\n }\n if (i == line.widgets.length) { isOk = false; break; }\n }\n }\n+ reuse.insertBefore(lineElement, insertBefore);\n if (isOk && widgetsSeen == line.widgets.length) {\n wrap = reuse;\n reuse.className = line.wrapClass || \"\";\n@@ -664,12 +716,12 @@ window.CodeMirror = (function() {\n wrap.appendChild(lineElement);\n }\n \/\/ Kludge to make sure the styled element lies behind the selection (by z-index)\n- if (line.bgClass)\n- wrap.insertBefore(elt(\"div\", \"\\u00a0\", line.bgClass + \" CodeMirror-linebackground\"), wrap.firstChild);\n+ if (bgClass)\n+ wrap.insertBefore(elt(\"div\", null, bgClass + \" CodeMirror-linebackground\"), wrap.firstChild);\n if (cm.options.lineNumbers || markers) {\n- var gutterWrap = wrap.insertBefore(elt(\"div\", null, null, \"position: absolute; left: \" +\n+ var gutterWrap = wrap.insertBefore(elt(\"div\", null, \"CodeMirror-gutter-wrapper\", \"position: absolute; left: \" +\n (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + \"px\"),\n- wrap.firstChild);\n+ lineElement);\n if (cm.options.fixedGutter) (wrap.alignable || (wrap.alignable = [])).push(gutterWrap);\n if (cm.options.lineNumbers && (!markers || !markers[\"CodeMirror-linenumbers\"]))\n wrap.lineNumber = gutterWrap.appendChild(\n@@ -688,6 +740,7 @@ window.CodeMirror = (function() {\n if (ie_lt8) wrap.style.zIndex = 2;\n if (line.widgets && wrap != reuse) for (var i = 0, ws = line.widgets; i < ws.length; ++i) {\n var widget = ws[i], node = elt(\"div\", [widget.node], \"CodeMirror-linewidget\");\n+ if (!widget.handleMouseEvents) node.ignoreEvents = true;\n positionLineWidget(widget, node, wrap, dims);\n if (widget.above)\n wrap.insertBefore(node, cm.options.lineNumbers && line.height != 0 ? gutterWrap : lineElement);\n@@ -731,12 +784,14 @@ window.CodeMirror = (function() {\n display.selectionDiv.style.display = \"none\";\n \n \/\/ Move the hidden textarea near the cursor to prevent scrolling artifacts\n- var headPos = cursorCoords(cm, cm.doc.sel.head, \"div\");\n- var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();\n- display.inputDiv.style.top = Math.max(0, Math.min(display.wrapper.clientHeight - 10,\n- headPos.top + lineOff.top - wrapOff.top)) + \"px\";\n- display.inputDiv.style.left = Math.max(0, Math.min(display.wrapper.clientWidth - 10,\n- headPos.left + lineOff.left - wrapOff.left)) + \"px\";\n+ if (cm.options.moveInputWithCursor) {\n+ var headPos = cursorCoords(cm, cm.doc.sel.head, \"div\");\n+ var wrapOff = getRect(display.wrapper), lineOff = getRect(display.lineDiv);\n+ display.inputDiv.style.top = Math.max(0, Math.min(display.wrapper.clientHeight - 10,\n+ headPos.top + lineOff.top - wrapOff.top)) + \"px\";\n+ display.inputDiv.style.left = Math.max(0, Math.min(display.wrapper.clientWidth - 10,\n+ headPos.left + lineOff.left - wrapOff.left)) + \"px\";\n+ }\n }\n \n \/\/ No selection, plain cursor\n@@ -768,67 +823,59 @@ window.CodeMirror = (function() {\n \"px; height: \" + (bottom - top) + \"px\"));\n }\n \n- function drawForLine(line, fromArg, toArg, retTop) {\n+ function drawForLine(line, fromArg, toArg) {\n var lineObj = getLine(doc, line);\n- var lineLen = lineObj.text.length, rVal = retTop ? Infinity : -Infinity;\n- function coords(ch) {\n- return charCoords(cm, Pos(line, ch), \"div\", lineObj);\n+ var lineLen = lineObj.text.length;\n+ var start, end;\n+ function coords(ch, bias) {\n+ return charCoords(cm, Pos(line, ch), \"div\", lineObj, bias);\n }\n \n iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {\n- var leftPos = coords(dir == \"rtl\" ? to - 1 : from);\n- var rightPos = coords(dir == \"rtl\" ? from : to - 1);\n- var left = leftPos.left, right = rightPos.right;\n+ var leftPos = coords(from, \"left\"), rightPos, left, right;\n+ if (from == to) {\n+ rightPos = leftPos;\n+ left = right = leftPos.left;\n+ } else {\n+ rightPos = coords(to - 1, \"right\");\n+ if (dir == \"rtl\") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; }\n+ left = leftPos.left;\n+ right = rightPos.right;\n+ }\n+ if (fromArg == null && from == 0) left = pl;\n if (rightPos.top - leftPos.top > 3) { \/\/ Different lines, draw top part\n add(left, leftPos.top, null, leftPos.bottom);\n left = pl;\n if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top);\n }\n if (toArg == null && to == lineLen) right = clientWidth;\n- if (fromArg == null && from == 0) left = pl;\n- rVal = retTop ? Math.min(rightPos.top, rVal) : Math.max(rightPos.bottom, rVal);\n+ if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)\n+ start = leftPos;\n+ if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)\n+ end = rightPos;\n if (left < pl + 1) left = pl;\n add(left, rightPos.top, right - left, rightPos.bottom);\n });\n- return rVal;\n+ return {start: start, end: end};\n }\n \n if (sel.from.line == sel.to.line) {\n drawForLine(sel.from.line, sel.from.ch, sel.to.ch);\n } else {\n- var fromObj = getLine(doc, sel.from.line);\n- var cur = fromObj, merged, path = [sel.from.line, sel.from.ch], singleLine;\n- while (merged = collapsedSpanAtEnd(cur)) {\n- var found = merged.find();\n- path.push(found.from.ch, found.to.line, found.to.ch);\n- if (found.to.line == sel.to.line) {\n- path.push(sel.to.ch);\n- singleLine = true;\n- break;\n+ var fromLine = getLine(doc, sel.from.line), toLine = getLine(doc, sel.to.line);\n+ var singleVLine = visualLine(doc, fromLine) == visualLine(doc, toLine);\n+ var leftEnd = drawForLine(sel.from.line, sel.from.ch, singleVLine ? fromLine.text.length : null).end;\n+ var rightStart = drawForLine(sel.to.line, singleVLine ? 0 : null, sel.to.ch).start;\n+ if (singleVLine) {\n+ if (leftEnd.top < rightStart.top - 2) {\n+ add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);\n+ add(pl, rightStart.top, rightStart.left, rightStart.bottom);\n+ } else {\n+ add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);\n }\n- cur = getLine(doc, found.to.line);\n- }\n-\n- \/\/ This is a single, merged line\n- if (singleLine) {\n- for (var i = 0; i < path.length; i += 3)\n- drawForLine(path[i], path[i+1], path[i+2]);\n- } else {\n- var middleTop, middleBot, toObj = getLine(doc, sel.to.line);\n- if (sel.from.ch)\n- \/\/ Draw the first line of selection.\n- middleTop = drawForLine(sel.from.line, sel.from.ch, null, false);\n- else\n- \/\/ Simply include it in the middle block.\n- middleTop = heightAtLine(cm, fromObj) - display.viewOffset;\n-\n- if (!sel.to.ch)\n- middleBot = heightAtLine(cm, toObj) - display.viewOffset;\n- else\n- middleBot = drawForLine(sel.to.line, collapsedSpanAtStart(toObj) ? null : 0, sel.to.ch, true);\n-\n- if (middleTop < middleBot) add(pl, middleTop, null, middleBot);\n }\n+ if (leftEnd.bottom < rightStart.top)\n+ add(pl, leftEnd.bottom, null, rightStart.top);\n }\n \n removeChildrenAndAdd(display.selectionDiv, fragment);\n@@ -837,14 +884,15 @@ window.CodeMirror = (function() {\n \n \/\/ Cursor-blinking\n function restartBlink(cm) {\n+ if (!cm.state.focused) return;\n var display = cm.display;\n clearInterval(display.blinker);\n var on = true;\n display.cursor.style.visibility = display.otherCursor.style.visibility = \"\";\n- display.blinker = setInterval(function() {\n- if (!display.cursor.offsetHeight) return;\n- display.cursor.style.visibility = display.otherCursor.style.visibility = (on = !on) ? \"\" : \"hidden\";\n- }, cm.options.cursorBlinkRate);\n+ if (cm.options.cursorBlinkRate > 0)\n+ display.blinker = setInterval(function() {\n+ display.cursor.style.visibility = display.otherCursor.style.visibility = (on = !on) ? \"\" : \"hidden\";\n+ }, cm.options.cursorBlinkRate);\n }\n \n \/\/ HIGHLIGHT WORKER\n@@ -864,7 +912,7 @@ window.CodeMirror = (function() {\n doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.showingTo + 500), function(line) {\n if (doc.frontier >= cm.display.showingFrom) { \/\/ Visible\n var oldStyles = line.styles;\n- line.styles = highlightLine(cm, line, state);\n+ line.styles = highlightLine(cm, line, state, true);\n var ischange = !oldStyles || oldStyles.length != line.styles.length;\n for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];\n if (ischange) {\n@@ -873,7 +921,7 @@ window.CodeMirror = (function() {\n }\n line.stateAfter = copyState(doc.mode, state);\n } else {\n- processLine(cm, line, state);\n+ processLine(cm, line.text, state);\n line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;\n }\n ++doc.frontier;\n@@ -894,12 +942,13 @@ window.CodeMirror = (function() {\n \/\/ valid state. If that fails, it returns the line with the\n \/\/ smallest indentation, which tends to need the least context to\n \/\/ parse correctly.\n- function findStartLine(cm, n) {\n+ function findStartLine(cm, n, precise) {\n var minindent, minline, doc = cm.doc;\n- for (var search = n, lim = n - 100; search > lim; --search) {\n+ var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);\n+ for (var search = n; search > lim; --search) {\n if (search <= doc.first) return doc.first;\n var line = getLine(doc, search - 1);\n- if (line.stateAfter) return search;\n+ if (line.stateAfter && (!precise || search <= doc.frontier)) return search;\n var indented = countColumn(line.text, null, cm.options.tabSize);\n if (minline == null || minindent > indented) {\n minline = search - 1;\n@@ -909,67 +958,91 @@ window.CodeMirror = (function() {\n return minline;\n }\n \n- function getStateBefore(cm, n) {\n+ function getStateBefore(cm, n, precise) {\n var doc = cm.doc, display = cm.display;\n- if (!doc.mode.startState) return true;\n- var pos = findStartLine(cm, n), state = pos > doc.first && getLine(doc, pos-1).stateAfter;\n+ if (!doc.mode.startState) return true;\n+ var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;\n if (!state) state = startState(doc.mode);\n else state = copyState(doc.mode, state);\n doc.iter(pos, n, function(line) {\n- processLine(cm, line, state);\n+ processLine(cm, line.text, state);\n var save = pos == n - 1 || pos % 5 == 0 || pos >= display.showingFrom && pos < display.showingTo;\n line.stateAfter = save ? copyState(doc.mode, state) : null;\n ++pos;\n });\n+ if (precise) doc.frontier = pos;\n return state;\n }\n \n \/\/ POSITION MEASUREMENT\n- \n+\n function paddingTop(display) {return display.lineSpace.offsetTop;}\n+ function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;}\n function paddingLeft(display) {\n- var e = removeChildrenAndAdd(display.measure, elt(\"pre\")).appendChild(elt(\"span\", \"x\"));\n+ var e = removeChildrenAndAdd(display.measure, elt(\"pre\", null, null, \"text-align: left\")).appendChild(elt(\"span\", \"x\"));\n return e.offsetLeft;\n }\n \n- function measureChar(cm, line, ch, data) {\n+ function measureChar(cm, line, ch, data, bias) {\n var dir = -1;\n data = data || measureLine(cm, line);\n- \n+ if (data.crude) {\n+ var left = data.left + ch * data.width;\n+ return {left: left, right: left + data.width, top: data.top, bottom: data.bottom};\n+ }\n+\n for (var pos = ch;; pos += dir) {\n var r = data[pos];\n if (r) break;\n if (dir < 0 && pos == 0) dir = 1;\n }\n+ bias = pos > ch ? \"left\" : pos < ch ? \"right\" : bias;\n+ if (bias == \"left\" && r.leftSide) r = r.leftSide;\n+ else if (bias == \"right\" && r.rightSide) r = r.rightSide;\n return {left: pos < ch ? r.right : r.left,\n right: pos > ch ? r.left : r.right,\n- top: r.top, bottom: r.bottom};\n+ top: r.top,\n+ bottom: r.bottom};\n }\n \n- function measureLine(cm, line) {\n- \/\/ First look in the cache\n- var display = cm.display, cache = cm.display.measureLineCache;\n+ function findCachedMeasurement(cm, line) {\n+ var cache = cm.display.measureLineCache;\n for (var i = 0; i < cache.length; ++i) {\n var memo = cache[i];\n if (memo.text == line.text && memo.markedSpans == line.markedSpans &&\n- display.scroller.clientWidth == memo.width &&\n- memo.classes == line.textClass + \"|\" + line.bgClass + \"|\" + line.wrapClass)\n- return memo.measure;\n+ cm.display.scroller.clientWidth == memo.width &&\n+ memo.classes == line.textClass + \"|\" + line.wrapClass)\n+ return memo;\n }\n- \n+ }\n+\n+ function clearCachedMeasurement(cm, line) {\n+ var exists = findCachedMeasurement(cm, line);\n+ if (exists) exists.text = exists.measure = exists.markedSpans = null;\n+ }\n+\n+ function measureLine(cm, line) {\n+ \/\/ First look in the cache\n+ var cached = findCachedMeasurement(cm, line);\n+ if (cached) return cached.measure;\n+\n+ \/\/ Failing that, recompute and store result in cache\n var measure = measureLineInner(cm, line);\n- \/\/ Store result in the cache\n- var memo = {text: line.text, width: display.scroller.clientWidth,\n+ var cache = cm.display.measureLineCache;\n+ var memo = {text: line.text, width: cm.display.scroller.clientWidth,\n markedSpans: line.markedSpans, measure: measure,\n- classes: line.textClass + \"|\" + line.bgClass + \"|\" + line.wrapClass};\n- if (cache.length == 16) cache[++display.measureLineCachePos % 16] = memo;\n+ classes: line.textClass + \"|\" + line.wrapClass};\n+ if (cache.length == 16) cache[++cm.display.measureLineCachePos % 16] = memo;\n else cache.push(memo);\n return measure;\n }\n \n function measureLineInner(cm, line) {\n+ if (!cm.options.lineWrapping && line.text.length >= cm.options.crudeMeasuringFrom)\n+ return crudelyMeasureLine(cm, line);\n+\n var display = cm.display, measure = emptyArray(line.text.length);\n- var pre = lineContent(cm, line, measure);\n+ var pre = buildLineContent(cm, line, measure, true).pre;\n \n \/\/ IE does not cache element positions of inline elements between\n \/\/ calls to getBoundingClientRect. This makes the loop below,\n@@ -998,50 +1071,97 @@ window.CodeMirror = (function() {\n \n removeChildrenAndAdd(display.measure, pre);\n \n- var outer = display.lineDiv.getBoundingClientRect();\n+ var outer = getRect(display.lineDiv);\n var vranges = [], data = emptyArray(line.text.length), maxBot = pre.offsetHeight;\n \/\/ Work around an IE7\/8 bug where it will sometimes have randomly\n \/\/ replaced our pre with a clone at this point.\n if (ie_lt9 && display.measure.first != pre)\n removeChildrenAndAdd(display.measure, pre);\n \n- for (var i = 0, cur; i < measure.length; ++i) if (cur = measure[i]) {\n- var size = cur.getBoundingClientRect();\n- var top = Math.max(0, size.top - outer.top), bot = Math.min(size.bottom - outer.top, maxBot);\n- for (var j = 0; j < vranges.length; j += 2) {\n- var rtop = vranges[j], rbot = vranges[j+1];\n+ function measureRect(rect) {\n+ var top = rect.top - outer.top, bot = rect.bottom - outer.top;\n+ if (bot > maxBot) bot = maxBot;\n+ if (top < 0) top = 0;\n+ for (var i = vranges.length - 2; i >= 0; i -= 2) {\n+ var rtop = vranges[i], rbot = vranges[i+1];\n if (rtop > bot || rbot < top) continue;\n if (rtop <= top && rbot >= bot ||\n top <= rtop && bot >= rbot ||\n Math.min(bot, rbot) - Math.max(top, rtop) >= (bot - top) >> 1) {\n- vranges[j] = Math.min(top, rtop);\n- vranges[j+1] = Math.max(bot, rbot);\n+ vranges[i] = Math.min(top, rtop);\n+ vranges[i+1] = Math.max(bot, rbot);\n break;\n }\n }\n- if (j == vranges.length) vranges.push(top, bot);\n- data[i] = {left: size.left - outer.left, right: size.right - outer.left, top: j};\n+ if (i < 0) { i = vranges.length; vranges.push(top, bot); }\n+ return {left: rect.left - outer.left,\n+ right: rect.right - outer.left,\n+ top: i, bottom: null};\n+ }\n+ function finishRect(rect) {\n+ rect.bottom = vranges[rect.top+1];\n+ rect.top = vranges[rect.top];\n+ }\n+\n+ for (var i = 0, cur; i < measure.length; ++i) if (cur = measure[i]) {\n+ var node = cur, rect = null;\n+ \/\/ A widget might wrap, needs special care\n+ if (\/\\bCodeMirror-widget\\b\/.test(cur.className) && cur.getClientRects) {\n+ if (cur.firstChild.nodeType == 1) node = cur.firstChild;\n+ var rects = node.getClientRects();\n+ if (rects.length > 1) {\n+ rect = data[i] = measureRect(rects[0]);\n+ rect.rightSide = measureRect(rects[rects.length - 1]);\n+ }\n+ }\n+ if (!rect) rect = data[i] = measureRect(getRect(node));\n+ if (cur.measureRight) rect.right = getRect(cur.measureRight).left - outer.left;\n+ if (cur.leftSide) rect.leftSide = measureRect(getRect(cur.leftSide));\n }\n+ removeChildren(cm.display.measure);\n for (var i = 0, cur; i < data.length; ++i) if (cur = data[i]) {\n- var vr = cur.top;\n- cur.top = vranges[vr]; cur.bottom = vranges[vr+1];\n+ finishRect(cur);\n+ if (cur.leftSide) finishRect(cur.leftSide);\n+ if (cur.rightSide) finishRect(cur.rightSide);\n }\n- if (!cm.options.lineWrapping) {\n- var last = pre.lastChild;\n- if (last.nodeType == 3) last = pre.appendChild(elt(\"span\", \"\\u200b\"));\n- data.width = last.getBoundingClientRect().right - outer.left;\n+ return data;\n+ }\n+\n+ function crudelyMeasureLine(cm, line) {\n+ var copy = new Line(line.text.slice(0, 100), null);\n+ if (line.textClass) copy.textClass = line.textClass;\n+ var measure = measureLineInner(cm, copy);\n+ var left = measureChar(cm, copy, 0, measure, \"left\");\n+ var right = measureChar(cm, copy, 99, measure, \"right\");\n+ return {crude: true, top: left.top, left: left.left, bottom: left.bottom, width: (right.right - left.left) \/ 100};\n+ }\n+\n+ function measureLineWidth(cm, line) {\n+ var hasBadSpan = false;\n+ if (line.markedSpans) for (var i = 0; i < line.markedSpans; ++i) {\n+ var sp = line.markedSpans[i];\n+ if (sp.collapsed && (sp.to == null || sp.to == line.text.length)) hasBadSpan = true;\n }\n+ var cached = !hasBadSpan && findCachedMeasurement(cm, line);\n+ if (cached || line.text.length >= cm.options.crudeMeasuringFrom)\n+ return measureChar(cm, line, line.text.length, cached && cached.measure, \"right\").right;\n \n- return data;\n+ var pre = buildLineContent(cm, line, null, true).pre;\n+ var end = pre.appendChild(zeroWidthElement(cm.display.measure));\n+ removeChildrenAndAdd(cm.display.measure, pre);\n+ return getRect(end).right - getRect(cm.display.lineDiv).left;\n }\n \n function clearCaches(cm) {\n cm.display.measureLineCache.length = cm.display.measureLineCachePos = 0;\n cm.display.cachedCharWidth = cm.display.cachedTextHeight = null;\n- cm.display.maxLineChanged = true;\n+ if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;\n cm.display.lineNumChars = null;\n }\n \n+ function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; }\n+ function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; }\n+\n \/\/ Context is one of \"line\", \"div\" (display.lineDiv), \"local\"\/null (editor), or \"page\"\n function intoCoordSystem(cm, lineObj, rect, context) {\n if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {\n@@ -1051,67 +1171,87 @@ window.CodeMirror = (function() {\n if (context == \"line\") return rect;\n if (!context) context = \"local\";\n var yOff = heightAtLine(cm, lineObj);\n- if (context != \"local\") yOff -= cm.display.viewOffset;\n- if (context == \"page\") {\n- var lOff = cm.display.lineSpace.getBoundingClientRect();\n- yOff += lOff.top + (window.pageYOffset || (document.documentElement || document.body).scrollTop);\n- var xOff = lOff.left + (window.pageXOffset || (document.documentElement || document.body).scrollLeft);\n+ if (context == \"local\") yOff += paddingTop(cm.display);\n+ else yOff -= cm.display.viewOffset;\n+ if (context == \"page\" || context == \"window\") {\n+ var lOff = getRect(cm.display.lineSpace);\n+ yOff += lOff.top + (context == \"window\" ? 0 : pageScrollY());\n+ var xOff = lOff.left + (context == \"window\" ? 0 : pageScrollX());\n rect.left += xOff; rect.right += xOff;\n }\n rect.top += yOff; rect.bottom += yOff;\n return rect;\n }\n \n- function charCoords(cm, pos, context, lineObj) {\n+ \/\/ Context may be \"window\", \"page\", \"div\", or \"local\"\/null\n+ \/\/ Result is in \"div\" coords\n+ function fromCoordSystem(cm, coords, context) {\n+ if (context == \"div\") return coords;\n+ var left = coords.left, top = coords.top;\n+ \/\/ First move into \"page\" coordinate system\n+ if (context == \"page\") {\n+ left -= pageScrollX();\n+ top -= pageScrollY();\n+ } else if (context == \"local\" || !context) {\n+ var localBox = getRect(cm.display.sizer);\n+ left += localBox.left;\n+ top += localBox.top;\n+ }\n+\n+ var lineSpaceBox = getRect(cm.display.lineSpace);\n+ return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};\n+ }\n+\n+ function charCoords(cm, pos, context, lineObj, bias) {\n if (!lineObj) lineObj = getLine(cm.doc, pos.line);\n- return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch), context);\n+ return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, null, bias), context);\n }\n \n function cursorCoords(cm, pos, context, lineObj, measurement) {\n lineObj = lineObj || getLine(cm.doc, pos.line);\n if (!measurement) measurement = measureLine(cm, lineObj);\n function get(ch, right) {\n- var m = measureChar(cm, lineObj, ch, measurement);\n+ var m = measureChar(cm, lineObj, ch, measurement, right ? \"right\" : \"left\");\n if (right) m.left = m.right; else m.right = m.left;\n return intoCoordSystem(cm, lineObj, m, context);\n }\n- var order = getOrder(lineObj), ch = pos.ch;\n- if (!order) return get(ch);\n- var main, other, linedir = order[0].level;\n- for (var i = 0; i < order.length; ++i) {\n- var part = order[i], rtl = part.level % 2, nb, here;\n- if (part.from < ch && part.to > ch) return get(ch, rtl);\n- var left = rtl ? part.to : part.from, right = rtl ? part.from : part.to;\n- if (left == ch) {\n- \/\/ Opera and IE return bogus offsets and widths for edges\n- \/\/ where the direction flips, but only for the side with the\n- \/\/ lower level. So we try to use the side with the higher\n- \/\/ level.\n- if (i && part.level < (nb = order[i-1]).level) here = get(nb.level % 2 ? nb.from : nb.to - 1, true);\n- else here = get(rtl && part.from != part.to ? ch - 1 : ch);\n- if (rtl == linedir) main = here; else other = here;\n- } else if (right == ch) {\n- var nb = i < order.length - 1 && order[i+1];\n- if (!rtl && nb && nb.from == nb.to) continue;\n- if (nb && part.level < nb.level) here = get(nb.level % 2 ? nb.to - 1 : nb.from);\n- else here = get(rtl ? ch : ch - 1, true);\n- if (rtl == linedir) main = here; else other = here;\n+ function getBidi(ch, partPos) {\n+ var part = order[partPos], right = part.level % 2;\n+ if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {\n+ part = order[--partPos];\n+ ch = bidiRight(part) - (part.level % 2 ? 0 : 1);\n+ right = true;\n+ } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {\n+ part = order[++partPos];\n+ ch = bidiLeft(part) - part.level % 2;\n+ right = false;\n }\n+ if (right && ch == part.to && ch > part.from) return get(ch - 1);\n+ return get(ch, right);\n }\n- if (linedir && !ch) other = get(order[0].to - 1);\n- if (!main) return other;\n- if (other) main.other = other;\n- return main;\n+ var order = getOrder(lineObj), ch = pos.ch;\n+ if (!order) return get(ch);\n+ var partPos = getBidiPartAt(order, ch);\n+ var val = getBidi(ch, partPos);\n+ if (bidiOther != null) val.other = getBidi(ch, bidiOther);\n+ return val;\n+ }\n+\n+ function PosWithInfo(line, ch, outside, xRel) {\n+ var pos = new Pos(line, ch);\n+ pos.xRel = xRel;\n+ if (outside) pos.outside = true;\n+ return pos;\n }\n \n \/\/ Coords must be lineSpace-local\n function coordsChar(cm, x, y) {\n var doc = cm.doc;\n y += cm.display.viewOffset;\n- if (y < 0) return {line: doc.first, ch: 0, outside: true};\n+ if (y < 0) return PosWithInfo(doc.first, 0, true, -1);\n var lineNo = lineAtHeight(doc, y), last = doc.first + doc.size - 1;\n if (lineNo > last)\n- return Pos(doc.size - 1, getLine(doc, last).text.length);\n+ return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1);\n if (x < 0) x = 0;\n \n for (;;) {\n@@ -1119,7 +1259,7 @@ window.CodeMirror = (function() {\n var found = coordsCharInner(cm, lineObj, lineNo, x, y);\n var merged = collapsedSpanAtEnd(lineObj);\n var mergedPos = merged && merged.find();\n- if (merged && found.ch >= mergedPos.from.ch)\n+ if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))\n lineNo = mergedPos.to.line;\n else\n return found;\n@@ -1128,30 +1268,33 @@ window.CodeMirror = (function() {\n \n function coordsCharInner(cm, lineObj, lineNo, x, y) {\n var innerOff = y - heightAtLine(cm, lineObj);\n- var wrongLine = false, cWidth = cm.display.wrapper.clientWidth;\n+ var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;\n var measurement = measureLine(cm, lineObj);\n \n function getX(ch) {\n var sp = cursorCoords(cm, Pos(lineNo, ch), \"line\",\n lineObj, measurement);\n wrongLine = true;\n- if (innerOff > sp.bottom) return Math.max(0, sp.left - cWidth);\n- else if (innerOff < sp.top) return sp.left + cWidth;\n+ if (innerOff > sp.bottom) return sp.left - adjust;\n+ else if (innerOff < sp.top) return sp.left + adjust;\n else wrongLine = false;\n return sp.left;\n }\n \n var bidi = getOrder(lineObj), dist = lineObj.text.length;\n var from = lineLeft(lineObj), to = lineRight(lineObj);\n- var fromX = getX(from), toX = getX(to);\n+ var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine;\n \n- if (x > toX) return {line: lineNo, ch: to, outside: wrongLine};\n+ if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1);\n \/\/ Do a binary search between these bounds.\n for (;;) {\n if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {\n- var after = x - fromX < toX - x, ch = after ? from : to;\n+ var ch = x < fromX || x - fromX <= toX - x ? from : to;\n+ var xDiff = x - (ch == from ? fromX : toX);\n while (isExtendingChar.test(lineObj.text.charAt(ch))) ++ch;\n- return {line: lineNo, ch: ch, after: after, outside: wrongLine};\n+ var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside,\n+ xDiff < 0 ? -1 : xDiff ? 1 : 0);\n+ return pos;\n }\n var step = Math.ceil(dist \/ 2), middle = from + step;\n if (bidi) {\n@@ -1159,8 +1302,8 @@ window.CodeMirror = (function() {\n for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1);\n }\n var middleX = getX(middle);\n- if (middleX > x) {to = middle; toX = middleX; if (wrongLine) toX += 1000; dist -= step;}\n- else {from = middle; fromX = middleX; dist = step;}\n+ if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step;}\n+ else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step;}\n }\n }\n \n@@ -1201,18 +1344,21 @@ window.CodeMirror = (function() {\n \/\/ be awkward, slow, and error-prone), but instead updates are\n \/\/ batched and then all combined and executed at once.\n \n+ var nextOpId = 0;\n function startOperation(cm) {\n cm.curOp = {\n \/\/ An array of ranges of lines that have to be updated. See\n \/\/ updateDisplay.\n changes: [],\n+ forceUpdate: false,\n updateInput: null,\n userSelChange: null,\n textChanged: null,\n selectionChanged: false,\n+ cursorActivity: false,\n updateMaxLine: false,\n updateScrollPos: false,\n- id: ++cm.nextOpId\n+ id: ++nextOpId\n };\n if (!delayedCallbackDepth++) delayedCallbacks = [];\n }\n@@ -1222,8 +1368,8 @@ window.CodeMirror = (function() {\n cm.curOp = null;\n \n if (op.updateMaxLine) computeMaxLength(cm);\n- if (display.maxLineChanged && !cm.options.lineWrapping) {\n- var width = measureLine(cm, display.maxLine).width;\n+ if (display.maxLineChanged && !cm.options.lineWrapping && display.maxLine) {\n+ var width = measureLineWidth(cm, display.maxLine);\n display.sizer.style.minWidth = Math.max(0, width + 3 + scrollerCutOff) + \"px\";\n display.maxLineChanged = false;\n var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + display.sizer.offsetWidth - display.scroller.clientWidth);\n@@ -1233,17 +1379,24 @@ window.CodeMirror = (function() {\n var newScrollPos, updated;\n if (op.updateScrollPos) {\n newScrollPos = op.updateScrollPos;\n- } else if (op.selectionChanged) {\n+ } else if (op.selectionChanged && display.scroller.clientHeight) { \/\/ don't rescroll if not visible\n var coords = cursorCoords(cm, doc.sel.head);\n newScrollPos = calculateScrollPos(cm, coords.left, coords.top, coords.left, coords.bottom);\n }\n- if (op.changes.length || newScrollPos && newScrollPos.scrollTop != null)\n- updated = updateDisplay(cm, op.changes, newScrollPos && newScrollPos.scrollTop);\n+ if (op.changes.length || op.forceUpdate || newScrollPos && newScrollPos.scrollTop != null) {\n+ updated = updateDisplay(cm, op.changes, newScrollPos && newScrollPos.scrollTop, op.forceUpdate);\n+ if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;\n+ }\n if (!updated && op.selectionChanged) updateSelection(cm);\n if (op.updateScrollPos) {\n- display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = newScrollPos.scrollTop;\n- display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = newScrollPos.scrollLeft;\n+ var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, newScrollPos.scrollTop));\n+ var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, newScrollPos.scrollLeft));\n+ display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;\n+ display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;\n alignHorizontally(cm);\n+ if (op.scrollToPos)\n+ scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),\n+ clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);\n } else if (newScrollPos) {\n scrollCursorIntoView(cm);\n }\n@@ -1265,8 +1418,8 @@ window.CodeMirror = (function() {\n }\n if (op.textChanged)\n signal(cm, \"change\", cm, op.textChanged);\n- if (op.selectionChanged) signal(cm, \"cursorActivity\", cm);\n- if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i](cm);\n+ if (op.cursorActivity) signal(cm, \"cursorActivity\", cm);\n+ if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();\n }\n \n \/\/ Wraps a function in an operation. Returns the wrapped function.\n@@ -1330,25 +1483,47 @@ window.CodeMirror = (function() {\n \/\/ supported or compatible enough yet to rely on.)\n function readInput(cm) {\n var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc, sel = doc.sel;\n- if (!cm.state.focused || hasSelection(input) || isReadOnly(cm)) return false;\n+ if (!cm.state.focused || hasSelection(input) || isReadOnly(cm) || cm.state.disableInput) return false;\n+ if (cm.state.pasteIncoming && cm.state.fakedLastChar) {\n+ input.value = input.value.substring(0, input.value.length - 1);\n+ cm.state.fakedLastChar = false;\n+ }\n var text = input.value;\n if (text == prevInput && posEq(sel.from, sel.to)) return false;\n+ if (ie && !ie_lt9 && cm.display.inputHasSelection === text) {\n+ resetInput(cm, true);\n+ return false;\n+ }\n+\n var withOp = !cm.curOp;\n if (withOp) startOperation(cm);\n sel.shift = false;\n var same = 0, l = Math.min(prevInput.length, text.length);\n- while (same < l && prevInput[same] == text[same]) ++same;\n+ while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;\n var from = sel.from, to = sel.to;\n+ var inserted = text.slice(same);\n if (same < prevInput.length)\n from = Pos(from.line, from.ch - (prevInput.length - same));\n else if (cm.state.overwrite && posEq(from, to) && !cm.state.pasteIncoming)\n- to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + (text.length - same)));\n+ to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + inserted.length));\n+\n var updateInput = cm.curOp.updateInput;\n- makeChange(cm.doc, {from: from, to: to, text: splitLines(text.slice(same)),\n- origin: cm.state.pasteIncoming ? \"paste\" : \"+input\"}, \"end\");\n- \n+ var changeEvent = {from: from, to: to, text: splitLines(inserted),\n+ origin: cm.state.pasteIncoming ? \"paste\" : \"+input\"};\n+ makeChange(cm.doc, changeEvent, \"end\");\n cm.curOp.updateInput = updateInput;\n- if (text.length > 1000) input.value = cm.display.prevInput = \"\";\n+ signalLater(cm, \"inputRead\", cm, changeEvent);\n+ if (!cm.state.pasteIncoming && cm.options.electricChars &&\n+ cm.options.smartIndent && sel.head.ch < 100) {\n+ var electric = cm.getModeAt(sel.head).electricChars;\n+ if (electric) for (var i = 0; i < electric.length; i++)\n+ if (inserted.indexOf(electric.charAt(i)) > -1) {\n+ indentLine(cm, sel.head.line, \"smart\");\n+ break;\n+ }\n+ }\n+\n+ if (text.length > 1000 || text.indexOf(\"\\n\") > -1) input.value = cm.display.prevInput = \"\";\n else cm.display.prevInput = text;\n if (withOp) endOperation(cm);\n cm.state.pasteIncoming = false;\n@@ -1361,10 +1536,14 @@ window.CodeMirror = (function() {\n cm.display.prevInput = \"\";\n minimal = hasCopyEvent &&\n (doc.sel.to.line - doc.sel.from.line > 100 || (selected = cm.getSelection()).length > 1000);\n- if (minimal) cm.display.input.value = \"-\";\n- else cm.display.input.value = selected || cm.getSelection();\n+ var content = minimal ? \"-\" : selected || cm.getSelection();\n+ cm.display.input.value = content;\n if (cm.state.focused) selectInput(cm.display.input);\n- } else if (user) cm.display.prevInput = cm.display.input.value = \"\";\n+ if (ie && !ie_lt9) cm.display.inputHasSelection = content;\n+ } else if (user) {\n+ cm.display.prevInput = cm.display.input.value = \"\";\n+ if (ie && !ie_lt9) cm.display.inputHasSelection = null;\n+ }\n cm.display.inaccurateSelection = minimal;\n }\n \n@@ -1382,7 +1561,17 @@ window.CodeMirror = (function() {\n function registerEventHandlers(cm) {\n var d = cm.display;\n on(d.scroller, \"mousedown\", operation(cm, onMouseDown));\n- on(d.scroller, \"dblclick\", operation(cm, e_preventDefault));\n+ if (ie)\n+ on(d.scroller, \"dblclick\", operation(cm, function(e) {\n+ if (signalDOMEvent(cm, e)) return;\n+ var pos = posFromMouse(cm, e);\n+ if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;\n+ e_preventDefault(e);\n+ var word = findWordAt(getLine(cm.doc, pos.line).text, pos);\n+ extendSelection(cm.doc, word.from, word.to);\n+ }));\n+ else\n+ on(d.scroller, \"dblclick\", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });\n on(d.lineSpace, \"selectstart\", function(e) {\n if (!eventInWidget(d, e)) e_preventDefault(e);\n });\n@@ -1392,15 +1581,17 @@ window.CodeMirror = (function() {\n if (!captureMiddleClick) on(d.scroller, \"contextmenu\", function(e) {onContextMenu(cm, e);});\n \n on(d.scroller, \"scroll\", function() {\n- setScrollTop(cm, d.scroller.scrollTop);\n- setScrollLeft(cm, d.scroller.scrollLeft, true);\n- signal(cm, \"scroll\", cm);\n+ if (d.scroller.clientHeight) {\n+ setScrollTop(cm, d.scroller.scrollTop);\n+ setScrollLeft(cm, d.scroller.scrollLeft, true);\n+ signal(cm, \"scroll\", cm);\n+ }\n });\n on(d.scrollbarV, \"scroll\", function() {\n- setScrollTop(cm, d.scrollbarV.scrollTop);\n+ if (d.scroller.clientHeight) setScrollTop(cm, d.scrollbarV.scrollTop);\n });\n on(d.scrollbarH, \"scroll\", function() {\n- setScrollLeft(cm, d.scrollbarH.scrollLeft);\n+ if (d.scroller.clientHeight) setScrollLeft(cm, d.scrollbarH.scrollLeft);\n });\n \n on(d.scroller, \"mousewheel\", function(e){onScrollWheel(cm, e);});\n@@ -1412,11 +1603,15 @@ window.CodeMirror = (function() {\n \/\/ Prevent wrapper from ever scrolling\n on(d.wrapper, \"scroll\", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });\n \n+ var resizeTimer;\n function onResize() {\n- \/\/ Might be a text scaling operation, clear size caches.\n- d.cachedCharWidth = d.cachedTextHeight = null;\n- clearCaches(cm);\n- runInOp(cm, bind(regChange, cm));\n+ if (resizeTimer == null) resizeTimer = setTimeout(function() {\n+ resizeTimer = null;\n+ \/\/ Might be a text scaling operation, clear size caches.\n+ d.cachedCharWidth = d.cachedTextHeight = knownScrollbarWidth = null;\n+ clearCaches(cm);\n+ runInOp(cm, bind(regChange, cm));\n+ }, 100);\n }\n on(window, \"resize\", onResize);\n \/\/ Above handler holds on to the editor and its data structures.\n@@ -1426,21 +1621,24 @@ window.CodeMirror = (function() {\n for (var p = d.wrapper.parentNode; p && p != document.body; p = p.parentNode) {}\n if (p) setTimeout(unregister, 5000);\n else off(window, \"resize\", onResize);\n- } \n+ }\n setTimeout(unregister, 5000);\n \n on(d.input, \"keyup\", operation(cm, function(e) {\n- if (cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;\n- if (e_prop(e, \"keyCode\") == 16) cm.doc.sel.shift = false;\n+ if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;\n+ if (e.keyCode == 16) cm.doc.sel.shift = false;\n }));\n- on(d.input, \"input\", bind(fastPoll, cm));\n+ on(d.input, \"input\", function() {\n+ if (ie && !ie_lt9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;\n+ fastPoll(cm);\n+ });\n on(d.input, \"keydown\", operation(cm, onKeyDown));\n on(d.input, \"keypress\", operation(cm, onKeyPress));\n on(d.input, \"focus\", bind(onFocus, cm));\n on(d.input, \"blur\", bind(onBlur, cm));\n \n function drag_(e) {\n- if (cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))) return;\n+ if (signalDOMEvent(cm, e) || cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))) return;\n e_stop(e);\n }\n if (cm.options.dragDrop) {\n@@ -1449,12 +1647,22 @@ window.CodeMirror = (function() {\n on(d.scroller, \"dragover\", drag_);\n on(d.scroller, \"drop\", operation(cm, onDrop));\n }\n- on(d.scroller, \"paste\", function(e){\n+ on(d.scroller, \"paste\", function(e) {\n if (eventInWidget(d, e)) return;\n- focusInput(cm); \n+ focusInput(cm);\n fastPoll(cm);\n });\n on(d.input, \"paste\", function() {\n+ \/\/ Workaround for webkit bug https:\/\/bugs.webkit.org\/show_bug.cgi?id=90206\n+ \/\/ Add a char to the end of textarea before paste occur so that\n+ \/\/ selection doesn't span to the end of textarea.\n+ if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {\n+ var start = d.input.selectionStart, end = d.input.selectionEnd;\n+ d.input.value += \"$\";\n+ d.input.selectionStart = start;\n+ d.input.selectionEnd = end;\n+ cm.state.fakedLastChar = true;\n+ }\n cm.state.pasteIncoming = true;\n fastPoll(cm);\n });\n@@ -1479,9 +1687,7 @@ window.CodeMirror = (function() {\n \n function eventInWidget(display, e) {\n for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {\n- if (!n) return true;\n- if (\/\\bCodeMirror-(?:line)?widget\\b\/.test(n.className) ||\n- n.parentNode == display.sizer && n != display.mover) return true;\n+ if (!n || n.ignoreEvents || n.parentNode == display.sizer && n != display.mover) return true;\n }\n }\n \n@@ -1491,9 +1697,9 @@ window.CodeMirror = (function() {\n var target = e_target(e);\n if (target == display.scrollbarH || target == display.scrollbarH.firstChild ||\n target == display.scrollbarV || target == display.scrollbarV.firstChild ||\n- target == display.scrollbarFiller) return null;\n+ target == display.scrollbarFiller || target == display.gutterFiller) return null;\n }\n- var x, y, space = display.lineSpace.getBoundingClientRect();\n+ var x, y, space = getRect(display.lineSpace);\n \/\/ Fails unpredictably on IE[67] when mouse is dragged around quickly.\n try { x = e.clientX; y = e.clientY; } catch (e) { return null; }\n return coordsChar(cm, x - space.left, y - space.top);\n@@ -1501,8 +1707,9 @@ window.CodeMirror = (function() {\n \n var lastClick, lastDoubleClick;\n function onMouseDown(e) {\n+ if (signalDOMEvent(this, e)) return;\n var cm = this, display = cm.display, doc = cm.doc, sel = doc.sel;\n- sel.shift = e_prop(e, \"shiftKey\");\n+ sel.shift = e.shiftKey;\n \n if (eventInWidget(display, e)) {\n if (!webkit) {\n@@ -1519,6 +1726,7 @@ window.CodeMirror = (function() {\n if (captureMiddleClick) onContextMenu.call(cm, cm, e);\n return;\n case 2:\n+ if (webkit) cm.state.lastMiddleDown = +new Date;\n if (start) extendSelection(cm.doc, start);\n setTimeout(bind(focusInput, cm), 20);\n e_preventDefault(e);\n@@ -1571,9 +1779,12 @@ window.CodeMirror = (function() {\n e_preventDefault(e);\n if (type == \"single\") extendSelection(cm.doc, clipPos(doc, start));\n \n- var startstart = sel.from, startend = sel.to;\n+ var startstart = sel.from, startend = sel.to, lastPos = start;\n \n function doSelect(cur) {\n+ if (posEq(lastPos, cur)) return;\n+ lastPos = cur;\n+\n if (type == \"single\") {\n extendSelection(cm.doc, clipPos(doc, start), cur);\n return;\n@@ -1591,7 +1802,7 @@ window.CodeMirror = (function() {\n }\n }\n \n- var editorSize = display.wrapper.getBoundingClientRect();\n+ var editorSize = getRect(display.wrapper);\n \/\/ Used to ensure timeout re-tries don't fire when another extend\n \/\/ happened in the meantime (clearTimeout isn't reliable -- at\n \/\/ least on Chrome, the timeouts still happen even when cleared,\n@@ -1621,8 +1832,6 @@ window.CodeMirror = (function() {\n \n function done(e) {\n counter = Infinity;\n- var cur = posFromMouse(cm, e);\n- if (cur) doSelect(cur);\n e_preventDefault(e);\n focusInput(cm);\n off(document, \"mousemove\", move);\n@@ -1638,11 +1847,48 @@ window.CodeMirror = (function() {\n on(document, \"mouseup\", up);\n }\n \n+ function gutterEvent(cm, e, type, prevent, signalfn) {\n+ try { var mX = e.clientX, mY = e.clientY; }\n+ catch(e) { return false; }\n+ if (mX >= Math.floor(getRect(cm.display.gutters).right)) return false;\n+ if (prevent) e_preventDefault(e);\n+\n+ var display = cm.display;\n+ var lineBox = getRect(display.lineDiv);\n+\n+ if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e);\n+ mY -= lineBox.top - display.viewOffset;\n+\n+ for (var i = 0; i < cm.options.gutters.length; ++i) {\n+ var g = display.gutters.childNodes[i];\n+ if (g && getRect(g).right >= mX) {\n+ var line = lineAtHeight(cm.doc, mY);\n+ var gutter = cm.options.gutters[i];\n+ signalfn(cm, type, cm, line, gutter, e);\n+ return e_defaultPrevented(e);\n+ }\n+ }\n+ }\n+\n+ function contextMenuInGutter(cm, e) {\n+ if (!hasHandler(cm, \"gutterContextMenu\")) return false;\n+ return gutterEvent(cm, e, \"gutterContextMenu\", false, signal);\n+ }\n+\n+ function clickInGutter(cm, e) {\n+ return gutterEvent(cm, e, \"gutterClick\", true, signalLater);\n+ }\n+\n+ \/\/ Kludge to work around strange IE behavior where it'll sometimes\n+ \/\/ re-fire a series of drag-related events right after the drop (#1551)\n+ var lastDrop = 0;\n+\n function onDrop(e) {\n var cm = this;\n- if (eventInWidget(cm.display, e) || (cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))))\n+ if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e) || (cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))))\n return;\n e_preventDefault(e);\n+ if (ie) lastDrop = +new Date;\n var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;\n if (!pos || isReadOnly(cm)) return;\n if (files && files.length && window.FileReader && window.File) {\n@@ -1653,7 +1899,7 @@ window.CodeMirror = (function() {\n text[i] = reader.result;\n if (++read == n) {\n pos = clipPos(cm.doc, pos);\n- replaceRange(cm.doc, text.join(\"\"), pos, \"around\", \"paste\");\n+ makeChange(cm.doc, {from: pos, to: pos, text: splitLines(text.join(\"\\n\")), origin: \"paste\"}, \"around\");\n }\n };\n reader.readAsText(file);\n@@ -1675,41 +1921,16 @@ window.CodeMirror = (function() {\n if (cm.state.draggingText) replaceRange(cm.doc, \"\", curFrom, curTo, \"paste\");\n cm.replaceSelection(text, null, \"paste\");\n focusInput(cm);\n- onFocus(cm);\n }\n }\n catch(e){}\n }\n }\n \n- function clickInGutter(cm, e) {\n- var display = cm.display;\n- try { var mX = e.clientX, mY = e.clientY; }\n- catch(e) { return false; }\n-\n- if (mX >= Math.floor(display.gutters.getBoundingClientRect().right)) return false;\n- e_preventDefault(e);\n- if (!hasHandler(cm, \"gutterClick\")) return true;\n-\n- var lineBox = display.lineDiv.getBoundingClientRect();\n- if (mY > lineBox.bottom) return true;\n- mY -= lineBox.top - display.viewOffset;\n-\n- for (var i = 0; i < cm.options.gutters.length; ++i) {\n- var g = display.gutters.childNodes[i];\n- if (g && g.getBoundingClientRect().right >= mX) {\n- var line = lineAtHeight(cm.doc, mY);\n- var gutter = cm.options.gutters[i];\n- signalLater(cm, \"gutterClick\", cm, line, gutter, e);\n- break;\n- }\n- }\n- return true;\n- }\n-\n function onDragStart(cm, e) {\n- if (eventInWidget(cm.display, e)) return;\n- \n+ if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }\n+ if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;\n+\n var txt = cm.getSelection();\n e.dataTransfer.setData(\"Text\", txt);\n \n@@ -1717,6 +1938,7 @@ window.CodeMirror = (function() {\n \/\/ Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.\n if (e.dataTransfer.setDragImage && !safari) {\n var img = elt(\"img\", null, null, \"position: fixed; left: 0; top: 0;\");\n+ img.src = \"data:image\/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==\";\n if (opera) {\n img.width = img.height = 1;\n cm.display.wrapper.appendChild(img);\n@@ -1735,6 +1957,7 @@ window.CodeMirror = (function() {\n if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;\n if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val;\n if (gecko) updateDisplay(cm, []);\n+ startWorker(cm, 100);\n }\n function setScrollLeft(cm, val, isScroller) {\n if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return;\n@@ -1772,6 +1995,11 @@ window.CodeMirror = (function() {\n if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;\n else if (dy == null) dy = e.wheelDelta;\n \n+ var display = cm.display, scroll = display.scroller;\n+ \/\/ Quit if there's nothing to scroll here\n+ if (!(dx && scroll.scrollWidth > scroll.clientWidth ||\n+ dy && scroll.scrollHeight > scroll.clientHeight)) return;\n+\n \/\/ Webkit browsers on OS X abort momentum scrolls when the target\n \/\/ of the scroll event is removed from the scrollable element.\n \/\/ This hack (see related code in patchDisplay) makes sure the\n@@ -1785,7 +2013,6 @@ window.CodeMirror = (function() {\n }\n }\n \n- var display = cm.display, scroll = display.scroller;\n \/\/ On some browsers, horizontal scrolling will cause redraws to\n \/\/ happen before the gutter has been realigned, causing it to\n \/\/ wriggle around in a most unseemly way. When we have an\n@@ -1838,22 +2065,22 @@ window.CodeMirror = (function() {\n \/\/ Ensure previous input has been read, so that the handler sees a\n \/\/ consistent view of the document\n if (cm.display.pollingFast && readInput(cm)) cm.display.pollingFast = false;\n- var doc = cm.doc, prevShift = doc.sel.shift;\n+ var doc = cm.doc, prevShift = doc.sel.shift, done = false;\n try {\n if (isReadOnly(cm)) cm.state.suppressEdits = true;\n if (dropShift) doc.sel.shift = false;\n- bound(cm);\n+ done = bound(cm) != Pass;\n } finally {\n doc.sel.shift = prevShift;\n cm.state.suppressEdits = false;\n }\n- return true;\n+ return done;\n }\n \n function allKeyMaps(cm) {\n var maps = cm.state.keyMaps.slice(0);\n+ if (cm.options.extraKeys) maps.push(cm.options.extraKeys);\n maps.push(cm.options.keyMap);\n- if (cm.options.extraKeys) maps.unshift(cm.options.extraKeys);\n return maps;\n }\n \n@@ -1863,31 +2090,34 @@ window.CodeMirror = (function() {\n var startMap = getKeyMap(cm.options.keyMap), next = startMap.auto;\n clearTimeout(maybeTransition);\n if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {\n- if (getKeyMap(cm.options.keyMap) == startMap)\n+ if (getKeyMap(cm.options.keyMap) == startMap) {\n cm.options.keyMap = (next.call ? next.call(null, cm) : next);\n+ keyMapChanged(cm);\n+ }\n }, 50);\n \n var name = keyName(e, true), handled = false;\n if (!name) return false;\n var keymaps = allKeyMaps(cm);\n \n- if (e_prop(e, \"shiftKey\")) {\n+ if (e.shiftKey) {\n \/\/ First try to resolve full name (including 'Shift-'). Failing\n \/\/ that, see if there is a cursor-motion command (starting with\n \/\/ 'go') bound to the keyname without 'Shift-'.\n handled = lookupKey(\"Shift-\" + name, keymaps, function(b) {return doHandleBinding(cm, b, true);})\n || lookupKey(name, keymaps, function(b) {\n- if (typeof b == \"string\" && \/^go[A-Z]\/.test(b)) return doHandleBinding(cm, b);\n+ if (typeof b == \"string\" ? \/^go[A-Z]\/.test(b) : b.motion)\n+ return doHandleBinding(cm, b);\n });\n } else {\n handled = lookupKey(name, keymaps, function(b) { return doHandleBinding(cm, b); });\n }\n- if (handled == \"stop\") handled = false;\n \n if (handled) {\n e_preventDefault(e);\n restartBlink(cm);\n if (ie_lt9) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }\n+ signalLater(cm, \"keyHandled\", cm, name, e);\n }\n return handled;\n }\n@@ -1898,6 +2128,7 @@ window.CodeMirror = (function() {\n if (handled) {\n e_preventDefault(e);\n restartBlink(cm);\n+ signalLater(cm, \"keyHandled\", cm, \"'\" + ch + \"'\", e);\n }\n return handled;\n }\n@@ -1906,33 +2137,30 @@ window.CodeMirror = (function() {\n function onKeyDown(e) {\n var cm = this;\n if (!cm.state.focused) onFocus(cm);\n- if (ie && e.keyCode == 27) { e.returnValue = false; }\n- if (cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;\n- var code = e_prop(e, \"keyCode\");\n+ if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;\n+ if (ie && e.keyCode == 27) e.returnValue = false;\n+ var code = e.keyCode;\n \/\/ IE does strange things with escape.\n- cm.doc.sel.shift = code == 16 || e_prop(e, \"shiftKey\");\n+ cm.doc.sel.shift = code == 16 || e.shiftKey;\n \/\/ First give onKeyEvent option a chance to handle this.\n var handled = handleKeyBinding(cm, e);\n if (opera) {\n lastStoppedKey = handled ? code : null;\n \/\/ Opera has no cut event... we try to at least catch the key combo\n- if (!handled && code == 88 && !hasCopyEvent && e_prop(e, mac ? \"metaKey\" : \"ctrlKey\"))\n+ if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))\n cm.replaceSelection(\"\");\n }\n }\n \n function onKeyPress(e) {\n var cm = this;\n- if (cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;\n- var keyCode = e_prop(e, \"keyCode\"), charCode = e_prop(e, \"charCode\");\n+ if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;\n+ var keyCode = e.keyCode, charCode = e.charCode;\n if (opera && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}\n if (((opera && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;\n var ch = String.fromCharCode(charCode == null ? keyCode : charCode);\n- if (this.options.electricChars && this.doc.mode.electricChars &&\n- this.options.smartIndent && !isReadOnly(this) &&\n- this.doc.mode.electricChars.indexOf(ch) > -1)\n- setTimeout(operation(cm, function() {indentLine(cm, cm.doc.sel.to.line, \"smart\");}), 75);\n if (handleCharBinding(cm, e, ch)) return;\n+ if (ie && !ie_lt9) cm.display.inputHasSelection = null;\n fastPoll(cm);\n }\n \n@@ -1943,7 +2171,10 @@ window.CodeMirror = (function() {\n cm.state.focused = true;\n if (cm.display.wrapper.className.search(\/\\bCodeMirror-focused\\b\/) == -1)\n cm.display.wrapper.className += \" CodeMirror-focused\";\n- resetInput(cm, true);\n+ if (!cm.curOp) {\n+ resetInput(cm, true);\n+ if (webkit) setTimeout(bind(resetInput, cm, true), 0); \/\/ Issue #1730\n+ }\n }\n slowPoll(cm);\n restartBlink(cm);\n@@ -1960,38 +2191,48 @@ window.CodeMirror = (function() {\n \n var detectingSelectAll;\n function onContextMenu(cm, e) {\n+ if (signalDOMEvent(cm, e, \"contextmenu\")) return;\n var display = cm.display, sel = cm.doc.sel;\n- if (eventInWidget(display, e)) return;\n+ if (eventInWidget(display, e) || contextMenuInGutter(cm, e)) return;\n \n var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;\n if (!pos || opera) return; \/\/ Opera is difficult.\n- if (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to))\n+\n+ \/\/ Reset the current text selection only if the click is done outside of the selection\n+ \/\/ and 'resetSelectionOnContextMenu' option is true.\n+ var reset = cm.options.resetSelectionOnContextMenu;\n+ if (reset && (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to)))\n operation(cm, setSelection)(cm.doc, pos, pos);\n \n var oldCSS = display.input.style.cssText;\n display.inputDiv.style.position = \"absolute\";\n display.input.style.cssText = \"position: fixed; width: 30px; height: 30px; top: \" + (e.clientY - 5) +\n- \"px; left: \" + (e.clientX - 5) + \"px; z-index: 1000; background: white; outline: none;\" +\n+ \"px; left: \" + (e.clientX - 5) + \"px; z-index: 1000; background: transparent; outline: none;\" +\n \"border-width: 0; outline: none; overflow: hidden; opacity: .05; -ms-opacity: .05; filter: alpha(opacity=5);\";\n focusInput(cm);\n resetInput(cm, true);\n \/\/ Adds \"Select all\" to context menu in FF\n if (posEq(sel.from, sel.to)) display.input.value = display.prevInput = \" \";\n \n+ function prepareSelectAllHack() {\n+ if (display.input.selectionStart != null) {\n+ var extval = display.input.value = \"\\u200b\" + (posEq(sel.from, sel.to) ? \"\" : display.input.value);\n+ display.prevInput = \"\\u200b\";\n+ display.input.selectionStart = 1; display.input.selectionEnd = extval.length;\n+ }\n+ }\n function rehide() {\n display.inputDiv.style.position = \"relative\";\n display.input.style.cssText = oldCSS;\n if (ie_lt9) display.scrollbarV.scrollTop = display.scroller.scrollTop = scrollPos;\n slowPoll(cm);\n \n- \/\/ Try to detect the user choosing select-all \n- if (display.input.selectionStart != null && (!ie || ie_lt9)) {\n+ \/\/ Try to detect the user choosing select-all\n+ if (display.input.selectionStart != null) {\n+ if (!ie || ie_lt9) prepareSelectAllHack();\n clearTimeout(detectingSelectAll);\n- var extval = display.input.value = \" \" + (posEq(sel.from, sel.to) ? \"\" : display.input.value), i = 0;\n- display.prevInput = \" \";\n- display.input.selectionStart = 1; display.input.selectionEnd = extval.length;\n- var poll = function(){\n- if (display.prevInput == \" \" && display.input.selectionStart == 0)\n+ var i = 0, poll = function(){\n+ if (display.prevInput == \"\\u200b\" && display.input.selectionStart == 0)\n operation(cm, commands.selectAll)(cm);\n else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);\n else resetInput(cm);\n@@ -2000,6 +2241,7 @@ window.CodeMirror = (function() {\n }\n }\n \n+ if (ie && !ie_lt9) prepareSelectAllHack();\n if (captureMiddleClick) {\n e_stop(e);\n var mouseup = function() {\n@@ -2014,16 +2256,36 @@ window.CodeMirror = (function() {\n \n \/\/ UPDATING\n \n- function changeEnd(change) {\n+ var changeEnd = CodeMirror.changeEnd = function(change) {\n+ if (!change.text) return change.to;\n return Pos(change.from.line + change.text.length - 1,\n lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));\n+ };\n+\n+ \/\/ Make sure a position will be valid after the given change.\n+ function clipPostChange(doc, change, pos) {\n+ if (!posLess(change.from, pos)) return clipPos(doc, pos);\n+ var diff = (change.text.length - 1) - (change.to.line - change.from.line);\n+ if (pos.line > change.to.line + diff) {\n+ var preLine = pos.line - diff, lastLine = doc.first + doc.size - 1;\n+ if (preLine > lastLine) return Pos(lastLine, getLine(doc, lastLine).text.length);\n+ return clipToLen(pos, getLine(doc, preLine).text.length);\n+ }\n+ if (pos.line == change.to.line + diff)\n+ return clipToLen(pos, lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0) +\n+ getLine(doc, change.to.line).text.length - change.to.ch);\n+ var inside = pos.line - change.from.line;\n+ return clipToLen(pos, change.text[inside].length + (inside ? 0 : change.from.ch));\n }\n \n \/\/ Hint can be null|\"end\"|\"start\"|\"around\"|{anchor,head}\n- function computeSelAfterChange(sel, change, hint) {\n- if (hint && typeof hint == \"object\") return hint; \/\/ Assumed to be {from, to} object\n+ function computeSelAfterChange(doc, change, hint) {\n+ if (hint && typeof hint == \"object\") \/\/ Assumed to be {anchor, head} object\n+ return {anchor: clipPostChange(doc, change, hint.anchor),\n+ head: clipPostChange(doc, change, hint.head)};\n+\n if (hint == \"start\") return {anchor: change.from, head: change.from};\n- \n+\n var end = changeEnd(change);\n if (hint == \"around\") return {anchor: change.from, head: end};\n if (hint == \"end\") return {anchor: end, head: end};\n@@ -2037,7 +2299,29 @@ window.CodeMirror = (function() {\n if (pos.line == change.to.line) ch += end.ch - change.to.ch;\n return Pos(line, ch);\n };\n- return {anchor: adjustPos(sel.anchor), head: adjustPos(sel.head)};\n+ return {anchor: adjustPos(doc.sel.anchor), head: adjustPos(doc.sel.head)};\n+ }\n+\n+ function filterChange(doc, change, update) {\n+ var obj = {\n+ canceled: false,\n+ from: change.from,\n+ to: change.to,\n+ text: change.text,\n+ origin: change.origin,\n+ cancel: function() { this.canceled = true; }\n+ };\n+ if (update) obj.update = function(from, to, text, origin) {\n+ if (from) this.from = clipPos(doc, from);\n+ if (to) this.to = clipPos(doc, to);\n+ if (text) this.text = text;\n+ if (origin !== undefined) this.origin = origin;\n+ };\n+ signal(doc, \"beforeChange\", doc, obj);\n+ if (doc.cm) signal(doc.cm, \"beforeChange\", doc.cm, obj);\n+\n+ if (obj.canceled) return null;\n+ return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin};\n }\n \n \/\/ Replace the range from from to to by the strings in replacement.\n@@ -2048,6 +2332,11 @@ window.CodeMirror = (function() {\n if (doc.cm.state.suppressEdits) return;\n }\n \n+ if (hasHandler(doc, \"beforeChange\") || doc.cm && hasHandler(doc.cm, \"beforeChange\")) {\n+ change = filterChange(doc, change, true);\n+ if (!change) return;\n+ }\n+\n \/\/ Possibly split or suppress the update based on the presence\n \/\/ of read-only spans in its range.\n var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);\n@@ -2062,7 +2351,8 @@ window.CodeMirror = (function() {\n }\n \n function makeChangeNoReadonly(doc, change, selUpdate) {\n- var selAfter = computeSelAfterChange(doc.sel, change, selUpdate);\n+ if (change.text.length == 1 && change.text[0] == \"\" && posEq(change.from, change.to)) return;\n+ var selAfter = computeSelAfterChange(doc, change, selUpdate);\n addToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);\n \n makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));\n@@ -2078,21 +2368,31 @@ window.CodeMirror = (function() {\n }\n \n function makeChangeFromHistory(doc, type) {\n+ if (doc.cm && doc.cm.state.suppressEdits) return;\n+\n var hist = doc.history;\n var event = (type == \"undo\" ? hist.done : hist.undone).pop();\n if (!event) return;\n- hist.dirtyCounter += type == \"undo\" ? -1 : 1;\n \n var anti = {changes: [], anchorBefore: event.anchorAfter, headBefore: event.headAfter,\n- anchorAfter: event.anchorBefore, headAfter: event.headBefore};\n+ anchorAfter: event.anchorBefore, headAfter: event.headBefore,\n+ generation: hist.generation};\n (type == \"undo\" ? hist.undone : hist.done).push(anti);\n+ hist.generation = event.generation || ++hist.maxGeneration;\n+\n+ var filter = hasHandler(doc, \"beforeChange\") || doc.cm && hasHandler(doc.cm, \"beforeChange\");\n \n for (var i = event.changes.length - 1; i >= 0; --i) {\n var change = event.changes[i];\n change.origin = type;\n+ if (filter && !filterChange(doc, change, false)) {\n+ (type == \"undo\" ? hist.done : hist.undone).length = 0;\n+ return;\n+ }\n+\n anti.changes.push(historyChangeFromChange(doc, change));\n \n- var after = i ? computeSelAfterChange(doc.sel, change, null)\n+ var after = i ? computeSelAfterChange(doc, change, null)\n : {anchor: event.anchorBefore, head: event.headBefore};\n makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));\n var rebased = [];\n@@ -2138,7 +2438,9 @@ window.CodeMirror = (function() {\n text: [change.text[0]], origin: change.origin};\n }\n \n- if (!selAfter) selAfter = computeSelAfterChange(doc.sel, change, null);\n+ change.removed = getBetween(doc, change.from, change.to);\n+\n+ if (!selAfter) selAfter = computeSelAfterChange(doc, change, null);\n if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans, selAfter);\n else updateDoc(doc, change, spans, selAfter);\n }\n@@ -2157,6 +2459,9 @@ window.CodeMirror = (function() {\n });\n }\n \n+ if (!posLess(doc.sel.head, change.from) && !posLess(change.to, doc.sel.head))\n+ cm.curOp.cursorActivity = true;\n+\n updateDoc(doc, change, spans, selAfter, estimateHeight(cm));\n \n if (!cm.options.lineWrapping) {\n@@ -2179,8 +2484,12 @@ window.CodeMirror = (function() {\n var lendiff = change.text.length - (to.line - from.line) - 1;\n \/\/ Remember that these lines changed, for updating the display\n regChange(cm, from.line, to.line + 1, lendiff);\n+\n if (hasHandler(cm, \"change\")) {\n- var changeObj = {from: from, to: to, text: change.text, origin: change.origin};\n+ var changeObj = {from: from, to: to,\n+ text: change.text,\n+ removed: change.removed,\n+ origin: change.origin};\n if (cm.curOp.textChanged) {\n for (var cur = cm.curOp.textChanged; cur.next; cur = cur.next) {}\n cur.next = changeObj;\n@@ -2205,6 +2514,7 @@ window.CodeMirror = (function() {\n \n function posEq(a, b) {return a.line == b.line && a.ch == b.ch;}\n function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);}\n+ function cmp(a, b) {return a.line - b.line || a.ch - b.ch;}\n function copyPos(x) {return Pos(x.line, x.ch);}\n \n \/\/ SELECTION\n@@ -2214,7 +2524,10 @@ window.CodeMirror = (function() {\n if (pos.line < doc.first) return Pos(doc.first, 0);\n var last = doc.first + doc.size - 1;\n if (pos.line > last) return Pos(last, getLine(doc, last).text.length);\n- var ch = pos.ch, linelen = getLine(doc, pos.line).text.length;\n+ return clipToLen(pos, getLine(doc, pos.line).text.length);\n+ }\n+ function clipToLen(pos, linelen) {\n+ var ch = pos.ch;\n if (ch == null || ch > linelen) return Pos(pos.line, linelen);\n else if (ch < 0) return Pos(pos.line, 0);\n else return pos;\n@@ -2242,12 +2555,27 @@ window.CodeMirror = (function() {\n if (doc.cm) doc.cm.curOp.userSelChange = true;\n }\n \n+ function filterSelectionChange(doc, anchor, head) {\n+ var obj = {anchor: anchor, head: head};\n+ signal(doc, \"beforeSelectionChange\", doc, obj);\n+ if (doc.cm) signal(doc.cm, \"beforeSelectionChange\", doc.cm, obj);\n+ obj.anchor = clipPos(doc, obj.anchor); obj.head = clipPos(doc, obj.head);\n+ return obj;\n+ }\n+\n \/\/ Update the selection. Last two args are only used by\n \/\/ updateDoc, since they have to be expressed in the line\n \/\/ numbers before the update.\n function setSelection(doc, anchor, head, bias, checkAtomic) {\n+ if (!checkAtomic && hasHandler(doc, \"beforeSelectionChange\") || doc.cm && hasHandler(doc.cm, \"beforeSelectionChange\")) {\n+ var filtered = filterSelectionChange(doc, anchor, head);\n+ head = filtered.head;\n+ anchor = filtered.anchor;\n+ }\n+\n var sel = doc.sel;\n sel.goalColumn = null;\n+ if (bias == null) bias = posLess(head, sel.head) ? -1 : 1;\n \/\/ Skip over atomic spans.\n if (checkAtomic || !posEq(anchor, sel.anchor))\n anchor = skipAtomic(doc, anchor, bias, checkAtomic != \"push\");\n@@ -2262,7 +2590,10 @@ window.CodeMirror = (function() {\n sel.to = inv ? anchor : head;\n \n if (doc.cm)\n- doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true;\n+ doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged =\n+ doc.cm.curOp.cursorActivity = true;\n+\n+ signalLater(doc, \"cursorActivity\", doc);\n }\n \n function reCheckSelection(cm) {\n@@ -2274,16 +2605,20 @@ window.CodeMirror = (function() {\n var dir = bias || 1;\n doc.cantEdit = false;\n search: for (;;) {\n- var line = getLine(doc, curPos.line), toClear;\n+ var line = getLine(doc, curPos.line);\n if (line.markedSpans) {\n for (var i = 0; i < line.markedSpans.length; ++i) {\n var sp = line.markedSpans[i], m = sp.marker;\n if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) &&\n (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) {\n- if (mayClear && m.clearOnEnter) {\n- (toClear || (toClear = [])).push(m);\n- continue;\n- } else if (!m.atomic) continue;\n+ if (mayClear) {\n+ signal(m, \"beforeCursorEnter\");\n+ if (m.explicitlyCleared) {\n+ if (!line.markedSpans) break;\n+ else {--i; continue;}\n+ }\n+ }\n+ if (!m.atomic) continue;\n var newPos = m.find()[dir < 0 ? \"from\" : \"to\"];\n if (posEq(newPos, curPos)) {\n newPos.ch += dir;\n@@ -2310,7 +2645,6 @@ window.CodeMirror = (function() {\n continue search;\n }\n }\n- if (toClear) for (var i = 0; i < toClear.length; ++i) toClear[i].clear();\n }\n return curPos;\n }\n@@ -2319,27 +2653,31 @@ window.CodeMirror = (function() {\n \/\/ SCROLLING\n \n function scrollCursorIntoView(cm) {\n- var coords = scrollPosIntoView(cm, cm.doc.sel.head);\n+ var coords = scrollPosIntoView(cm, cm.doc.sel.head, null, cm.options.cursorScrollMargin);\n if (!cm.state.focused) return;\n- var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;\n+ var display = cm.display, box = getRect(display.sizer), doScroll = null;\n if (coords.top + box.top < 0) doScroll = true;\n else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;\n if (doScroll != null && !phantom) {\n- var hidden = display.cursor.style.display == \"none\";\n- if (hidden) {\n- display.cursor.style.display = \"\";\n- display.cursor.style.left = coords.left + \"px\";\n- display.cursor.style.top = (coords.top - display.viewOffset) + \"px\";\n- }\n- display.cursor.scrollIntoView(doScroll);\n- if (hidden) display.cursor.style.display = \"none\";\n+ var scrollNode = elt(\"div\", \"\\u200b\", null, \"position: absolute; top: \" +\n+ (coords.top - display.viewOffset) + \"px; height: \" +\n+ (coords.bottom - coords.top + scrollerCutOff) + \"px; left: \" +\n+ coords.left + \"px; width: 2px;\");\n+ cm.display.lineSpace.appendChild(scrollNode);\n+ scrollNode.scrollIntoView(doScroll);\n+ cm.display.lineSpace.removeChild(scrollNode);\n }\n }\n \n- function scrollPosIntoView(cm, pos) {\n+ function scrollPosIntoView(cm, pos, end, margin) {\n+ if (margin == null) margin = 0;\n for (;;) {\n var changed = false, coords = cursorCoords(cm, pos);\n- var scrollPos = calculateScrollPos(cm, coords.left, coords.top, coords.left, coords.bottom);\n+ var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);\n+ var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),\n+ Math.min(coords.top, endCoords.top) - margin,\n+ Math.max(coords.left, endCoords.left),\n+ Math.max(coords.bottom, endCoords.bottom) + margin);\n var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;\n if (scrollPos.scrollTop != null) {\n setScrollTop(cm, scrollPos.scrollTop);\n@@ -2360,13 +2698,17 @@ window.CodeMirror = (function() {\n }\n \n function calculateScrollPos(cm, x1, y1, x2, y2) {\n- var display = cm.display, pt = paddingTop(display);\n- y1 += pt; y2 += pt;\n+ var display = cm.display, snapMargin = textHeight(cm.display);\n+ if (y1 < 0) y1 = 0;\n var screen = display.scroller.clientHeight - scrollerCutOff, screentop = display.scroller.scrollTop, result = {};\n- var docBottom = cm.doc.height + 2 * pt;\n- var atTop = y1 < pt + 10, atBottom = y2 + pt > docBottom - 10;\n- if (y1 < screentop) result.scrollTop = atTop ? 0 : Math.max(0, y1);\n- else if (y2 > screentop + screen) result.scrollTop = (atBottom ? docBottom : y2) - screen;\n+ var docBottom = cm.doc.height + paddingVert(display);\n+ var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;\n+ if (y1 < screentop) {\n+ result.scrollTop = atTop ? 0 : y1;\n+ } else if (y2 > screentop + screen) {\n+ var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen);\n+ if (newTop != screentop) result.scrollTop = newTop;\n+ }\n \n var screenw = display.scroller.clientWidth - scrollerCutOff, screenleft = display.scroller.scrollLeft;\n x1 += display.gutters.offsetWidth; x2 += display.gutters.offsetWidth;\n@@ -2381,11 +2723,23 @@ window.CodeMirror = (function() {\n return result;\n }\n \n+ function updateScrollPos(cm, left, top) {\n+ cm.curOp.updateScrollPos = {scrollLeft: left == null ? cm.doc.scrollLeft : left,\n+ scrollTop: top == null ? cm.doc.scrollTop : top};\n+ }\n+\n+ function addToScrollPos(cm, left, top) {\n+ var pos = cm.curOp.updateScrollPos || (cm.curOp.updateScrollPos = {scrollLeft: cm.doc.scrollLeft, scrollTop: cm.doc.scrollTop});\n+ var scroll = cm.display.scroller;\n+ pos.scrollTop = Math.max(0, Math.min(scroll.scrollHeight - scroll.clientHeight, pos.scrollTop + top));\n+ pos.scrollLeft = Math.max(0, Math.min(scroll.scrollWidth - scroll.clientWidth, pos.scrollLeft + left));\n+ }\n+\n \/\/ API UTILITIES\n \n function indentLine(cm, n, how, aggressive) {\n var doc = cm.doc;\n- if (!how) how = \"add\";\n+ if (how == null) how = \"add\";\n if (how == \"smart\") {\n if (!cm.doc.mode.indent) how = \"prev\";\n else var state = getStateBefore(cm, n);\n@@ -2394,7 +2748,10 @@ window.CodeMirror = (function() {\n var tabSize = cm.options.tabSize;\n var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);\n var curSpaceString = line.text.match(\/^\\s*\/)[0], indentation;\n- if (how == \"smart\") {\n+ if (!aggressive && !\/\\S\/.test(line.text)) {\n+ indentation = 0;\n+ how = \"not\";\n+ } else if (how == \"smart\") {\n indentation = cm.doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);\n if (indentation == Pass) {\n if (!aggressive) return;\n@@ -2408,6 +2765,8 @@ window.CodeMirror = (function() {\n indentation = curSpace + cm.options.indentUnit;\n } else if (how == \"subtract\") {\n indentation = curSpace - cm.options.indentUnit;\n+ } else if (typeof how == \"number\") {\n+ indentation = curSpace + how;\n }\n indentation = Math.max(0, indentation);\n \n@@ -2418,6 +2777,8 @@ window.CodeMirror = (function() {\n \n if (indentString != curSpaceString)\n replaceRange(cm.doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), \"+input\");\n+ else if (doc.sel.head.line == n && doc.sel.head.ch < curSpaceString.length)\n+ setSelection(doc, Pos(n, curSpaceString.length), Pos(n, curSpaceString.length), 1);\n line.stateAfter = null;\n }\n \n@@ -2431,12 +2792,13 @@ window.CodeMirror = (function() {\n return line;\n }\n \n- function findPosH(doc, dir, unit, visually) {\n- var end = doc.sel.head, line = end.line, ch = end.ch;\n+ function findPosH(doc, pos, dir, unit, visually) {\n+ var line = pos.line, ch = pos.ch, origDir = dir;\n var lineObj = getLine(doc, line);\n+ var possible = true;\n function findNextLine() {\n var l = line + dir;\n- if (l < doc.first || l >= doc.first + doc.size) return false;\n+ if (l < doc.first || l >= doc.first + doc.size) return (possible = false);\n line = l;\n return lineObj = getLine(doc, l);\n }\n@@ -2446,32 +2808,60 @@ window.CodeMirror = (function() {\n if (!boundToLine && findNextLine()) {\n if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);\n else ch = dir < 0 ? lineObj.text.length : 0;\n- } else return false;\n+ } else return (possible = false);\n } else ch = next;\n return true;\n }\n+\n if (unit == \"char\") moveOnce();\n else if (unit == \"column\") moveOnce(true);\n- else if (unit == \"word\") {\n- var sawWord = false;\n- for (;;) {\n- if (dir < 0) if (!moveOnce()) break;\n- if (isWordChar(lineObj.text.charAt(ch))) sawWord = true;\n- else if (sawWord) {if (dir < 0) {dir = 1; moveOnce();} break;}\n- if (dir > 0) if (!moveOnce()) break;\n+ else if (unit == \"word\" || unit == \"group\") {\n+ var sawType = null, group = unit == \"group\";\n+ for (var first = true;; first = false) {\n+ if (dir < 0 && !moveOnce(!first)) break;\n+ var cur = lineObj.text.charAt(ch) || \"\\n\";\n+ var type = isWordChar(cur) ? \"w\"\n+ : !group ? null\n+ : \/\\s\/.test(cur) ? null\n+ : \"p\";\n+ if (sawType && sawType != type) {\n+ if (dir < 0) {dir = 1; moveOnce();}\n+ break;\n+ }\n+ if (type) sawType = type;\n+ if (dir > 0 && !moveOnce(!first)) break;\n }\n }\n- return skipAtomic(doc, Pos(line, ch), dir, true);\n+ var result = skipAtomic(doc, Pos(line, ch), origDir, true);\n+ if (!possible) result.hitSide = true;\n+ return result;\n+ }\n+\n+ function findPosV(cm, pos, dir, unit) {\n+ var doc = cm.doc, x = pos.left, y;\n+ if (unit == \"page\") {\n+ var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);\n+ y = pos.top + dir * (pageSize - (dir < 0 ? 1.5 : .5) * textHeight(cm.display));\n+ } else if (unit == \"line\") {\n+ y = dir > 0 ? pos.bottom + 3 : pos.top - 3;\n+ }\n+ for (;;) {\n+ var target = coordsChar(cm, x, y);\n+ if (!target.outside) break;\n+ if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; }\n+ y += dir * 5;\n+ }\n+ return target;\n }\n \n function findWordAt(line, pos) {\n var start = pos.ch, end = pos.ch;\n if (line) {\n- if (pos.after === false || end == line.length) --start; else ++end;\n+ if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;\n var startChar = line.charAt(start);\n- var check = isWordChar(startChar) ? isWordChar :\n- \/\\s\/.test(startChar) ? function(ch) {return \/\\s\/.test(ch);} :\n- function(ch) {return !\/\\s\/.test(ch) && !isWordChar(ch);};\n+ var check = isWordChar(startChar) ? isWordChar\n+ : \/\\s\/.test(startChar) ? function(ch) {return \/\\s\/.test(ch);}\n+ : function(ch) {return !\/\\s\/.test(ch) && !isWordChar(ch);};\n while (start > 0 && check(line.charAt(start - 1))) --start;\n while (end < line.length && check(line.charAt(end))) ++end;\n }\n@@ -2488,7 +2878,8 @@ window.CodeMirror = (function() {\n \/\/ 'wrap f in an operation, performed on its `this` parameter'\n \n CodeMirror.prototype = {\n- focus: function(){window.focus(); focusInput(this); onFocus(this); fastPoll(this);},\n+ constructor: CodeMirror,\n+ focus: function(){window.focus(); focusInput(this); fastPoll(this);},\n \n setOption: function(option, value) {\n var options = this.options, old = options[option];\n@@ -2501,13 +2892,13 @@ window.CodeMirror = (function() {\n getOption: function(option) {return this.options[option];},\n getDoc: function() {return this.doc;},\n \n- addKeyMap: function(map) {\n- this.state.keyMaps.push(map);\n+ addKeyMap: function(map, bottom) {\n+ this.state.keyMaps[bottom ? \"push\" : \"unshift\"](map);\n },\n removeKeyMap: function(map) {\n var maps = this.state.keyMaps;\n for (var i = 0; i < maps.length; ++i)\n- if ((typeof map == \"string\" ? maps[i].name : maps[i]) == map) {\n+ if (maps[i] == map || (typeof maps[i] != \"string\" && maps[i].name == map)) {\n maps.splice(i, 1);\n return true;\n }\n@@ -2523,7 +2914,8 @@ window.CodeMirror = (function() {\n removeOverlay: operation(null, function(spec) {\n var overlays = this.state.overlays;\n for (var i = 0; i < overlays.length; ++i) {\n- if (overlays[i].modeSpec == spec) {\n+ var cur = overlays[i].modeSpec;\n+ if (cur == spec || typeof spec == \"string\" && cur.name == spec) {\n overlays.splice(i, 1);\n this.state.modeGen++;\n regChange(this);\n@@ -2533,7 +2925,7 @@ window.CodeMirror = (function() {\n }),\n \n indentLine: operation(null, function(n, dir, aggressive) {\n- if (typeof dir != \"string\") {\n+ if (typeof dir != \"string\" && typeof dir != \"number\") {\n if (dir == null) dir = this.options.smartIndent ? \"smart\" : \"prev\";\n else dir = dir ? \"add\" : \"subtract\";\n }\n@@ -2541,17 +2933,17 @@ window.CodeMirror = (function() {\n }),\n indentSelection: operation(null, function(how) {\n var sel = this.doc.sel;\n- if (posEq(sel.from, sel.to)) return indentLine(this, sel.from.line, how);\n+ if (posEq(sel.from, sel.to)) return indentLine(this, sel.from.line, how, true);\n var e = sel.to.line - (sel.to.ch ? 0 : 1);\n for (var i = sel.from.line; i <= e; ++i) indentLine(this, i, how);\n }),\n \n \/\/ Fetch the parser token for a given character. Useful for hacks\n \/\/ that want to inspect the mode state (say, for completion).\n- getTokenAt: function(pos) {\n+ getTokenAt: function(pos, precise) {\n var doc = this.doc;\n pos = clipPos(doc, pos);\n- var state = getStateBefore(this, pos.line), mode = this.doc.mode;\n+ var state = getStateBefore(this, pos.line, precise), mode = this.doc.mode;\n var line = getLine(doc, pos.line);\n var stream = new StringStream(line.text, this.options.tabSize);\n while (stream.pos < pos.ch && !stream.eol()) {\n@@ -2566,10 +2958,57 @@ window.CodeMirror = (function() {\n state: state};\n },\n \n- getStateAfter: function(line) {\n+ getTokenTypeAt: function(pos) {\n+ pos = clipPos(this.doc, pos);\n+ var styles = getLineStyles(this, getLine(this.doc, pos.line));\n+ var before = 0, after = (styles.length - 1) \/ 2, ch = pos.ch;\n+ if (ch == 0) return styles[2];\n+ for (;;) {\n+ var mid = (before + after) >> 1;\n+ if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;\n+ else if (styles[mid * 2 + 1] < ch) before = mid + 1;\n+ else return styles[mid * 2 + 2];\n+ }\n+ },\n+\n+ getModeAt: function(pos) {\n+ var mode = this.doc.mode;\n+ if (!mode.innerMode) return mode;\n+ return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode;\n+ },\n+\n+ getHelper: function(pos, type) {\n+ return this.getHelpers(pos, type)[0];\n+ },\n+\n+ getHelpers: function(pos, type) {\n+ var found = [];\n+ if (!helpers.hasOwnProperty(type)) return helpers;\n+ var help = helpers[type], mode = this.getModeAt(pos);\n+ if (typeof mode[type] == \"string\") {\n+ if (help[mode[type]]) found.push(help[mode[type]]);\n+ } else if (mode[type]) {\n+ for (var i = 0; i < mode[type].length; i++) {\n+ var val = help[mode[type][i]];\n+ if (val) found.push(val);\n+ }\n+ } else if (mode.helperType && help[mode.helperType]) {\n+ found.push(help[mode.helperType]);\n+ } else if (help[mode.name]) {\n+ found.push(help[mode.name]);\n+ }\n+ for (var i = 0; i < help._global.length; i++) {\n+ var cur = help._global[i];\n+ if (cur.pred(mode, this) && indexOf(found, cur.val) == -1)\n+ found.push(cur.val);\n+ }\n+ return found;\n+ },\n+\n+ getStateAfter: function(line, precise) {\n var doc = this.doc;\n line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);\n- return getStateBefore(this, line + 1);\n+ return getStateBefore(this, line + 1, precise);\n },\n \n cursorCoords: function(start, mode) {\n@@ -2584,14 +3023,26 @@ window.CodeMirror = (function() {\n return charCoords(this, clipPos(this.doc, pos), mode || \"page\");\n },\n \n- coordsChar: function(coords) {\n- var off = this.display.lineSpace.getBoundingClientRect();\n- var scrollY = window.pageYOffset || (document.documentElement || document.body).scrollTop;\n- var scrollX = window.pageXOffset || (document.documentElement || document.body).scrollLeft;\n- return coordsChar(this, coords.left - off.left - scrollX, coords.top - off.top - scrollY);\n+ coordsChar: function(coords, mode) {\n+ coords = fromCoordSystem(this, coords, mode || \"page\");\n+ return coordsChar(this, coords.left, coords.top);\n+ },\n+\n+ lineAtHeight: function(height, mode) {\n+ height = fromCoordSystem(this, {top: height, left: 0}, mode || \"page\").top;\n+ return lineAtHeight(this.doc, height + this.display.viewOffset);\n+ },\n+ heightAtLine: function(line, mode) {\n+ var end = false, last = this.doc.first + this.doc.size - 1;\n+ if (line < this.doc.first) line = this.doc.first;\n+ else if (line > last) { line = last; end = true; }\n+ var lineObj = getLine(this.doc, line);\n+ return intoCoordSystem(this, getLine(this.doc, line), {top: 0, left: 0}, mode || \"page\").top +\n+ (end ? lineObj.height : 0);\n },\n \n defaultTextHeight: function() { return textHeight(this.display); },\n+ defaultCharWidth: function() { return charWidth(this.display); },\n \n setGutterMarker: operation(null, function(line, gutterID, value) {\n return changeLine(this, line, function(line) {\n@@ -2618,7 +3069,7 @@ window.CodeMirror = (function() {\n return changeLine(this, handle, function(line) {\n var prop = where == \"text\" ? \"textClass\" : where == \"background\" ? \"bgClass\" : \"wrapClass\";\n if (!line[prop]) line[prop] = cls;\n- else if (new RegExp(\"\\\\b\" + cls + \"\\\\b\").test(line[prop])) return false;\n+ else if (new RegExp(\"(?:^|\\\\s)\" + cls + \"(?:$|\\\\s)\").test(line[prop])) return false;\n else line[prop] += \" \" + cls;\n return true;\n });\n@@ -2631,9 +3082,10 @@ window.CodeMirror = (function() {\n if (!cur) return false;\n else if (cls == null) line[prop] = null;\n else {\n- var upd = cur.replace(new RegExp(\"^\" + cls + \"\\\\b\\\\s*|\\\\s*\\\\b\" + cls + \"\\\\b\"), \"\");\n- if (upd == cur) return false;\n- line[prop] = upd || null;\n+ var found = cur.match(new RegExp(\"(?:^|\\\\s+)\" + cls + \"(?:$|\\\\s+)\"));\n+ if (!found) return false;\n+ var end = found.index + found[0].length;\n+ line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? \"\" : \" \") + cur.slice(end) || null;\n }\n return true;\n });\n@@ -2681,7 +3133,7 @@ window.CodeMirror = (function() {\n if (left + node.offsetWidth > hspace)\n left = hspace - node.offsetWidth;\n }\n- node.style.top = (top + paddingTop(display)) + \"px\";\n+ node.style.top = top + \"px\";\n node.style.left = node.style.right = \"\";\n if (horiz == \"right\") {\n left = display.sizer.clientWidth - node.offsetWidth;\n@@ -2699,51 +3151,71 @@ window.CodeMirror = (function() {\n \n execCommand: function(cmd) {return commands[cmd](this);},\n \n- \/\/ Stuff used by commands, probably not much use to outside code.\n+ findPosH: function(from, amount, unit, visually) {\n+ var dir = 1;\n+ if (amount < 0) { dir = -1; amount = -amount; }\n+ for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {\n+ cur = findPosH(this.doc, cur, dir, unit, visually);\n+ if (cur.hitSide) break;\n+ }\n+ return cur;\n+ },\n+\n moveH: operation(null, function(dir, unit) {\n- var sel = this.doc.sel, pos = dir < 0 ? sel.from : sel.to;\n+ var sel = this.doc.sel, pos;\n if (sel.shift || sel.extend || posEq(sel.from, sel.to))\n- pos = findPosH(this.doc, dir, unit, this.options.rtlMoveVisually);\n+ pos = findPosH(this.doc, sel.head, dir, unit, this.options.rtlMoveVisually);\n+ else\n+ pos = dir < 0 ? sel.from : sel.to;\n extendSelection(this.doc, pos, pos, dir);\n }),\n \n deleteH: operation(null, function(dir, unit) {\n var sel = this.doc.sel;\n if (!posEq(sel.from, sel.to)) replaceRange(this.doc, \"\", sel.from, sel.to, \"+delete\");\n- else replaceRange(this.doc, \"\", sel.from, findPosH(this.doc, dir, unit, false), \"+delete\");\n+ else replaceRange(this.doc, \"\", sel.from, findPosH(this.doc, sel.head, dir, unit, false), \"+delete\");\n this.curOp.userSelChange = true;\n }),\n \n- moveV: operation(null, function(dir, unit) {\n- var doc = this.doc, display = this.display;\n- var cur = doc.sel.head, pos = cursorCoords(this, cur, \"div\");\n- var x = pos.left, y;\n- if (doc.sel.goalColumn != null) x = doc.sel.goalColumn;\n- if (unit == \"page\") {\n- var pageSize = Math.min(display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);\n- y = pos.top + dir * pageSize;\n- } else if (unit == \"line\") {\n- y = dir > 0 ? pos.bottom + 3 : pos.top - 3;\n+ findPosV: function(from, amount, unit, goalColumn) {\n+ var dir = 1, x = goalColumn;\n+ if (amount < 0) { dir = -1; amount = -amount; }\n+ for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {\n+ var coords = cursorCoords(this, cur, \"div\");\n+ if (x == null) x = coords.left;\n+ else coords.left = x;\n+ cur = findPosV(this, coords, dir, unit);\n+ if (cur.hitSide) break;\n }\n- do {\n- var target = coordsChar(this, x, y);\n- y += dir * 5;\n- } while (target.outside && (dir < 0 ? y > 0 : y < doc.height));\n+ return cur;\n+ },\n \n- if (unit == \"page\") display.scrollbarV.scrollTop += charCoords(this, target, \"div\").top - pos.top;\n+ moveV: operation(null, function(dir, unit) {\n+ var sel = this.doc.sel, target, goal;\n+ if (sel.shift || sel.extend || posEq(sel.from, sel.to)) {\n+ var pos = cursorCoords(this, sel.head, \"div\");\n+ if (sel.goalColumn != null) pos.left = sel.goalColumn;\n+ target = findPosV(this, pos, dir, unit);\n+ if (unit == \"page\") addToScrollPos(this, 0, charCoords(this, target, \"div\").top - pos.top);\n+ goal = pos.left;\n+ } else {\n+ target = dir < 0 ? sel.from : sel.to;\n+ }\n extendSelection(this.doc, target, target, dir);\n- doc.sel.goalColumn = x;\n+ if (goal != null) sel.goalColumn = goal;\n }),\n \n- toggleOverwrite: function() {\n+ toggleOverwrite: function(value) {\n+ if (value != null && value == this.state.overwrite) return;\n if (this.state.overwrite = !this.state.overwrite)\n this.display.cursor.className += \" CodeMirror-overwrite\";\n else\n this.display.cursor.className = this.display.cursor.className.replace(\" CodeMirror-overwrite\", \"\");\n },\n+ hasFocus: function() { return this.state.focused; },\n \n scrollTo: operation(null, function(x, y) {\n- this.curOp.updateScrollPos = {scrollLeft: x, scrollTop: y};\n+ updateScrollPos(this, x, y);\n }),\n getScrollInfo: function() {\n var scroller = this.display.scroller, co = scrollerCutOff;\n@@ -2752,34 +3224,45 @@ window.CodeMirror = (function() {\n clientHeight: scroller.clientHeight - co, clientWidth: scroller.clientWidth - co};\n },\n \n- scrollIntoView: function(pos) {\n- if (typeof pos == \"number\") pos = Pos(pos, 0);\n- if (!pos || pos.line != null) {\n- pos = pos ? clipPos(this.doc, pos) : this.doc.sel.head;\n- scrollPosIntoView(this, pos);\n- } else {\n- scrollIntoView(this, pos.left, pos.top, pos.right, pos.bottom);\n+ scrollIntoView: operation(null, function(range, margin) {\n+ if (range == null) range = {from: this.doc.sel.head, to: null};\n+ else if (typeof range == \"number\") range = {from: Pos(range, 0), to: null};\n+ else if (range.from == null) range = {from: range, to: null};\n+ if (!range.to) range.to = range.from;\n+ if (!margin) margin = 0;\n+\n+ var coords = range;\n+ if (range.from.line != null) {\n+ this.curOp.scrollToPos = {from: range.from, to: range.to, margin: margin};\n+ coords = {from: cursorCoords(this, range.from),\n+ to: cursorCoords(this, range.to)};\n }\n- },\n+ var sPos = calculateScrollPos(this, Math.min(coords.from.left, coords.to.left),\n+ Math.min(coords.from.top, coords.to.top) - margin,\n+ Math.max(coords.from.right, coords.to.right),\n+ Math.max(coords.from.bottom, coords.to.bottom) + margin);\n+ updateScrollPos(this, sPos.scrollLeft, sPos.scrollTop);\n+ }),\n \n- setSize: function(width, height) {\n+ setSize: operation(null, function(width, height) {\n function interpret(val) {\n return typeof val == \"number\" || \/^\\d+$\/.test(String(val)) ? val + \"px\" : val;\n }\n if (width != null) this.display.wrapper.style.width = interpret(width);\n if (height != null) this.display.wrapper.style.height = interpret(height);\n- this.refresh();\n- },\n-\n- on: function(type, f) {on(this, type, f);},\n- off: function(type, f) {off(this, type, f);},\n+ if (this.options.lineWrapping)\n+ this.display.measureLineCache.length = this.display.measureLineCachePos = 0;\n+ this.curOp.forceUpdate = true;\n+ }),\n \n operation: function(f){return runInOp(this, f);},\n \n refresh: operation(null, function() {\n+ var badHeight = this.display.cachedTextHeight == null;\n clearCaches(this);\n- this.curOp.updateScrollPos = {scrollTop: this.doc.scrollTop, scrollLeft: this.doc.scrollLeft};\n+ updateScrollPos(this, this.doc.scrollLeft, this.doc.scrollTop);\n regChange(this);\n+ if (badHeight) estimateLineHeights(this);\n }),\n \n swapDoc: operation(null, function(doc) {\n@@ -2787,7 +3270,9 @@ window.CodeMirror = (function() {\n old.cm = null;\n attachDoc(this, doc);\n clearCaches(this);\n- this.curOp.updateScrollPos = {scrollTop: doc.scrollTop, scrollLeft: doc.scrollLeft};\n+ resetInput(this, true);\n+ updateScrollPos(this, doc.scrollLeft, doc.scrollTop);\n+ signalLater(this, \"swapDoc\", this, old);\n return old;\n }),\n \n@@ -2796,6 +3281,7 @@ window.CodeMirror = (function() {\n getScrollerElement: function(){return this.display.scroller;},\n getGutterElement: function(){return this.display.gutters;}\n };\n+ eventMixin(CodeMirror);\n \n \/\/ OPTION DEFAULTS\n \n@@ -2830,8 +3316,14 @@ window.CodeMirror = (function() {\n clearCaches(cm);\n regChange(cm);\n }, true);\n+ option(\"specialChars\", \/[\\t\\u0000-\\u0019\\u00ad\\u200b\\u2028\\u2029\\ufeff]\/g, function(cm, val) {\n+ cm.options.specialChars = new RegExp(val.source + (val.test(\"\\t\") ? \"\" : \"|\\t\"), \"g\");\n+ cm.refresh();\n+ }, true);\n+ option(\"specialCharPlaceholder\", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);\n option(\"electricChars\", true);\n option(\"rtlMoveVisually\", !windows);\n+ option(\"wholeLineUpdateBefore\", true);\n \n option(\"theme\", \"default\", function(cm) {\n themeChanged(cm);\n@@ -2852,6 +3344,7 @@ window.CodeMirror = (function() {\n cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + \"px\" : \"0\";\n cm.refresh();\n }, true);\n+ option(\"coverGutterNextToScrollbar\", false, updateScrollbars, true);\n option(\"lineNumbers\", false, function(cm) {\n setGuttersForLineNumbers(cm.options);\n guttersChanged(cm);\n@@ -2859,21 +3352,36 @@ window.CodeMirror = (function() {\n option(\"firstLineNumber\", 1, guttersChanged, true);\n option(\"lineNumberFormatter\", function(integer) {return integer;}, guttersChanged, true);\n option(\"showCursorWhenSelecting\", false, updateSelection, true);\n- \n+\n+ option(\"resetSelectionOnContextMenu\", true);\n+\n option(\"readOnly\", false, function(cm, val) {\n- if (val == \"nocursor\") {onBlur(cm); cm.display.input.blur();}\n- else if (!val) resetInput(cm, true);\n+ if (val == \"nocursor\") {\n+ onBlur(cm);\n+ cm.display.input.blur();\n+ cm.display.disabled = true;\n+ } else {\n+ cm.display.disabled = false;\n+ if (!val) resetInput(cm, true);\n+ }\n });\n option(\"dragDrop\", true);\n \n option(\"cursorBlinkRate\", 530);\n+ option(\"cursorScrollMargin\", 0);\n option(\"cursorHeight\", 1);\n option(\"workTime\", 100);\n option(\"workDelay\", 100);\n option(\"flattenSpans\", true);\n option(\"pollInterval\", 100);\n option(\"undoDepth\", 40, function(cm, val){cm.doc.history.undoDepth = val;});\n+ option(\"historyEventDelay\", 500);\n option(\"viewportMargin\", 10, function(cm){cm.refresh();}, true);\n+ option(\"maxHighlightLength\", 10000, function(cm){loadMode(cm); cm.refresh();}, true);\n+ option(\"crudeMeasuringFrom\", 10000);\n+ option(\"moveInputWithCursor\", true, function(cm, val) {\n+ if (!val) cm.display.inputDiv.style.top = cm.display.inputDiv.style.left = 0;\n+ });\n \n option(\"tabindex\", null, function(cm, val) {\n cm.display.input.tabIndex = val || \"\";\n@@ -2899,16 +3407,21 @@ window.CodeMirror = (function() {\n };\n \n CodeMirror.resolveMode = function(spec) {\n- if (typeof spec == \"string\" && mimeModes.hasOwnProperty(spec))\n+ if (typeof spec == \"string\" && mimeModes.hasOwnProperty(spec)) {\n spec = mimeModes[spec];\n- else if (typeof spec == \"string\" && \/^[\\w\\-]+\\\/[\\w\\-]+\\+xml$\/.test(spec))\n+ } else if (spec && typeof spec.name == \"string\" && mimeModes.hasOwnProperty(spec.name)) {\n+ var found = mimeModes[spec.name];\n+ spec = createObj(found, spec);\n+ spec.name = found.name;\n+ } else if (typeof spec == \"string\" && \/^[\\w\\-]+\\\/[\\w\\-]+\\+xml$\/.test(spec)) {\n return CodeMirror.resolveMode(\"application\/xml\");\n+ }\n if (typeof spec == \"string\") return {name: spec};\n else return spec || {name: \"null\"};\n };\n \n CodeMirror.getMode = function(options, spec) {\n- spec = CodeMirror.resolveMode(spec);\n+ var spec = CodeMirror.resolveMode(spec);\n var mfactory = modes[spec.name];\n if (!mfactory) return CodeMirror.getMode(options, \"text\/plain\");\n var modeObj = mfactory(options, spec);\n@@ -2921,6 +3434,10 @@ window.CodeMirror = (function() {\n }\n }\n modeObj.name = spec.name;\n+ if (spec.helperType) modeObj.helperType = spec.helperType;\n+ if (spec.modeProps) for (var prop in spec.modeProps)\n+ modeObj[prop] = spec.modeProps[prop];\n+\n return modeObj;\n };\n \n@@ -2940,12 +3457,28 @@ window.CodeMirror = (function() {\n CodeMirror.defineExtension = function(name, func) {\n CodeMirror.prototype[name] = func;\n };\n-\n+ CodeMirror.defineDocExtension = function(name, func) {\n+ Doc.prototype[name] = func;\n+ };\n CodeMirror.defineOption = option;\n \n var initHooks = [];\n CodeMirror.defineInitHook = function(f) {initHooks.push(f);};\n \n+ var helpers = CodeMirror.helpers = {};\n+ CodeMirror.registerHelper = function(type, name, value) {\n+ if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []};\n+ helpers[type][name] = value;\n+ };\n+ CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {\n+ CodeMirror.registerHelper(type, name, value);\n+ helpers[type]._global.push({pred: predicate, val: value});\n+ };\n+\n+ \/\/ UTILITIES\n+\n+ CodeMirror.isWordChar = isWordChar;\n+\n \/\/ MODE STATE HANDLING\n \n \/\/ Utility functions for working with state. Exported because modes\n@@ -2971,6 +3504,7 @@ window.CodeMirror = (function() {\n CodeMirror.innerMode = function(mode, state) {\n while (mode.innerMode) {\n var info = mode.innerMode(state);\n+ if (!info || info.mode == mode) break;\n state = info.state;\n mode = info.mode;\n }\n@@ -2991,6 +3525,10 @@ window.CodeMirror = (function() {\n var l = cm.getCursor().line;\n cm.replaceRange(\"\", Pos(l, 0), Pos(l), \"+delete\");\n },\n+ delLineLeft: function(cm) {\n+ var cur = cm.getCursor();\n+ cm.replaceRange(\"\", Pos(cur.line, 0), cur, \"+delete\");\n+ },\n undo: function(cm) {cm.undo();},\n redo: function(cm) {cm.redo();},\n goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},\n@@ -3011,6 +3549,14 @@ window.CodeMirror = (function() {\n goLineEnd: function(cm) {\n cm.extendSelection(lineEnd(cm, cm.getCursor().line));\n },\n+ goLineRight: function(cm) {\n+ var top = cm.charCoords(cm.getCursor(), \"div\").top + 5;\n+ cm.extendSelection(cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, \"div\"));\n+ },\n+ goLineLeft: function(cm) {\n+ var top = cm.charCoords(cm.getCursor(), \"div\").top + 5;\n+ cm.extendSelection(cm.coordsChar({left: 0, top: top}, \"div\"));\n+ },\n goLineUp: function(cm) {cm.moveV(-1, \"line\");},\n goLineDown: function(cm) {cm.moveV(1, \"line\");},\n goPageUp: function(cm) {cm.moveV(-1, \"page\");},\n@@ -3020,11 +3566,15 @@ window.CodeMirror = (function() {\n goColumnLeft: function(cm) {cm.moveH(-1, \"column\");},\n goColumnRight: function(cm) {cm.moveH(1, \"column\");},\n goWordLeft: function(cm) {cm.moveH(-1, \"word\");},\n+ goGroupRight: function(cm) {cm.moveH(1, \"group\");},\n+ goGroupLeft: function(cm) {cm.moveH(-1, \"group\");},\n goWordRight: function(cm) {cm.moveH(1, \"word\");},\n delCharBefore: function(cm) {cm.deleteH(-1, \"char\");},\n delCharAfter: function(cm) {cm.deleteH(1, \"char\");},\n delWordBefore: function(cm) {cm.deleteH(-1, \"word\");},\n delWordAfter: function(cm) {cm.deleteH(1, \"word\");},\n+ delGroupBefore: function(cm) {cm.deleteH(-1, \"group\");},\n+ delGroupAfter: function(cm) {cm.deleteH(1, \"group\");},\n indentAuto: function(cm) {cm.indentSelection(\"smart\");},\n indentMore: function(cm) {cm.indentSelection(\"add\");},\n indentLess: function(cm) {cm.indentSelection(\"subtract\");},\n@@ -3054,7 +3604,8 @@ window.CodeMirror = (function() {\n keyMap.basic = {\n \"Left\": \"goCharLeft\", \"Right\": \"goCharRight\", \"Up\": \"goLineUp\", \"Down\": \"goLineDown\",\n \"End\": \"goLineEnd\", \"Home\": \"goLineStartSmart\", \"PageUp\": \"goPageUp\", \"PageDown\": \"goPageDown\",\n- \"Delete\": \"delCharAfter\", \"Backspace\": \"delCharBefore\", \"Tab\": \"defaultTab\", \"Shift-Tab\": \"indentAuto\",\n+ \"Delete\": \"delCharAfter\", \"Backspace\": \"delCharBefore\", \"Shift-Backspace\": \"delCharBefore\",\n+ \"Tab\": \"defaultTab\", \"Shift-Tab\": \"indentAuto\",\n \"Enter\": \"newlineAndIndent\", \"Insert\": \"toggleOverwrite\"\n };\n \/\/ Note that the save and find-related commands aren't defined by\n@@ -3062,19 +3613,19 @@ window.CodeMirror = (function() {\n keyMap.pcDefault = {\n \"Ctrl-A\": \"selectAll\", \"Ctrl-D\": \"deleteLine\", \"Ctrl-Z\": \"undo\", \"Shift-Ctrl-Z\": \"redo\", \"Ctrl-Y\": \"redo\",\n \"Ctrl-Home\": \"goDocStart\", \"Alt-Up\": \"goDocStart\", \"Ctrl-End\": \"goDocEnd\", \"Ctrl-Down\": \"goDocEnd\",\n- \"Ctrl-Left\": \"goWordLeft\", \"Ctrl-Right\": \"goWordRight\", \"Alt-Left\": \"goLineStart\", \"Alt-Right\": \"goLineEnd\",\n- \"Ctrl-Backspace\": \"delWordBefore\", \"Ctrl-Delete\": \"delWordAfter\", \"Ctrl-S\": \"save\", \"Ctrl-F\": \"find\",\n+ \"Ctrl-Left\": \"goGroupLeft\", \"Ctrl-Right\": \"goGroupRight\", \"Alt-Left\": \"goLineStart\", \"Alt-Right\": \"goLineEnd\",\n+ \"Ctrl-Backspace\": \"delGroupBefore\", \"Ctrl-Delete\": \"delGroupAfter\", \"Ctrl-S\": \"save\", \"Ctrl-F\": \"find\",\n \"Ctrl-G\": \"findNext\", \"Shift-Ctrl-G\": \"findPrev\", \"Shift-Ctrl-F\": \"replace\", \"Shift-Ctrl-R\": \"replaceAll\",\n \"Ctrl-[\": \"indentLess\", \"Ctrl-]\": \"indentMore\",\n fallthrough: \"basic\"\n };\n keyMap.macDefault = {\n \"Cmd-A\": \"selectAll\", \"Cmd-D\": \"deleteLine\", \"Cmd-Z\": \"undo\", \"Shift-Cmd-Z\": \"redo\", \"Cmd-Y\": \"redo\",\n- \"Cmd-Up\": \"goDocStart\", \"Cmd-End\": \"goDocEnd\", \"Cmd-Down\": \"goDocEnd\", \"Alt-Left\": \"goWordLeft\",\n- \"Alt-Right\": \"goWordRight\", \"Cmd-Left\": \"goLineStart\", \"Cmd-Right\": \"goLineEnd\", \"Alt-Backspace\": \"delWordBefore\",\n- \"Ctrl-Alt-Backspace\": \"delWordAfter\", \"Alt-Delete\": \"delWordAfter\", \"Cmd-S\": \"save\", \"Cmd-F\": \"find\",\n+ \"Cmd-Up\": \"goDocStart\", \"Cmd-End\": \"goDocEnd\", \"Cmd-Down\": \"goDocEnd\", \"Alt-Left\": \"goGroupLeft\",\n+ \"Alt-Right\": \"goGroupRight\", \"Cmd-Left\": \"goLineStart\", \"Cmd-Right\": \"goLineEnd\", \"Alt-Backspace\": \"delGroupBefore\",\n+ \"Ctrl-Alt-Backspace\": \"delGroupAfter\", \"Alt-Delete\": \"delGroupAfter\", \"Cmd-S\": \"save\", \"Cmd-F\": \"find\",\n \"Cmd-G\": \"findNext\", \"Shift-Cmd-G\": \"findPrev\", \"Cmd-Alt-F\": \"replace\", \"Shift-Cmd-Alt-F\": \"replaceAll\",\n- \"Cmd-[\": \"indentLess\", \"Cmd-]\": \"indentMore\",\n+ \"Cmd-[\": \"indentLess\", \"Cmd-]\": \"indentMore\", \"Cmd-Backspace\": \"delLineLeft\",\n fallthrough: [\"basic\", \"emacsy\"]\n };\n keyMap[\"default\"] = mac ? keyMap.macDefault : keyMap.pcDefault;\n@@ -3097,11 +3648,7 @@ window.CodeMirror = (function() {\n map = getKeyMap(map);\n var found = map[name];\n if (found === false) return \"stop\";\n- if (found != null) {\n- try { var done = handle(found); }\n- catch (e) { if (e != Pass) throw e; }\n- if (done) return true;\n- }\n+ if (found != null && handle(found)) return true;\n if (map.nofallthrough) return \"stop\";\n \n var fallthrough = map.fallthrough;\n@@ -3117,20 +3664,21 @@ window.CodeMirror = (function() {\n \n for (var i = 0; i < maps.length; ++i) {\n var done = lookup(maps[i]);\n- if (done) return done;\n+ if (done) return done != \"stop\";\n }\n }\n function isModifierKey(event) {\n- var name = keyNames[e_prop(event, \"keyCode\")];\n+ var name = keyNames[event.keyCode];\n return name == \"Ctrl\" || name == \"Alt\" || name == \"Shift\" || name == \"Mod\";\n }\n function keyName(event, noShift) {\n- var name = keyNames[e_prop(event, \"keyCode\")];\n+ if (opera && event.keyCode == 34 && event[\"char\"]) return false;\n+ var name = keyNames[event.keyCode];\n if (name == null || event.altGraphKey) return false;\n- if (e_prop(event, \"altKey\")) name = \"Alt-\" + name;\n- if (e_prop(event, flipCtrlCmd ? \"metaKey\" : \"ctrlKey\")) name = \"Ctrl-\" + name;\n- if (e_prop(event, flipCtrlCmd ? \"ctrlKey\" : \"metaKey\")) name = \"Cmd-\" + name;\n- if (!noShift && e_prop(event, \"shiftKey\")) name = \"Shift-\" + name;\n+ if (event.altKey) name = \"Alt-\" + name;\n+ if (flipCtrlCmd ? event.metaKey : event.ctrlKey) name = \"Ctrl-\" + name;\n+ if (flipCtrlCmd ? event.ctrlKey : event.metaKey) name = \"Cmd-\" + name;\n+ if (!noShift && event.shiftKey) name = \"Shift-\" + name;\n return name;\n }\n CodeMirror.lookupKey = lookupKey;\n@@ -3144,6 +3692,8 @@ window.CodeMirror = (function() {\n options.value = textarea.value;\n if (!options.tabindex && textarea.tabindex)\n options.tabindex = textarea.tabindex;\n+ if (!options.placeholder && textarea.placeholder)\n+ options.placeholder = textarea.placeholder;\n \/\/ Set autofocus to true if this textarea is focused, or if it has\n \/\/ autofocus and no other element is focused.\n if (options.autofocus == null) {\n@@ -3156,17 +3706,19 @@ window.CodeMirror = (function() {\n \n function save() {textarea.value = cm.getValue();}\n if (textarea.form) {\n- \/\/ Deplorable hack to make the submit method do the right thing.\n on(textarea.form, \"submit\", save);\n- var form = textarea.form, realSubmit = form.submit;\n- try {\n- var wrappedSubmit = form.submit = function() {\n- save();\n- form.submit = realSubmit;\n- form.submit();\n- form.submit = wrappedSubmit;\n- };\n- } catch(e) {}\n+ \/\/ Deplorable hack to make the submit method do the right thing.\n+ if (!options.leaveSubmitMethodAlone) {\n+ var form = textarea.form, realSubmit = form.submit;\n+ try {\n+ var wrappedSubmit = form.submit = function() {\n+ save();\n+ form.submit = realSubmit;\n+ form.submit();\n+ form.submit = wrappedSubmit;\n+ };\n+ } catch(e) {}\n+ }\n }\n \n textarea.style.display = \"none\";\n@@ -3198,11 +3750,13 @@ window.CodeMirror = (function() {\n this.pos = this.start = 0;\n this.string = string;\n this.tabSize = tabSize || 8;\n+ this.lastColumnPos = this.lastColumnValue = 0;\n+ this.lineStart = 0;\n }\n \n StringStream.prototype = {\n eol: function() {return this.pos >= this.string.length;},\n- sol: function() {return this.pos == 0;},\n+ sol: function() {return this.pos == this.lineStart;},\n peek: function() {return this.string.charAt(this.pos) || undefined;},\n next: function() {\n if (this.pos < this.string.length)\n@@ -3230,12 +3784,22 @@ window.CodeMirror = (function() {\n if (found > -1) {this.pos = found; return true;}\n },\n backUp: function(n) {this.pos -= n;},\n- column: function() {return countColumn(this.string, this.start, this.tabSize);},\n- indentation: function() {return countColumn(this.string, null, this.tabSize);},\n+ column: function() {\n+ if (this.lastColumnPos < this.start) {\n+ this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);\n+ this.lastColumnPos = this.start;\n+ }\n+ return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);\n+ },\n+ indentation: function() {\n+ return countColumn(this.string, null, this.tabSize) -\n+ (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);\n+ },\n match: function(pattern, consume, caseInsensitive) {\n if (typeof pattern == \"string\") {\n var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};\n- if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) {\n+ var substr = this.string.substr(this.pos, pattern.length);\n+ if (cased(substr) == cased(pattern)) {\n if (consume !== false) this.pos += pattern.length;\n return true;\n }\n@@ -3246,7 +3810,12 @@ window.CodeMirror = (function() {\n return match;\n }\n },\n- current: function(){return this.string.slice(this.start, this.pos);}\n+ current: function(){return this.string.slice(this.start, this.pos);},\n+ hideFirstChars: function(n, inner) {\n+ this.lineStart += n;\n+ try { return inner(); }\n+ finally { this.lineStart -= n; }\n+ }\n };\n CodeMirror.StringStream = StringStream;\n \n@@ -3258,11 +3827,16 @@ window.CodeMirror = (function() {\n this.doc = doc;\n }\n CodeMirror.TextMarker = TextMarker;\n+ eventMixin(TextMarker);\n \n TextMarker.prototype.clear = function() {\n if (this.explicitlyCleared) return;\n var cm = this.doc.cm, withOp = cm && !cm.curOp;\n if (withOp) startOperation(cm);\n+ if (hasHandler(this, \"clear\")) {\n+ var found = this.find();\n+ if (found) signalLater(this, \"clear\", found.from, found.to);\n+ }\n var min = null, max = null;\n for (var i = 0; i < this.lines.length; ++i) {\n var line = this.lines[i];\n@@ -3286,15 +3860,14 @@ window.CodeMirror = (function() {\n if (min != null && cm) regChange(cm, min, max + 1);\n this.lines.length = 0;\n this.explicitlyCleared = true;\n- if (this.collapsed && this.doc.cantEdit) {\n+ if (this.atomic && this.doc.cantEdit) {\n this.doc.cantEdit = false;\n if (cm) reCheckSelection(cm);\n }\n if (withOp) endOperation(cm);\n- signalLater(this, \"clear\");\n };\n \n- TextMarker.prototype.find = function() {\n+ TextMarker.prototype.find = function(bothSides) {\n var from, to;\n for (var i = 0; i < this.lines.length; ++i) {\n var line = this.lines[i];\n@@ -3305,20 +3878,25 @@ window.CodeMirror = (function() {\n if (span.to != null) to = Pos(found, span.to);\n }\n }\n- if (this.type == \"bookmark\") return from;\n+ if (this.type == \"bookmark\" && !bothSides) return from;\n return from && {from: from, to: to};\n };\n \n- TextMarker.prototype.getOptions = function(copyWidget) {\n- var repl = this.replacedWith;\n- return {className: this.className,\n- inclusiveLeft: this.inclusiveLeft, inclusiveRight: this.inclusiveRight,\n- atomic: this.atomic,\n- collapsed: this.collapsed,\n- clearOnEnter: this.clearOnEnter,\n- replacedWith: copyWidget ? repl && repl.cloneNode(true) : repl,\n- readOnly: this.readOnly,\n- startStyle: this.startStyle, endStyle: this.endStyle};\n+ TextMarker.prototype.changed = function() {\n+ var pos = this.find(), cm = this.doc.cm;\n+ if (!pos || !cm) return;\n+ if (this.type != \"bookmark\") pos = pos.from;\n+ var line = getLine(this.doc, pos.line);\n+ clearCachedMeasurement(cm, line);\n+ if (pos.line >= cm.display.showingFrom && pos.line < cm.display.showingTo) {\n+ for (var node = cm.display.lineDiv.firstChild; node; node = node.nextSibling) if (node.lineObj == line) {\n+ if (node.offsetHeight != line.height) updateLineHeight(line, node.offsetHeight);\n+ break;\n+ }\n+ runInOp(cm, function() {\n+ cm.curOp.selectionChanged = cm.curOp.forceUpdate = cm.curOp.updateMaxLine = true;\n+ });\n+ }\n };\n \n TextMarker.prototype.attachLine = function(line) {\n@@ -3337,32 +3915,40 @@ window.CodeMirror = (function() {\n }\n };\n \n+ var nextMarkerId = 0;\n+\n function markText(doc, from, to, options, type) {\n if (options && options.shared) return markTextShared(doc, from, to, options, type);\n if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);\n \n var marker = new TextMarker(doc, type);\n- if (type == \"range\" && !posLess(from, to)) return marker;\n if (options) copyObj(options, marker);\n+ if (posLess(to, from) || posEq(from, to) && marker.clearWhenEmpty !== false)\n+ return marker;\n if (marker.replacedWith) {\n marker.collapsed = true;\n marker.replacedWith = elt(\"span\", [marker.replacedWith], \"CodeMirror-widget\");\n+ if (!options.handleMouseEvents) marker.replacedWith.ignoreEvents = true;\n }\n- if (marker.collapsed) sawCollapsedSpans = true;\n+ if (marker.collapsed) {\n+ if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||\n+ from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))\n+ throw new Error(\"Inserting collapsed marker partially overlapping an existing one\");\n+ sawCollapsedSpans = true;\n+ }\n+\n+ if (marker.addToHistory)\n+ addToHistory(doc, {from: from, to: to, origin: \"markText\"},\n+ {head: doc.sel.head, anchor: doc.sel.anchor}, NaN);\n \n- var curLine = from.line, size = 0, collapsedAtStart, collapsedAtEnd, cm = doc.cm, updateMaxLine;\n+ var curLine = from.line, cm = doc.cm, updateMaxLine;\n doc.iter(curLine, to.line + 1, function(line) {\n if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(doc, line) == cm.display.maxLine)\n updateMaxLine = true;\n var span = {from: null, to: null, marker: marker};\n- size += line.text.length;\n- if (curLine == from.line) {span.from = from.ch; size -= from.ch;}\n- if (curLine == to.line) {span.to = to.ch; size -= line.text.length - to.ch;}\n- if (marker.collapsed) {\n- if (curLine == to.line) collapsedAtEnd = collapsedSpanAt(line, to.ch);\n- if (curLine == from.line) collapsedAtStart = collapsedSpanAt(line, from.ch);\n- else updateLineHeight(line, 0);\n- }\n+ if (curLine == from.line) span.from = from.ch;\n+ if (curLine == to.line) span.to = to.ch;\n+ if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0);\n addMarkedSpan(line, span);\n ++curLine;\n });\n@@ -3370,20 +3956,20 @@ window.CodeMirror = (function() {\n if (lineIsHidden(doc, line)) updateLineHeight(line, 0);\n });\n \n+ if (marker.clearOnEnter) on(marker, \"beforeCursorEnter\", function() { marker.clear(); });\n+\n if (marker.readOnly) {\n sawReadOnlySpans = true;\n if (doc.history.done.length || doc.history.undone.length)\n doc.clearHistory();\n }\n if (marker.collapsed) {\n- if (collapsedAtStart != collapsedAtEnd)\n- throw new Error(\"Inserting collapsed marker overlapping an existing one\");\n- marker.size = size;\n+ marker.id = ++nextMarkerId;\n marker.atomic = true;\n }\n if (cm) {\n if (updateMaxLine) cm.curOp.updateMaxLine = true;\n- if (marker.className || marker.startStyle || marker.endStyle || marker.collapsed)\n+ if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.collapsed)\n regChange(cm, from.line, to.line + 1);\n if (marker.atomic) reCheckSelection(cm);\n }\n@@ -3401,6 +3987,7 @@ window.CodeMirror = (function() {\n }\n }\n CodeMirror.SharedTextMarker = SharedTextMarker;\n+ eventMixin(SharedTextMarker);\n \n SharedTextMarker.prototype.clear = function() {\n if (this.explicitlyCleared) return;\n@@ -3412,17 +3999,14 @@ window.CodeMirror = (function() {\n SharedTextMarker.prototype.find = function() {\n return this.primary.find();\n };\n- SharedTextMarker.prototype.getOptions = function(copyWidget) {\n- var inner = this.primary.getOptions(copyWidget);\n- inner.shared = true;\n- return inner;\n- };\n \n function markTextShared(doc, from, to, options, type) {\n options = copyObj(options);\n options.shared = false;\n var markers = [markText(doc, from, to, options, type)], primary = markers[0];\n+ var widget = options.replacedWith;\n linkedDocs(doc, function(doc) {\n+ if (widget) options.replacedWith = widget.cloneNode(true);\n markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));\n for (var i = 0; i < doc.linked.length; ++i)\n if (doc.linked[i].isParent) return;\n@@ -3453,7 +4037,7 @@ window.CodeMirror = (function() {\n if (old) for (var i = 0, nw; i < old.length; ++i) {\n var span = old[i], marker = span.marker;\n var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);\n- if (startsBefore || marker.type == \"bookmark\" && span.from == startCh && (!isInsert || !span.marker.insertLeft)) {\n+ if (startsBefore || span.from == startCh && marker.type == \"bookmark\" && (!isInsert || !span.marker.insertLeft)) {\n var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);\n (nw || (nw = [])).push({from: span.from,\n to: endsAfter ? null : span.to,\n@@ -3467,7 +4051,7 @@ window.CodeMirror = (function() {\n if (old) for (var i = 0, nw; i < old.length; ++i) {\n var span = old[i], marker = span.marker;\n var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);\n- if (endsAfter || marker.type == \"bookmark\" && span.from == endCh && (!isInsert || span.marker.insertLeft)) {\n+ if (endsAfter || span.from == endCh && marker.type == \"bookmark\" && (!isInsert || span.marker.insertLeft)) {\n var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);\n (nw || (nw = [])).push({from: startsBefore ? null : span.from - endCh,\n to: span.to == null ? null : span.to - endCh,\n@@ -3517,6 +4101,9 @@ window.CodeMirror = (function() {\n }\n }\n }\n+ \/\/ Make sure we didn't create any zero-length spans\n+ if (first) first = clearEmptySpans(first);\n+ if (last && last != first) last = clearEmptySpans(last);\n \n var newMarkers = [first];\n if (!sameLine) {\n@@ -3533,6 +4120,16 @@ window.CodeMirror = (function() {\n return newMarkers;\n }\n \n+ function clearEmptySpans(spans) {\n+ for (var i = 0; i < spans.length; ++i) {\n+ var span = spans[i];\n+ if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)\n+ spans.splice(i--, 1);\n+ }\n+ if (!spans.length) return null;\n+ return spans;\n+ }\n+\n function mergeOldSpans(doc, change) {\n var old = getOldSpans(doc, change);\n var stretched = stretchSpansOverChange(doc, change);\n@@ -3583,20 +4180,48 @@ window.CodeMirror = (function() {\n return parts;\n }\n \n- function collapsedSpanAt(line, ch) {\n+ function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; }\n+ function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; }\n+\n+ function compareCollapsedMarkers(a, b) {\n+ var lenDiff = a.lines.length - b.lines.length;\n+ if (lenDiff != 0) return lenDiff;\n+ var aPos = a.find(), bPos = b.find();\n+ var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);\n+ if (fromCmp) return -fromCmp;\n+ var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);\n+ if (toCmp) return toCmp;\n+ return b.id - a.id;\n+ }\n+\n+ function collapsedSpanAtSide(line, start) {\n var sps = sawCollapsedSpans && line.markedSpans, found;\n if (sps) for (var sp, i = 0; i < sps.length; ++i) {\n sp = sps[i];\n- if (!sp.marker.collapsed) continue;\n- if ((sp.from == null || sp.from < ch) &&\n- (sp.to == null || sp.to > ch) &&\n- (!found || found.width < sp.marker.width))\n+ if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&\n+ (!found || compareCollapsedMarkers(found, sp.marker) < 0))\n found = sp.marker;\n }\n return found;\n }\n- function collapsedSpanAtStart(line) { return collapsedSpanAt(line, -1); }\n- function collapsedSpanAtEnd(line) { return collapsedSpanAt(line, line.text.length + 1); }\n+ function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); }\n+ function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); }\n+\n+ function conflictingCollapsedRange(doc, lineNo, from, to, marker) {\n+ var line = getLine(doc, lineNo);\n+ var sps = sawCollapsedSpans && line.markedSpans;\n+ if (sps) for (var i = 0; i < sps.length; ++i) {\n+ var sp = sps[i];\n+ if (!sp.marker.collapsed) continue;\n+ var found = sp.marker.find(true);\n+ var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);\n+ var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);\n+ if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;\n+ if (fromCmp <= 0 && (cmp(found.to, from) || extraRight(sp.marker) - extraLeft(marker)) > 0 ||\n+ fromCmp >= 0 && (cmp(found.from, to) || extraLeft(sp.marker) - extraRight(marker)) < 0)\n+ return true;\n+ }\n+ }\n \n function visualLine(doc, line) {\n var merged;\n@@ -3611,6 +4236,7 @@ window.CodeMirror = (function() {\n sp = sps[i];\n if (!sp.marker.collapsed) continue;\n if (sp.from == null) return true;\n+ if (sp.marker.replacedWith) continue;\n if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))\n return true;\n }\n@@ -3624,7 +4250,8 @@ window.CodeMirror = (function() {\n return true;\n for (var sp, i = 0; i < line.markedSpans.length; ++i) {\n sp = line.markedSpans[i];\n- if (sp.marker.collapsed && sp.from == span.to &&\n+ if (sp.marker.collapsed && !sp.marker.replacedWith && sp.from == span.to &&\n+ (sp.to == null || sp.to != span.from) &&\n (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&\n lineIsHiddenInner(doc, line, sp)) return true;\n }\n@@ -3648,11 +4275,12 @@ window.CodeMirror = (function() {\n \/\/ LINE WIDGETS\n \n var LineWidget = CodeMirror.LineWidget = function(cm, node, options) {\n- for (var opt in options) if (options.hasOwnProperty(opt))\n+ if (options) for (var opt in options) if (options.hasOwnProperty(opt))\n this[opt] = options[opt];\n this.cm = cm;\n this.node = node;\n };\n+ eventMixin(LineWidget);\n function widgetOperation(f) {\n return function() {\n var withOp = !this.cm.curOp;\n@@ -3667,7 +4295,9 @@ window.CodeMirror = (function() {\n if (no == null || !ws) return;\n for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);\n if (!ws.length) this.line.widgets = null;\n+ var aboveVisible = heightAtLine(this.cm, this.line) < this.cm.doc.scrollTop;\n updateLineHeight(this.line, Math.max(0, this.line.height - widgetHeight(this)));\n+ if (aboveVisible) addToScrollPos(this.cm, 0, -this.height);\n regChange(this.cm, no, no + 1);\n });\n LineWidget.prototype.changed = widgetOperation(function() {\n@@ -3691,14 +4321,14 @@ window.CodeMirror = (function() {\n var widget = new LineWidget(cm, node, options);\n if (widget.noHScroll) cm.display.alignWidgets = true;\n changeLine(cm, handle, function(line) {\n- (line.widgets || (line.widgets = [])).push(widget);\n+ var widgets = line.widgets || (line.widgets = []);\n+ if (widget.insertAt == null) widgets.push(widget);\n+ else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);\n widget.line = line;\n if (!lineIsHidden(cm.doc, line) || widget.showIfHidden) {\n- var aboveVisible = heightAtLine(cm, line) < cm.display.scroller.scrollTop;\n+ var aboveVisible = heightAtLine(cm, line) < cm.doc.scrollTop;\n updateLineHeight(line, line.height + widgetHeight(widget));\n- if (aboveVisible)\n- cm.curOp.updateScrollPos = {scrollTop: cm.doc.scrollTop + widget.height,\n- scrollLeft: cm.doc.scrollLeft};\n+ if (aboveVisible) addToScrollPos(cm, 0, widget.height);\n }\n return true;\n });\n@@ -3709,12 +4339,13 @@ window.CodeMirror = (function() {\n \n \/\/ Line objects. These hold state related to a line, including\n \/\/ highlighting info (the styles array).\n- function makeLine(text, markedSpans, estimateHeight) {\n- var line = {text: text};\n- attachMarkedSpans(line, markedSpans);\n- line.height = estimateHeight ? estimateHeight(line) : 1;\n- return line;\n- }\n+ var Line = CodeMirror.Line = function(text, markedSpans, estimateHeight) {\n+ this.text = text;\n+ attachMarkedSpans(this, markedSpans);\n+ this.height = estimateHeight ? estimateHeight(this) : 1;\n+ };\n+ eventMixin(Line);\n+ Line.prototype.lineNo = function() { return lineNo(this); };\n \n function updateLine(line, text, markedSpans, estimateHeight) {\n line.text = text;\n@@ -3725,7 +4356,6 @@ window.CodeMirror = (function() {\n attachMarkedSpans(line, markedSpans);\n var estHeight = estimateHeight ? estimateHeight(line) : 1;\n if (estHeight != line.height) updateLineHeight(line, estHeight);\n- signalLater(line, \"change\");\n }\n \n function cleanUpLine(line) {\n@@ -3736,55 +4366,60 @@ window.CodeMirror = (function() {\n \/\/ Run the given mode's parser over a line, update the styles\n \/\/ array, which contains alternating fragments of text and CSS\n \/\/ classes.\n- function runMode(cm, text, mode, state, f) {\n- var flattenSpans = cm.options.flattenSpans;\n- var curText = \"\", curStyle = null;\n- var stream = new StringStream(text, cm.options.tabSize);\n+ function runMode(cm, text, mode, state, f, forceToEnd) {\n+ var flattenSpans = mode.flattenSpans;\n+ if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;\n+ var curStart = 0, curStyle = null;\n+ var stream = new StringStream(text, cm.options.tabSize), style;\n if (text == \"\" && mode.blankLine) mode.blankLine(state);\n while (!stream.eol()) {\n- var style = mode.token(stream, state);\n- if (stream.pos > 5000) {\n+ if (stream.pos > cm.options.maxHighlightLength) {\n flattenSpans = false;\n- \/\/ Webkit seems to refuse to render text nodes longer than 57444 characters\n- stream.pos = Math.min(text.length, stream.start + 50000);\n+ if (forceToEnd) processLine(cm, text, state, stream.pos);\n+ stream.pos = text.length;\n style = null;\n+ } else {\n+ style = mode.token(stream, state);\n }\n- var substr = stream.current();\n- stream.start = stream.pos;\n if (!flattenSpans || curStyle != style) {\n- if (curText) f(curText, curStyle);\n- curText = substr; curStyle = style;\n- } else curText = curText + substr;\n+ if (curStart < stream.start) f(stream.start, curStyle);\n+ curStart = stream.start; curStyle = style;\n+ }\n+ stream.start = stream.pos;\n+ }\n+ while (curStart < stream.pos) {\n+ \/\/ Webkit seems to refuse to render text nodes longer than 57444 characters\n+ var pos = Math.min(stream.pos, curStart + 50000);\n+ f(pos, curStyle);\n+ curStart = pos;\n }\n- if (curText) f(curText, curStyle);\n }\n \n- function highlightLine(cm, line, state) {\n+ function highlightLine(cm, line, state, forceToEnd) {\n \/\/ A styles array always starts with a number identifying the\n \/\/ mode\/overlays that it is based on (for easy invalidation).\n var st = [cm.state.modeGen];\n \/\/ Compute the base array of styles\n- runMode(cm, line.text, cm.doc.mode, state, function(txt, style) {st.push(txt, style);});\n+ runMode(cm, line.text, cm.doc.mode, state, function(end, style) {\n+ st.push(end, style);\n+ }, forceToEnd);\n \n \/\/ Run overlays, adjust style array.\n for (var o = 0; o < cm.state.overlays.length; ++o) {\n- var overlay = cm.state.overlays[o], i = 1;\n- runMode(cm, line.text, overlay.mode, true, function(txt, style) {\n- var start = i, len = txt.length;\n+ var overlay = cm.state.overlays[o], i = 1, at = 0;\n+ runMode(cm, line.text, overlay.mode, true, function(end, style) {\n+ var start = i;\n \/\/ Ensure there's a token end at the current position, and that i points at it\n- while (len) {\n- var cur = st[i], len_ = cur.length;\n- if (len_ <= len) {\n- len -= len_;\n- } else {\n- st.splice(i, 1, cur.slice(0, len), st[i+1], cur.slice(len));\n- len = 0;\n- }\n+ while (at < end) {\n+ var i_end = st[i];\n+ if (i_end > end)\n+ st.splice(i, 1, end, st[i+1], i_end);\n i += 2;\n+ at = Math.min(end, i_end);\n }\n if (!style) return;\n if (overlay.opaque) {\n- st.splice(start, i - start, txt, style);\n+ st.splice(start, i - start, end, style);\n i = start + 2;\n } else {\n for (; start < i; start += 2) {\n@@ -3806,70 +4441,102 @@ window.CodeMirror = (function() {\n \n \/\/ Lightweight form of highlight -- proceed over this line and\n \/\/ update state, but don't save a style array.\n- function processLine(cm, line, state) {\n+ function processLine(cm, text, state, startAt) {\n var mode = cm.doc.mode;\n- var stream = new StringStream(line.text, cm.options.tabSize);\n- if (line.text == \"\" && mode.blankLine) mode.blankLine(state);\n- while (!stream.eol() && stream.pos <= 5000) {\n+ var stream = new StringStream(text, cm.options.tabSize);\n+ stream.start = stream.pos = startAt || 0;\n+ if (text == \"\" && mode.blankLine) mode.blankLine(state);\n+ while (!stream.eol() && stream.pos <= cm.options.maxHighlightLength) {\n mode.token(stream, state);\n stream.start = stream.pos;\n }\n }\n \n var styleToClassCache = {};\n- function styleToClass(style) {\n+ function interpretTokenStyle(style, builder) {\n if (!style) return null;\n+ for (;;) {\n+ var lineClass = style.match(\/(?:^|\\s)line-(background-)?(\\S+)\/);\n+ if (!lineClass) break;\n+ style = style.slice(0, lineClass.index) + style.slice(lineClass.index + lineClass[0].length);\n+ var prop = lineClass[1] ? \"bgClass\" : \"textClass\";\n+ if (builder[prop] == null)\n+ builder[prop] = lineClass[2];\n+ else if (!(new RegExp(\"(?:^|\\s)\" + lineClass[2] + \"(?:$|\\s)\")).test(builder[prop]))\n+ builder[prop] += \" \" + lineClass[2];\n+ }\n return styleToClassCache[style] ||\n (styleToClassCache[style] = \"cm-\" + style.replace(\/ +\/g, \" cm-\"));\n }\n \n- function lineContent(cm, realLine, measure) {\n- var merged, line = realLine, lineBefore, sawBefore, simple = true;\n- while (merged = collapsedSpanAtStart(line)) {\n- simple = false;\n+ function buildLineContent(cm, realLine, measure, copyWidgets) {\n+ var merged, line = realLine, empty = true;\n+ while (merged = collapsedSpanAtStart(line))\n line = getLine(cm.doc, merged.find().from.line);\n- if (!lineBefore) lineBefore = line;\n- }\n \n- var builder = {pre: elt(\"pre\"), col: 0, pos: 0, display: !measure,\n- measure: null, addedOne: false, cm: cm};\n- if (line.textClass) builder.pre.className = line.textClass;\n+ var builder = {pre: elt(\"pre\"), col: 0, pos: 0,\n+ measure: null, measuredSomething: false, cm: cm,\n+ copyWidgets: copyWidgets};\n \n do {\n+ if (line.text) empty = false;\n builder.measure = line == realLine && measure;\n builder.pos = 0;\n builder.addToken = builder.measure ? buildTokenMeasure : buildToken;\n- if (measure && sawBefore && line != realLine && !builder.addedOne) {\n- measure[0] = builder.pre.appendChild(zeroWidthElement(cm.display.measure));\n- builder.addedOne = true;\n- }\n+ if ((ie || webkit) && cm.getOption(\"lineWrapping\"))\n+ builder.addToken = buildTokenSplitSpaces(builder.addToken);\n var next = insertLineContent(line, builder, getLineStyles(cm, line));\n- sawBefore = line == lineBefore;\n- if (next) {\n- line = getLine(cm.doc, next.to.line);\n- simple = false;\n+ if (measure && line == realLine && !builder.measuredSomething) {\n+ measure[0] = builder.pre.appendChild(zeroWidthElement(cm.display.measure));\n+ builder.measuredSomething = true;\n }\n+ if (next) line = getLine(cm.doc, next.to.line);\n } while (next);\n \n- if (measure && !builder.addedOne)\n- measure[0] = builder.pre.appendChild(simple ? elt(\"span\", \"\\u00a0\") : zeroWidthElement(cm.display.measure));\n+ if (measure && !builder.measuredSomething && !measure[0])\n+ measure[0] = builder.pre.appendChild(empty ? elt(\"span\", \"\\u00a0\") : zeroWidthElement(cm.display.measure));\n if (!builder.pre.firstChild && !lineIsHidden(cm.doc, realLine))\n builder.pre.appendChild(document.createTextNode(\"\\u00a0\"));\n \n- return builder.pre;\n+ var order;\n+ \/\/ Work around problem with the reported dimensions of single-char\n+ \/\/ direction spans on IE (issue #1129). See also the comment in\n+ \/\/ cursorCoords.\n+ if (measure && (ie || ie_gt10) && (order = getOrder(line))) {\n+ var l = order.length - 1;\n+ if (order[l].from == order[l].to) --l;\n+ var last = order[l], prev = order[l - 1];\n+ if (last.from + 1 == last.to && prev && last.level < prev.level) {\n+ var span = measure[builder.pos - 1];\n+ if (span) span.parentNode.insertBefore(span.measureRight = zeroWidthElement(cm.display.measure),\n+ span.nextSibling);\n+ }\n+ }\n+\n+ var textClass = builder.textClass ? builder.textClass + \" \" + (realLine.textClass || \"\") : realLine.textClass;\n+ if (textClass) builder.pre.className = textClass;\n+\n+ signal(cm, \"renderLine\", cm, realLine, builder.pre);\n+ return builder;\n+ }\n+\n+ function defaultSpecialCharPlaceholder(ch) {\n+ var token = elt(\"span\", \"\\u2022\", \"cm-invalidchar\");\n+ token.title = \"\\\\u\" + ch.charCodeAt(0).toString(16);\n+ return token;\n }\n \n- var tokenSpecialChars = \/[\\t\\u0000-\\u0019\\u200b\\u2028\\u2029\\uFEFF]\/g;\n- function buildToken(builder, text, style, startStyle, endStyle) {\n+ function buildToken(builder, text, style, startStyle, endStyle, title) {\n if (!text) return;\n- if (!tokenSpecialChars.test(text)) {\n+ var special = builder.cm.options.specialChars;\n+ if (!special.test(text)) {\n builder.col += text.length;\n var content = document.createTextNode(text);\n } else {\n var content = document.createDocumentFragment(), pos = 0;\n while (true) {\n- tokenSpecialChars.lastIndex = pos;\n- var m = tokenSpecialChars.exec(text);\n+ special.lastIndex = pos;\n+ var m = special.exec(text);\n var skipped = m ? m.index - pos : text.length - pos;\n if (skipped) {\n content.appendChild(document.createTextNode(text.slice(pos, pos + skipped)));\n@@ -3882,8 +4549,7 @@ window.CodeMirror = (function() {\n content.appendChild(elt(\"span\", spaceStr(tabWidth), \"cm-tab\"));\n builder.col += tabWidth;\n } else {\n- var token = elt(\"span\", \"\\u2022\", \"cm-invalidchar\");\n- token.title = \"\\\\u\" + m[0].charCodeAt(0).toString(16);\n+ var token = builder.cm.options.specialCharPlaceholder(m[0]);\n content.appendChild(token);\n builder.col += 1;\n }\n@@ -3893,31 +4559,69 @@ window.CodeMirror = (function() {\n var fullStyle = style || \"\";\n if (startStyle) fullStyle += startStyle;\n if (endStyle) fullStyle += endStyle;\n- return builder.pre.appendChild(elt(\"span\", [content], fullStyle));\n+ var token = elt(\"span\", [content], fullStyle);\n+ if (title) token.title = title;\n+ return builder.pre.appendChild(token);\n }\n builder.pre.appendChild(content);\n }\n \n function buildTokenMeasure(builder, text, style, startStyle, endStyle) {\n+ var wrapping = builder.cm.options.lineWrapping;\n for (var i = 0; i < text.length; ++i) {\n- if (i && i < text.length &&\n- builder.cm.options.lineWrapping &&\n- spanAffectsWrapping.test(text.slice(i - 1, i + 1)))\n+ var ch = text.charAt(i), start = i == 0;\n+ if (ch >= \"\\ud800\" && ch < \"\\udbff\" && i < text.length - 1) {\n+ ch = text.slice(i, i + 2);\n+ ++i;\n+ } else if (i && wrapping && spanAffectsWrapping(text, i)) {\n builder.pre.appendChild(elt(\"wbr\"));\n- builder.measure[builder.pos++] =\n- buildToken(builder, text.charAt(i), style,\n- i == 0 && startStyle, i == text.length - 1 && endStyle);\n- }\n- if (text.length) builder.addedOne = true;\n+ }\n+ var old = builder.measure[builder.pos];\n+ var span = builder.measure[builder.pos] =\n+ buildToken(builder, ch, style,\n+ start && startStyle, i == text.length - 1 && endStyle);\n+ if (old) span.leftSide = old.leftSide || old;\n+ \/\/ In IE single-space nodes wrap differently than spaces\n+ \/\/ embedded in larger text nodes, except when set to\n+ \/\/ white-space: normal (issue #1268).\n+ if (ie && wrapping && ch == \" \" && i && !\/\\s\/.test(text.charAt(i - 1)) &&\n+ i < text.length - 1 && !\/\\s\/.test(text.charAt(i + 1)))\n+ span.style.whiteSpace = \"normal\";\n+ builder.pos += ch.length;\n+ }\n+ if (text.length) builder.measuredSomething = true;\n+ }\n+\n+ function buildTokenSplitSpaces(inner) {\n+ function split(old) {\n+ var out = \" \";\n+ for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? \" \" : \"\\u00a0\";\n+ out += \" \";\n+ return out;\n+ }\n+ return function(builder, text, style, startStyle, endStyle, title) {\n+ return inner(builder, text.replace(\/ {3,}\/g, split), style, startStyle, endStyle, title);\n+ };\n }\n \n- function buildCollapsedSpan(builder, size, widget) {\n+ function buildCollapsedSpan(builder, size, marker, ignoreWidget) {\n+ var widget = !ignoreWidget && marker.replacedWith;\n if (widget) {\n- if (!builder.display) widget = widget.cloneNode(true);\n+ if (builder.copyWidgets) widget = widget.cloneNode(true);\n builder.pre.appendChild(widget);\n- if (builder.measure && size) {\n- builder.measure[builder.pos] = widget;\n- builder.addedOne = true;\n+ if (builder.measure) {\n+ if (size) {\n+ builder.measure[builder.pos] = widget;\n+ } else {\n+ var elt = zeroWidthElement(builder.cm.display.measure);\n+ if (marker.type == \"bookmark\" && !marker.insertLeft)\n+ builder.measure[builder.pos] = builder.pre.appendChild(elt);\n+ else if (builder.measure[builder.pos])\n+ return;\n+ else\n+ builder.measure[builder.pos] = builder.pre.insertBefore(elt, widget);\n+ }\n+ builder.measuredSomething = true;\n }\n }\n builder.pos += size;\n@@ -3926,21 +4630,20 @@ window.CodeMirror = (function() {\n \/\/ Outputs a number of spans to make up a line, taking highlighting\n \/\/ and marked text into account.\n function insertLineContent(line, builder, styles) {\n- var spans = line.markedSpans;\n+ var spans = line.markedSpans, allText = line.text, at = 0;\n if (!spans) {\n for (var i = 1; i < styles.length; i+=2)\n- builder.addToken(builder, styles[i], styleToClass(styles[i+1]));\n+ builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder));\n return;\n }\n \n- var allText = line.text, len = allText.length;\n- var pos = 0, i = 1, text = \"\", style;\n- var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, collapsed;\n+ var len = allText.length, pos = 0, i = 1, text = \"\", style;\n+ var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;\n for (;;) {\n if (nextChange == pos) { \/\/ Update current marker set\n- spanStyle = spanEndStyle = spanStartStyle = \"\";\n+ spanStyle = spanEndStyle = spanStartStyle = title = \"\";\n collapsed = null; nextChange = Infinity;\n- var foundBookmark = null;\n+ var foundBookmarks = [];\n for (var j = 0; j < spans.length; ++j) {\n var sp = spans[j], m = sp.marker;\n if (sp.from <= pos && (sp.to == null || sp.to > pos)) {\n@@ -3948,20 +4651,21 @@ window.CodeMirror = (function() {\n if (m.className) spanStyle += \" \" + m.className;\n if (m.startStyle && sp.from == pos) spanStartStyle += \" \" + m.startStyle;\n if (m.endStyle && sp.to == nextChange) spanEndStyle += \" \" + m.endStyle;\n- if (m.collapsed && (!collapsed || collapsed.marker.width < m.width))\n+ if (m.title && !title) title = m.title;\n+ if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))\n collapsed = sp;\n } else if (sp.from > pos && nextChange > sp.from) {\n nextChange = sp.from;\n }\n- if (m.type == \"bookmark\" && sp.from == pos && m.replacedWith)\n- foundBookmark = m.replacedWith;\n+ if (m.type == \"bookmark\" && sp.from == pos && m.replacedWith) foundBookmarks.push(m);\n }\n if (collapsed && (collapsed.from || 0) == pos) {\n buildCollapsedSpan(builder, (collapsed.to == null ? len : collapsed.to) - pos,\n- collapsed.from != null && collapsed.marker.replacedWith);\n+ collapsed.marker, collapsed.from == null);\n if (collapsed.to == null) return collapsed.marker.find();\n }\n- if (foundBookmark && !collapsed) buildCollapsedSpan(builder, 0, foundBookmark);\n+ if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)\n+ buildCollapsedSpan(builder, 0, foundBookmarks[j]);\n }\n if (pos >= len) break;\n \n@@ -3972,13 +4676,14 @@ window.CodeMirror = (function() {\n if (!collapsed) {\n var tokenText = end > upto ? text.slice(0, upto - pos) : text;\n builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,\n- spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : \"\");\n+ spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : \"\", title);\n }\n if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}\n pos = end;\n spanStartStyle = \"\";\n }\n- text = styles[i++]; style = styleToClass(styles[i++]);\n+ text = allText.slice(at, at = styles[i++]);\n+ style = interpretTokenStyle(styles[i++], builder);\n }\n }\n }\n@@ -3987,44 +4692,48 @@ window.CodeMirror = (function() {\n \n function updateDoc(doc, change, markedSpans, selAfter, estimateHeight) {\n function spansFor(n) {return markedSpans ? markedSpans[n] : null;}\n+ function update(line, text, spans) {\n+ updateLine(line, text, spans, estimateHeight);\n+ signalLater(line, \"change\", line, change);\n+ }\n \n var from = change.from, to = change.to, text = change.text;\n var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);\n var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;\n \n \/\/ First adjust the line structure\n- if (from.ch == 0 && to.ch == 0 && lastText == \"\") {\n+ if (from.ch == 0 && to.ch == 0 && lastText == \"\" &&\n+ (!doc.cm || doc.cm.options.wholeLineUpdateBefore)) {\n \/\/ This is a whole-line replace. Treated specially to make\n \/\/ sure line objects move the way they are supposed to.\n for (var i = 0, e = text.length - 1, added = []; i < e; ++i)\n- added.push(makeLine(text[i], spansFor(i), estimateHeight));\n- updateLine(lastLine, lastLine.text, lastSpans, estimateHeight);\n+ added.push(new Line(text[i], spansFor(i), estimateHeight));\n+ update(lastLine, lastLine.text, lastSpans);\n if (nlines) doc.remove(from.line, nlines);\n if (added.length) doc.insert(from.line, added);\n } else if (firstLine == lastLine) {\n if (text.length == 1) {\n- updateLine(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch),\n- lastSpans, estimateHeight);\n+ update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);\n } else {\n for (var added = [], i = 1, e = text.length - 1; i < e; ++i)\n- added.push(makeLine(text[i], spansFor(i), estimateHeight));\n- added.push(makeLine(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));\n- updateLine(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0), estimateHeight);\n+ added.push(new Line(text[i], spansFor(i), estimateHeight));\n+ added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));\n+ update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));\n doc.insert(from.line + 1, added);\n }\n } else if (text.length == 1) {\n- updateLine(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch),\n- spansFor(0), estimateHeight);\n+ update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));\n doc.remove(from.line + 1, nlines);\n } else {\n- updateLine(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0), estimateHeight);\n- updateLine(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans, estimateHeight);\n+ update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));\n+ update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);\n for (var i = 1, e = text.length - 1, added = []; i < e; ++i)\n- added.push(makeLine(text[i], spansFor(i), estimateHeight));\n+ added.push(new Line(text[i], spansFor(i), estimateHeight));\n if (nlines > 1) doc.remove(from.line + 1, nlines - 1);\n doc.insert(from.line + 1, added);\n }\n \n+ signalLater(doc, \"change\", doc, change);\n setSelection(doc, selAfter.anchor, selAfter.head, null, true);\n }\n \n@@ -4161,12 +4870,13 @@ window.CodeMirror = (function() {\n var Doc = CodeMirror.Doc = function(text, mode, firstLine) {\n if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);\n if (firstLine == null) firstLine = 0;\n- \n- BranchChunk.call(this, [new LeafChunk([makeLine(\"\", null)])]);\n+\n+ BranchChunk.call(this, [new LeafChunk([new Line(\"\", null)])]);\n this.first = firstLine;\n this.scrollTop = this.scrollLeft = 0;\n this.cantEdit = false;\n this.history = makeHistory();\n+ this.cleanGeneration = 1;\n this.frontier = firstLine;\n var start = Pos(firstLine, 0);\n this.sel = {from: start, to: start, head: start, anchor: start, shift: false, extend: false, goalColumn: null};\n@@ -4178,8 +4888,9 @@ window.CodeMirror = (function() {\n };\n \n Doc.prototype = createObj(BranchChunk.prototype, {\n+ constructor: Doc,\n iter: function(from, to, op) {\n- if (op) this.iterN(from - this.first, to - (from - this.first), op);\n+ if (op) this.iterN(from - this.first, to - from, op);\n else this.iterN(this.first, this.first + this.size, from);\n },\n \n@@ -4218,13 +4929,18 @@ window.CodeMirror = (function() {\n replaceRange(this, text, Pos(line, 0), clipPos(this, Pos(line)));\n },\n removeLine: function(line) {\n- if (isLine(this, line))\n- replaceRange(this, \"\", Pos(line, 0), clipPos(this, Pos(line + 1, 0)));\n+ if (line) replaceRange(this, \"\", clipPos(this, Pos(line - 1)), clipPos(this, Pos(line)));\n+ else replaceRange(this, \"\", Pos(0, 0), clipPos(this, Pos(1, 0)));\n },\n \n getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},\n getLineNumber: function(line) {return lineNo(line);},\n \n+ getLineHandleVisualStart: function(line) {\n+ if (typeof line == \"number\") line = getLine(this, line);\n+ return visualLine(this, line);\n+ },\n+\n lineCount: function() {return this.size;},\n firstLine: function() {return this.first;},\n lastLine: function() {return this.first + this.size - 1;},\n@@ -4246,11 +4962,11 @@ window.CodeMirror = (function() {\n if (extend) extendSelection(this, pos);\n else setSelection(this, pos, pos);\n }),\n- setSelection: docOperation(function(anchor, head) {\n- setSelection(this, clipPos(this, anchor), clipPos(this, head || anchor));\n+ setSelection: docOperation(function(anchor, head, bias) {\n+ setSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), bias);\n }),\n- extendSelection: docOperation(function(from, to) {\n- extendSelection(this, clipPos(this, from), to && clipPos(this, to));\n+ extendSelection: docOperation(function(from, to, bias) {\n+ extendSelection(this, clipPos(this, from), to && clipPos(this, to), bias);\n }),\n \n getSelection: function(lineSep) {return this.getRange(this.sel.from, this.sel.to, lineSep);},\n@@ -4266,20 +4982,26 @@ window.CodeMirror = (function() {\n var hist = this.history;\n return {undo: hist.done.length, redo: hist.undone.length};\n },\n- clearHistory: function() {this.history = makeHistory();},\n+ clearHistory: function() {this.history = makeHistory(this.history.maxGeneration);},\n \n markClean: function() {\n- this.history.dirtyCounter = 0;\n- this.history.lastOp = this.history.lastOrigin = null;\n+ this.cleanGeneration = this.changeGeneration(true);\n+ },\n+ changeGeneration: function(forceSplit) {\n+ if (forceSplit)\n+ this.history.lastOp = this.history.lastOrigin = null;\n+ return this.history.generation;\n+ },\n+ isClean: function (gen) {\n+ return this.history.generation == (gen || this.cleanGeneration);\n },\n- isClean: function () {return this.history.dirtyCounter == 0;},\n- \n+\n getHistory: function() {\n return {done: copyHistoryArray(this.history.done),\n undone: copyHistoryArray(this.history.undone)};\n },\n setHistory: function(histData) {\n- var hist = this.history = makeHistory();\n+ var hist = this.history = makeHistory(this.history.maxGeneration);\n hist.done = histData.done.slice(0);\n hist.undone = histData.undone.slice(0);\n },\n@@ -4289,7 +5011,8 @@ window.CodeMirror = (function() {\n },\n setBookmark: function(pos, options) {\n var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),\n- insertLeft: options && options.insertLeft};\n+ insertLeft: options && options.insertLeft,\n+ clearWhenEmpty: false};\n pos = clipPos(this, pos);\n return markText(this, pos, pos, realOpts, \"bookmark\");\n },\n@@ -4304,6 +5027,15 @@ window.CodeMirror = (function() {\n }\n return markers;\n },\n+ getAllMarks: function() {\n+ var markers = [];\n+ this.iter(function(line) {\n+ var sps = line.markedSpans;\n+ if (sps) for (var i = 0; i < sps.length; ++i)\n+ if (sps[i].from != null) markers.push(sps[i].marker);\n+ });\n+ return markers;\n+ },\n \n posFromIndex: function(off) {\n var ch, lineNo = this.first;\n@@ -4375,14 +5107,13 @@ window.CodeMirror = (function() {\n Doc.prototype.eachLine = Doc.prototype.iter;\n \n \/\/ The Doc methods that should be available on CodeMirror instances\n- var toDelegate = (\"setValue getValue getSelection replaceSelection eachLine undo redo historySize clearHistory markClean isClean \" +\n- \"getHistory setHistory markText setBookmark findMarksAt lineCount firstLine lastLine clipPos getCursor \" +\n- \"somethingSelected setCursor setSelection extendSelection setExtending getLine setLine removeLine getMode \" +\n- \"replaceRange getRange getLineHandle getLineNumber posFromIndex indexFromPos linkedDoc unlinkDoc iterLinkedDocs\").split(\" \");\n- for (var i = 0; i < toDelegate.length; ++i) (function(method) {\n- var target = Doc.prototype[method];\n- CodeMirror.prototype[method] = function() {return target.apply(this.doc, arguments);};\n- })(toDelegate[i]);\n+ var dontDelegate = \"iter insert remove copy getEditor\".split(\" \");\n+ for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)\n+ CodeMirror.prototype[prop] = (function(method) {\n+ return function() {return method.apply(this.doc, arguments);};\n+ })(Doc.prototype[prop]);\n+\n+ eventMixin(Doc);\n \n function linkedDocs(doc, f, sharedHistOnly) {\n function propagate(doc, skip, sharedHist) {\n@@ -4503,7 +5234,7 @@ window.CodeMirror = (function() {\n \n \/\/ HISTORY\n \n- function makeHistory() {\n+ function makeHistory(startGen) {\n return {\n \/\/ Arrays of history events. Doing something adds an event to\n \/\/ done and clears undo. Undoing moves events from done to\n@@ -4513,7 +5244,7 @@ window.CodeMirror = (function() {\n \/\/ event\n lastTime: 0, lastOp: null, lastOrigin: null,\n \/\/ Used by the isClean() method\n- dirtyCounter: 0\n+ generation: startGen || 1, maxGeneration: startGen || 1\n };\n }\n \n@@ -4527,7 +5258,8 @@ window.CodeMirror = (function() {\n }\n \n function historyChangeFromChange(doc, change) {\n- var histChange = {from: change.from, to: changeEnd(change), text: getBetween(doc, change.from, change.to)};\n+ var from = { line: change.from.line, ch: change.from.ch };\n+ var histChange = {from: from, to: changeEnd(change), text: getBetween(doc, change.from, change.to)};\n attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);\n linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);\n return histChange;\n@@ -4541,7 +5273,8 @@ window.CodeMirror = (function() {\n if (cur &&\n (hist.lastOp == opId ||\n hist.lastOrigin == change.origin && change.origin &&\n- ((change.origin.charAt(0) == \"+\" && hist.lastTime > time - 600) || change.origin.charAt(0) == \"*\"))) {\n+ ((change.origin.charAt(0) == \"+\" && doc.cm && hist.lastTime > time - doc.cm.options.historyEventDelay) ||\n+ change.origin.charAt(0) == \"*\"))) {\n \/\/ Merge this change into the last event\n var last = lst(cur.changes);\n if (posEq(change.from, change.to) && posEq(change.from, last.to)) {\n@@ -4556,18 +5289,14 @@ window.CodeMirror = (function() {\n } else {\n \/\/ Can not be merged, start a new event.\n cur = {changes: [historyChangeFromChange(doc, change)],\n+ generation: hist.generation,\n anchorBefore: doc.sel.anchor, headBefore: doc.sel.head,\n anchorAfter: selAfter.anchor, headAfter: selAfter.head};\n hist.done.push(cur);\n while (hist.done.length > hist.undoDepth)\n hist.done.shift();\n- if (hist.dirtyCounter < 0)\n- \/\/ The user has made a change after undoing past the last clean state. \n- \/\/ We can never get back to a clean state now until markClean() is called.\n- hist.dirtyCounter = NaN;\n- else\n- hist.dirtyCounter++;\n }\n+ hist.generation = ++hist.maxGeneration;\n hist.lastTime = time;\n hist.lastOp = opId;\n hist.lastOrigin = change.origin;\n@@ -4681,6 +5410,9 @@ window.CodeMirror = (function() {\n if (e.stopPropagation) e.stopPropagation();\n else e.cancelBubble = true;\n }\n+ function e_defaultPrevented(e) {\n+ return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false;\n+ }\n function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}\n CodeMirror.e_stop = e_stop;\n CodeMirror.e_preventDefault = e_preventDefault;\n@@ -4698,13 +5430,6 @@ window.CodeMirror = (function() {\n return b;\n }\n \n- \/\/ Allow 3rd-party code to override event properties by adding an override\n- \/\/ object to an event object.\n- function e_prop(e, prop) {\n- var overridden = e.override && e.override.hasOwnProperty(prop);\n- return overridden ? e.override[prop] : e[prop];\n- }\n-\n \/\/ EVENT HANDLING\n \n function on(emitter, type, f) {\n@@ -4744,10 +5469,26 @@ window.CodeMirror = (function() {\n var arr = emitter._handlers && emitter._handlers[type];\n if (!arr) return;\n var args = Array.prototype.slice.call(arguments, 2);\n+ if (!delayedCallbacks) {\n+ ++delayedCallbackDepth;\n+ delayedCallbacks = [];\n+ setTimeout(fireDelayed, 0);\n+ }\n function bnd(f) {return function(){f.apply(null, args);};};\n for (var i = 0; i < arr.length; ++i)\n- if (delayedCallbacks) delayedCallbacks.push(bnd(arr[i]));\n- else arr[i].apply(null, args);\n+ delayedCallbacks.push(bnd(arr[i]));\n+ }\n+\n+ function signalDOMEvent(cm, e, override) {\n+ signal(cm, override || e.type, cm, e);\n+ return e_defaultPrevented(e) || e.codemirrorIgnore;\n+ }\n+\n+ function fireDelayed() {\n+ --delayedCallbackDepth;\n+ var delayed = delayedCallbacks;\n+ delayedCallbacks = null;\n+ for (var i = 0; i < delayed.length; ++i) delayed[i]();\n }\n \n function hasHandler(emitter, type) {\n@@ -4757,6 +5498,11 @@ window.CodeMirror = (function() {\n \n CodeMirror.on = on; CodeMirror.off = off; CodeMirror.signal = signal;\n \n+ function eventMixin(ctor) {\n+ ctor.prototype.on = function(type, f) {on(this, type, f);};\n+ ctor.prototype.off = function(type, f) {off(this, type, f);};\n+ }\n+\n \/\/ MISC UTILITIES\n \n \/\/ Number of pixels added to scroller and sizer to hide scrollbar\n@@ -4771,12 +5517,12 @@ window.CodeMirror = (function() {\n \n \/\/ Counts the column offset in a string, taking tabs into account.\n \/\/ Used mostly to find indentation.\n- function countColumn(string, end, tabSize) {\n+ function countColumn(string, end, tabSize, startIndex, startValue) {\n if (end == null) {\n end = string.search(\/[^\\s\\u00a0]\/);\n if (end == -1) end = string.length;\n }\n- for (var i = 0, n = 0; i < end; ++i) {\n+ for (var i = startIndex || 0, n = startValue || 0; i < end; ++i) {\n if (string.charAt(i) == \"\\t\") n += tabSize - (n % tabSize);\n else ++n;\n }\n@@ -4797,7 +5543,11 @@ window.CodeMirror = (function() {\n if (ios) { \/\/ Mobile Safari apparently has a bug where select() is broken.\n node.selectionStart = 0;\n node.selectionEnd = node.value.length;\n- } else node.select();\n+ } else {\n+ \/\/ Suppress mysterious IE10 errors\n+ try { node.select(); }\n+ catch(_e) {}\n+ }\n }\n \n function indexOf(collection, elt) {\n@@ -4808,9 +5558,9 @@ window.CodeMirror = (function() {\n }\n \n function createObj(base, props) {\n- if (!base) return;\n- createObj.prototype = base;\n- var inst = new createObj();\n+ function Obj() {}\n+ Obj.prototype = base;\n+ var inst = new Obj();\n if (props) copyObj(props, inst);\n return inst;\n }\n@@ -4831,7 +5581,7 @@ window.CodeMirror = (function() {\n return function(){return f.apply(null, args);};\n }\n \n- var nonASCIISingleCaseWordChar = \/[\\u3040-\\u309f\\u30a0-\\u30ff\\u3400-\\u4db5\\u4e00-\\u9fcc]\/;\n+ var nonASCIISingleCaseWordChar = \/[\\u3040-\\u309f\\u30a0-\\u30ff\\u3400-\\u4db5\\u4e00-\\u9fcc\\uac00-\\ud7af]\/;\n function isWordChar(ch) {\n return \/\\w\/.test(ch) || ch > \"\\x80\" &&\n (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));\n@@ -4842,7 +5592,7 @@ window.CodeMirror = (function() {\n return true;\n }\n \n- var isExtendingChar = \/[\\u0300-\\u036F\\u0483-\\u0487\\u0488-\\u0489\\u0591-\\u05BD\\u05BF\\u05C1-\\u05C2\\u05C4-\\u05C5\\u05C7\\u0610-\\u061A\\u064B-\\u065F\\u0670\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7-\\u06E8\\u06EA-\\u06ED\\uA66F\\uA670-\\uA672\\uA674-\\uA67D\\uA69F]\/;\n+ var isExtendingChar = \/[\\u0300-\\u036F\\u0483-\\u0487\\u0488-\\u0489\\u0591-\\u05BD\\u05BF\\u05C1-\\u05C2\\u05C4-\\u05C5\\u05C7\\u0610-\\u061A\\u064B-\\u065F\\u0670\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7-\\u06E8\\u06EA-\\u06ED\\uA66F\\u1DC0-\\u1DFF\\u20D0-\\u20FF\\uA670-\\uA672\\uA674-\\uA67D\\uA69F\\udc00-\\udfff\\uFE20-\\uFE2F]\/;\n \n \/\/ DOM UTILITIES\n \n@@ -4856,9 +5606,8 @@ window.CodeMirror = (function() {\n }\n \n function removeChildren(e) {\n- \/\/ IE will break all parent-child relations in subnodes when setting innerHTML\n- if (!ie) e.innerHTML = \"\";\n- else while (e.firstChild) e.removeChild(e.firstChild);\n+ for (var count = e.childNodes.length; count > 0; --count)\n+ e.removeChild(e.firstChild);\n return e;\n }\n \n@@ -4873,6 +5622,11 @@ window.CodeMirror = (function() {\n } else e.textContent = str;\n }\n \n+ function getRect(node) {\n+ return node.getBoundingClientRect();\n+ }\n+ CodeMirror.replaceGetRect = function(f) { getRect = f; };\n+\n \/\/ FEATURE DETECTION\n \n \/\/ Detect drag-and-drop\n@@ -4888,13 +5642,31 @@ window.CodeMirror = (function() {\n \/\/ word wrapping between certain characters *only* if a new inline\n \/\/ element is started between them. This makes it hard to reliably\n \/\/ measure the position of things, since that requires inserting an\n- \/\/ extra span. This terribly fragile set of regexps matches the\n+ \/\/ extra span. This terribly fragile set of tests matches the\n \/\/ character combinations that suffer from this phenomenon on the\n \/\/ various browsers.\n- var spanAffectsWrapping = \/^$\/; \/\/ Won't match any two-character string\n- if (gecko) spanAffectsWrapping = \/$'\/;\n- else if (safari) spanAffectsWrapping = \/\\-[^ \\-?]|\\?[^ !'\\\"\\),.\\-\\\/:;\\?\\]\\}]\/;\n- else if (chrome) spanAffectsWrapping = \/\\-[^ \\-\\.?]|\\?[^ \\-\\.?\\]\\}:;!'\\\"\\),\\\/]|[\\.!\\\"#&%\\)*+,:;=>\\]|\\}~][\$\\{\\[<]|\\$'\/;\n+ function spanAffectsWrapping() { return false; }\n+ if (gecko) \/\/ Only for \"$'\"\n+ spanAffectsWrapping = function(str, i) {\n+ return str.charCodeAt(i - 1) == 36 && str.charCodeAt(i) == 39;\n+ };\n+ else if (safari && !\/Version\\\/([6-9]|\\d\\d)\\b\/.test(navigator.userAgent))\n+ spanAffectsWrapping = function(str, i) {\n+ return \/\\-[^ \\-?]|\\?[^ !\\'\\\"\$,.\\-\\\/:;\\?\\]\\}]\/.test(str.slice(i - 1, i + 1));\n+ };\n+ else if (webkit && \/Chrome\\\/(?:29|[3-9]\\d|\\d\\d\\d)\\.\/.test(navigator.userAgent))\n+ spanAffectsWrapping = function(str, i) {\n+ var code = str.charCodeAt(i - 1);\n+ return code >= 8208 && code <= 8212;\n+ };\n+ else if (webkit)\n+ spanAffectsWrapping = function(str, i) {\n+ if (i > 1 && str.charCodeAt(i - 1) == 45) {\n+ if (\/\\w\/.test(str.charAt(i - 2)) && \/[^\\-?\\.]\/.test(str.charAt(i))) return true;\n+ if (i > 2 && \/[\\d\\.,]\/.test(str.charAt(i - 2)) && \/[\\d\\.,]\/.test(str.charAt(i))) return false;\n+ }\n+ return \/[~!#%&*)=+}\\]\\\\|\\\"\\.>,:;][({[<]|-[^\\-?\\.\\u2010-\\u201f\\u2026]|\\?[\\w~`@#$%\\^&*(_=+{[|><]|\\u2026[\\w~`@#$%\\^&*(_=+{[><]\/.test(str.slice(i - 1, i + 1));\n+ };\n \n var knownScrollbarWidth;\n function scrollbarWidth(measure) {\n@@ -4979,11 +5751,15 @@ window.CodeMirror = (function() {\n \n function iterateBidiSections(order, from, to, f) {\n if (!order) return f(from, to, \"ltr\");\n+ var found = false;\n for (var i = 0; i < order.length; ++i) {\n var part = order[i];\n- if (part.from < to && part.to > from || from == to && part.to == from)\n+ if (part.from < to && part.to > from || from == to && part.to == from) {\n f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? \"rtl\" : \"ltr\");\n+ found = true;\n+ }\n }\n+ if (!found) f(from, to, \"ltr\");\n }\n \n function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }\n@@ -5013,6 +5789,40 @@ window.CodeMirror = (function() {\n return Pos(lineN, ch);\n }\n \n+ function compareBidiLevel(order, a, b) {\n+ var linedir = order[0].level;\n+ if (a == linedir) return true;\n+ if (b == linedir) return false;\n+ return a < b;\n+ }\n+ var bidiOther;\n+ function getBidiPartAt(order, pos) {\n+ bidiOther = null;\n+ for (var i = 0, found; i < order.length; ++i) {\n+ var cur = order[i];\n+ if (cur.from < pos && cur.to > pos) return i;\n+ if ((cur.from == pos || cur.to == pos)) {\n+ if (found == null) {\n+ found = i;\n+ } else if (compareBidiLevel(order, cur.level, order[found].level)) {\n+ if (cur.from != cur.to) bidiOther = found;\n+ return i;\n+ } else {\n+ if (cur.from != cur.to) bidiOther = i;\n+ return found;\n+ }\n+ }\n+ }\n+ return found;\n+ }\n+\n+ function moveInLine(line, pos, dir, byUnit) {\n+ if (!byUnit) return pos + dir;\n+ do pos += dir;\n+ while (pos > 0 && isExtendingChar.test(line.text.charAt(pos)));\n+ return pos;\n+ }\n+\n \/\/ This is somewhat involved. It is needed in order to move\n \/\/ 'visually' through bi-directional text -- i.e., pressing left\n \/\/ should make the cursor go left, even when in RTL text. The\n@@ -5022,37 +5832,24 @@ window.CodeMirror = (function() {\n function moveVisually(line, start, dir, byUnit) {\n var bidi = getOrder(line);\n if (!bidi) return moveLogically(line, start, dir, byUnit);\n- var moveOneUnit = byUnit ? function(pos, dir) {\n- do pos += dir;\n- while (pos > 0 && isExtendingChar.test(line.text.charAt(pos)));\n- return pos;\n- } : function(pos, dir) { return pos + dir; };\n- var linedir = bidi[0].level;\n- for (var i = 0; i < bidi.length; ++i) {\n- var part = bidi[i], sticky = part.level % 2 == linedir;\n- if ((part.from < start && part.to > start) ||\n- (sticky && (part.from == start || part.to == start))) break;\n- }\n- var target = moveOneUnit(start, part.level % 2 ? -dir : dir);\n-\n- while (target != null) {\n- if (part.level % 2 == linedir) {\n- if (target < part.from || target > part.to) {\n- part = bidi[i += dir];\n- target = part && (dir > 0 == part.level % 2 ? moveOneUnit(part.to, -1) : moveOneUnit(part.from, 1));\n- } else break;\n+ var pos = getBidiPartAt(bidi, start), part = bidi[pos];\n+ var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit);\n+\n+ for (;;) {\n+ if (target > part.from && target < part.to) return target;\n+ if (target == part.from || target == part.to) {\n+ if (getBidiPartAt(bidi, target) == pos) return target;\n+ part = bidi[pos += dir];\n+ return (dir > 0) == part.level % 2 ? part.to : part.from;\n } else {\n- if (target == bidiLeft(part)) {\n- part = bidi[--i];\n- target = part && bidiRight(part);\n- } else if (target == bidiRight(part)) {\n- part = bidi[++i];\n- target = part && bidiLeft(part);\n- } else break;\n+ part = bidi[pos += dir];\n+ if (!part) return null;\n+ if ((dir > 0) == part.level % 2)\n+ target = moveInLine(line, part.to, -1, byUnit);\n+ else\n+ target = moveInLine(line, part.from, 1, byUnit);\n }\n }\n-\n- return target < 0 || target > line.text.length ? null : target;\n }\n \n function moveLogically(line, start, dir, byUnit) {\n@@ -5149,7 +5946,7 @@ window.CodeMirror = (function() {\n if (type == \",\") types[i] = \"N\";\n else if (type == \"%\") {\n for (var end = i + 1; end < len && types[end] == \"%\"; ++end) {}\n- var replace = (i && types[i-1] == \"!\") || (end < len - 1 && types[end] == \"1\") ? \"1\" : \"N\";\n+ var replace = (i && types[i-1] == \"!\") || (end < len && types[end] == \"1\") ? \"1\" : \"N\";\n for (var j = i; j < end; ++j) types[j] = replace;\n i = end - 1;\n }\n@@ -5174,7 +5971,7 @@ window.CodeMirror = (function() {\n if (isNeutral.test(types[i])) {\n for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}\n var before = (i ? types[i-1] : outerType) == \"L\";\n- var after = (end < len - 1 ? types[end] : outerType) == \"L\";\n+ var after = (end < len ? types[end] : outerType) == \"L\";\n var replace = before || after ? \"L\" : \"R\";\n for (var j = i; j < end; ++j) types[j] = replace;\n i = end - 1;\n@@ -5224,7 +6021,7 @@ window.CodeMirror = (function() {\n \n \/\/ THE END\n \n- CodeMirror.version = \"3.02 +\";\n+ CodeMirror.version = \"3.20.1\";\n \n return CodeMirror;\n })();\n"}

dillon1000/react

Files changed