From c17d0230e0312c2189d1d0a4d805aaca70a4e2ed Mon Sep 17 00:00:00 2001 From: Adrian Heine Date: Tue, 27 Sep 2016 10:04:56 +0200 Subject: [PATCH] Replace var with let --- src/display/Display.js | 2 +- src/display/gutters.js | 11 +- src/display/highlight_worker.js | 20 +-- src/display/line_numbers.js | 18 +-- src/display/operations.js | 38 ++--- src/display/scroll_events.js | 30 ++-- src/display/scrollbars.js | 36 ++--- src/display/scrolling.js | 44 ++--- src/display/selection.js | 50 +++--- src/display/update_display.js | 48 +++--- src/display/update_lines.js | 26 +-- src/display/view_tracking.js | 31 ++-- src/edit/CodeMirror.js | 34 ++-- src/edit/commands.js | 66 ++++---- src/edit/deleteNearSelection.js | 10 +- src/edit/drop_events.js | 31 ++-- src/edit/fromTextArea.js | 11 +- src/edit/global_events.js | 12 +- src/edit/key_events.js | 30 ++-- src/edit/main.js | 4 +- src/edit/methods.js | 160 +++++++++--------- src/edit/mouse_events.js | 78 ++++----- src/edit/options.js | 26 +-- src/input/ContentEditableInput.js | 160 +++++++++--------- src/input/TextareaInput.js | 63 ++++---- src/input/indent.js | 18 +-- src/input/input.js | 47 +++--- src/input/keymap.js | 37 ++--- src/input/keynames.js | 8 +- src/line/highlight.js | 64 ++++---- src/line/line_data.js | 94 +++++------ src/line/pos.js | 7 +- src/line/saw_special_spans.js | 2 +- src/line/spans.js | 149 ++++++++--------- src/line/utils_line.js | 34 ++-- src/measurement/position_measurement.js | 205 ++++++++++++------------ src/measurement/update_line.js | 44 ++--- src/measurement/widgets.js | 6 +- src/model/Doc.js | 113 ++++++------- src/model/change_measurement.js | 22 +-- src/model/changes.js | 63 ++++---- src/model/chunk.js | 53 +++--- src/model/document_data.js | 21 +-- src/model/history.js | 56 ++++--- src/model/line_widget.js | 20 +-- src/model/mark_text.js | 80 +++++---- src/model/selection.js | 23 +-- src/model/selection_updates.js | 45 +++--- src/modes.js | 29 ++-- src/util/StringStream.js | 21 +-- src/util/bidi.js | 99 ++++++------ src/util/browser.js | 44 ++--- src/util/dom.js | 32 ++-- src/util/event.js | 28 ++-- src/util/feature_detection.js | 45 +++--- src/util/misc.js | 38 ++--- src/util/operation_group.js | 22 +-- 57 files changed, 1327 insertions(+), 1281 deletions(-) diff --git a/src/display/Display.js b/src/display/Display.js index fa4c52fef7..c1879e7b16 100644 --- a/src/display/Display.js +++ b/src/display/Display.js @@ -7,7 +7,7 @@ import { scrollerGap } from "../util/misc" // display-related state. export function Display(place, doc, input) { - var d = this + let d = this this.input = input // Covers bottom-right square when both scrollbars are present. diff --git a/src/display/gutters.js b/src/display/gutters.js index 3fe9a13447..7ccf119e80 100644 --- a/src/display/gutters.js +++ b/src/display/gutters.js @@ -6,11 +6,12 @@ import { updateGutterSpace } from "./update_display" // Rebuild the gutter elements, ensure the margin to the left of the // code matches their width. export function updateGutters(cm) { - var gutters = cm.display.gutters, specs = cm.options.gutters + let gutters = cm.display.gutters, specs = cm.options.gutters removeChildren(gutters) - for (var i = 0; i < specs.length; ++i) { - var gutterClass = specs[i] - var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass)) + let i = 0 + for (; i < specs.length; ++i) { + let gutterClass = specs[i] + let gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass)) if (gutterClass == "CodeMirror-linenumbers") { cm.display.lineGutter = gElt gElt.style.width = (cm.display.lineNumWidth || 1) + "px" @@ -23,7 +24,7 @@ export function updateGutters(cm) { // Make sure the gutters options contains the element // "CodeMirror-linenumbers" when the lineNumbers option is true. export function setGuttersForLineNumbers(options) { - var found = indexOf(options.gutters, "CodeMirror-linenumbers") + let found = indexOf(options.gutters, "CodeMirror-linenumbers") if (found == -1 && options.lineNumbers) { options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]) } else if (found > -1 && !options.lineNumbers) { diff --git a/src/display/highlight_worker.js b/src/display/highlight_worker.js index b8a48c0e91..5d535abe70 100644 --- a/src/display/highlight_worker.js +++ b/src/display/highlight_worker.js @@ -13,24 +13,24 @@ export function startWorker(cm, time) { } function highlightWorker(cm) { - var doc = cm.doc + let doc = cm.doc if (doc.frontier < doc.first) doc.frontier = doc.first if (doc.frontier >= cm.display.viewTo) return - var end = +new Date + cm.options.workTime - var state = copyState(doc.mode, getStateBefore(cm, doc.frontier)) - var changedLines = [] + let end = +new Date + cm.options.workTime + let state = copyState(doc.mode, getStateBefore(cm, doc.frontier)) + let changedLines = [] doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) { if (doc.frontier >= cm.display.viewFrom) { // Visible - var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength - var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true) + let oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength + let highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true) line.styles = highlighted.styles - var oldCls = line.styleClasses, newCls = highlighted.classes + let oldCls = line.styleClasses, newCls = highlighted.classes if (newCls) line.styleClasses = newCls else if (oldCls) line.styleClasses = null - var ischange = !oldStyles || oldStyles.length != line.styles.length || + let ischange = !oldStyles || oldStyles.length != line.styles.length || oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass) - for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i] + for (let i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i] if (ischange) changedLines.push(doc.frontier) line.stateAfter = tooLong ? state : copyState(doc.mode, state) } else { @@ -45,7 +45,7 @@ function highlightWorker(cm) { } }) if (changedLines.length) runInOp(cm, function() { - for (var i = 0; i < changedLines.length; i++) + for (let i = 0; i < changedLines.length; i++) regLineChange(cm, changedLines[i], "text") }) } diff --git a/src/display/line_numbers.js b/src/display/line_numbers.js index 22bd32ffc4..c48f2204d5 100644 --- a/src/display/line_numbers.js +++ b/src/display/line_numbers.js @@ -7,19 +7,19 @@ import { updateGutterSpace } from "./update_display" // Re-align line numbers and gutter marks to compensate for // horizontal scrolling. export function alignHorizontally(cm) { - var display = cm.display, view = display.view + let display = cm.display, view = display.view if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return - var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft - var gutterW = display.gutters.offsetWidth, left = comp + "px" - for (var i = 0; i < view.length; i++) if (!view[i].hidden) { + let comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft + let gutterW = display.gutters.offsetWidth, left = comp + "px" + for (let i = 0; i < view.length; i++) if (!view[i].hidden) { if (cm.options.fixedGutter) { if (view[i].gutter) view[i].gutter.style.left = left if (view[i].gutterBackground) view[i].gutterBackground.style.left = left } - var align = view[i].alignable - if (align) for (var j = 0; j < align.length; j++) + let align = view[i].alignable + if (align) for (let j = 0; j < align.length; j++) align[j].style.left = left } if (cm.options.fixedGutter) @@ -31,11 +31,11 @@ export function alignHorizontally(cm) { // is needed. export function maybeUpdateLineNumberWidth(cm) { if (!cm.options.lineNumbers) return false - var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display + let doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display if (last.length != display.lineNumChars) { - var test = display.measure.appendChild(elt("div", [elt("div", last)], + let test = display.measure.appendChild(elt("div", [elt("div", last)], "CodeMirror-linenumber CodeMirror-gutter-elt")) - var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW + let innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW display.lineGutter.style.width = "" display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1 display.lineNumWidth = display.lineNumInnerWidth + padding diff --git a/src/display/operations.js b/src/display/operations.js index 2873e0e91d..cc6eef7bde 100644 --- a/src/display/operations.js +++ b/src/display/operations.js @@ -20,7 +20,7 @@ import { updateHeightsInViewport } from "./update_lines" // error-prone). Instead, display updates are batched and then all // combined and executed at once. -var nextOpId = 0 +let nextOpId = 0 // Start a new operation. export function startOperation(cm) { cm.curOp = { @@ -45,9 +45,9 @@ export function startOperation(cm) { // Finish an operation, updating the display and signalling delayed events export function endOperation(cm) { - var op = cm.curOp + let op = cm.curOp finishOperation(op, function(group) { - for (var i = 0; i < group.ops.length; i++) + for (let i = 0; i < group.ops.length; i++) group.ops[i].cm.curOp = null endOperations(group) }) @@ -56,21 +56,21 @@ export function endOperation(cm) { // The DOM updates done when an operation finishes are batched so // that the minimum number of relayouts are required. function endOperations(group) { - var ops = group.ops - for (var i = 0; i < ops.length; i++) // Read DOM + let ops = group.ops + for (let i = 0; i < ops.length; i++) // Read DOM endOperation_R1(ops[i]) - for (var i = 0; i < ops.length; i++) // Write DOM (maybe) + for (let i = 0; i < ops.length; i++) // Write DOM (maybe) endOperation_W1(ops[i]) - for (var i = 0; i < ops.length; i++) // Read DOM + for (let i = 0; i < ops.length; i++) // Read DOM endOperation_R2(ops[i]) - for (var i = 0; i < ops.length; i++) // Write DOM (maybe) + for (let i = 0; i < ops.length; i++) // Write DOM (maybe) endOperation_W2(ops[i]) - for (var i = 0; i < ops.length; i++) // Read DOM + for (let i = 0; i < ops.length; i++) // Read DOM endOperation_finish(ops[i]) } function endOperation_R1(op) { - var cm = op.cm, display = cm.display + let cm = op.cm, display = cm.display maybeClipScrollbars(cm) if (op.updateMaxLine) findMaxLine(cm) @@ -87,7 +87,7 @@ function endOperation_W1(op) { } function endOperation_R2(op) { - var cm = op.cm, display = cm.display + let cm = op.cm, display = cm.display if (op.updatedDisplay) updateHeightsInViewport(cm) op.barMeasure = measureForScrollbars(cm) @@ -108,7 +108,7 @@ function endOperation_R2(op) { } function endOperation_W2(op) { - var cm = op.cm + let cm = op.cm if (op.adjustWidthTo != null) { cm.display.sizer.style.minWidth = op.adjustWidthTo + "px" @@ -117,7 +117,7 @@ function endOperation_W2(op) { cm.display.maxLineChanged = false } - var takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus()) + let takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus()) if (op.preparedSelection) cm.display.input.showSelection(op.preparedSelection, takeFocus) if (op.updatedDisplay || op.startHeight != cm.doc.height) @@ -133,7 +133,7 @@ function endOperation_W2(op) { } function endOperation_finish(op) { - var cm = op.cm, display = cm.display, doc = cm.doc + let cm = op.cm, display = cm.display, doc = cm.doc if (op.updatedDisplay) postUpdateDisplay(cm, op.update) @@ -155,17 +155,17 @@ function endOperation_finish(op) { } // If we need to scroll a specific position into view, do so. if (op.scrollToPos) { - var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from), + let coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from), clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin) if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords) } // Fire events for markers that are hidden/unidden by editing or // undoing - var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers - if (hidden) for (var i = 0; i < hidden.length; ++i) + let hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers + if (hidden) for (let i = 0; i < hidden.length; ++i) if (!hidden[i].lines.length) signal(hidden[i], "hide") - if (unhidden) for (var i = 0; i < unhidden.length; ++i) + if (unhidden) for (let i = 0; i < unhidden.length; ++i) if (unhidden[i].lines.length) signal(unhidden[i], "unhide") if (display.wrapper.offsetHeight) @@ -206,7 +206,7 @@ export function methodOp(f) { } export function docMethodOp(f) { return function() { - var cm = this.cm + let cm = this.cm if (!cm || cm.curOp) return f.apply(this, arguments) startOperation(cm) try { return f.apply(this, arguments) } diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js index 99afe7ee50..3c166b4855 100644 --- a/src/display/scroll_events.js +++ b/src/display/scroll_events.js @@ -38,7 +38,7 @@ export function setScrollLeft(cm, val, isScroller) { // is that it gives us a chance to update the display before the // actual scrolling happens, reducing flickering. -var wheelSamples = 0, wheelPixelsPerUnit = null +let wheelSamples = 0, wheelPixelsPerUnit = null // Fill in a browser-detected starting value on browsers where we // know one. These don't have to be accurate -- the result of them // being wrong would just be a slight flicker on the first wheel @@ -48,27 +48,27 @@ else if (gecko) wheelPixelsPerUnit = 15 else if (chrome) wheelPixelsPerUnit = -.7 else if (safari) wheelPixelsPerUnit = -1/3 -var wheelEventDelta = function(e) { - var dx = e.wheelDeltaX, dy = e.wheelDeltaY +let wheelEventDelta = function(e) { + let dx = e.wheelDeltaX, dy = e.wheelDeltaY if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail else if (dy == null) dy = e.wheelDelta return {x: dx, y: dy} } export function wheelEventPixels(e) { - var delta = wheelEventDelta(e) + let delta = wheelEventDelta(e) delta.x *= wheelPixelsPerUnit delta.y *= wheelPixelsPerUnit return delta } export function onScrollWheel(cm, e) { - var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y + let delta = wheelEventDelta(e), dx = delta.x, dy = delta.y - var display = cm.display, scroll = display.scroller + let display = cm.display, scroll = display.scroller // Quit if there's nothing to scroll here - var canScrollX = scroll.scrollWidth > scroll.clientWidth - var canScrollY = scroll.scrollHeight > scroll.clientHeight + let canScrollX = scroll.scrollWidth > scroll.clientWidth + let canScrollY = scroll.scrollHeight > scroll.clientHeight if (!(dx && canScrollX || dy && canScrollY)) return // Webkit browsers on OS X abort momentum scrolls when the target @@ -76,8 +76,8 @@ export function onScrollWheel(cm, e) { // This hack (see related code in patchDisplay) makes sure the // element is kept around. if (dy && mac && webkit) { - outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) { - for (var i = 0; i < view.length; i++) { + outer: for (let cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) { + for (let i = 0; i < view.length; i++) { if (view[i].node == cur) { cm.display.currentWheelTarget = cur break outer @@ -109,8 +109,8 @@ export function onScrollWheel(cm, e) { // 'Project' the visible viewport to cover the area that is being // scrolled into view (if we know enough to estimate it). if (dy && wheelPixelsPerUnit != null) { - var pixels = dy * wheelPixelsPerUnit - var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight + let pixels = dy * wheelPixelsPerUnit + let top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight if (pixels < 0) top = Math.max(0, top + pixels - 50) else bot = Math.min(cm.doc.height, bot + pixels + 50) updateDisplaySimple(cm, {top: top, bottom: bot}) @@ -122,9 +122,9 @@ export function onScrollWheel(cm, e) { display.wheelDX = dx; display.wheelDY = dy setTimeout(function() { if (display.wheelStartX == null) return - var movedX = scroll.scrollLeft - display.wheelStartX - var movedY = scroll.scrollTop - display.wheelStartY - var sample = (movedY && display.wheelDY && movedY / display.wheelDY) || + let movedX = scroll.scrollLeft - display.wheelStartX + let movedY = scroll.scrollTop - display.wheelStartY + let sample = (movedY && display.wheelDY && movedY / display.wheelDY) || (movedX && display.wheelDX && movedX / display.wheelDX) display.wheelStartX = display.wheelStartY = null if (!sample) return diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js index 075ae41a1b..a07f2a165d 100644 --- a/src/display/scrollbars.js +++ b/src/display/scrollbars.js @@ -12,8 +12,8 @@ import { setScrollLeft, setScrollTop } from "./scroll_events" // Prepare DOM reads needed to update the scrollbars. Done in one // shot to minimize update/measure roundtrips. export function measureForScrollbars(cm) { - var d = cm.display, gutterW = d.gutters.offsetWidth - var docH = Math.round(cm.doc.height + paddingVert(cm.display)) + let d = cm.display, gutterW = d.gutters.offsetWidth + let docH = Math.round(cm.doc.height + paddingVert(cm.display)) return { clientHeight: d.scroller.clientHeight, viewHeight: d.wrapper.clientHeight, @@ -29,8 +29,8 @@ export function measureForScrollbars(cm) { function NativeScrollbars(place, scroll, cm) { this.cm = cm - var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar") - var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar") + let vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar") + let horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar") place(vert); place(horiz) on(vert, "scroll", function() { @@ -47,14 +47,14 @@ function NativeScrollbars(place, scroll, cm) { NativeScrollbars.prototype = copyObj({ update: function(measure) { - var needsH = measure.scrollWidth > measure.clientWidth + 1 - var needsV = measure.scrollHeight > measure.clientHeight + 1 - var sWidth = measure.nativeBarWidth + let needsH = measure.scrollWidth > measure.clientWidth + 1 + let needsV = measure.scrollHeight > measure.clientHeight + 1 + let sWidth = measure.nativeBarWidth if (needsV) { this.vert.style.display = "block" this.vert.style.bottom = needsH ? sWidth + "px" : "0" - var totalHeight = measure.viewHeight - (needsH ? sWidth : 0) + let totalHeight = measure.viewHeight - (needsH ? sWidth : 0) // A bug in IE8 can cause this value to be negative, so guard it. this.vert.firstChild.style.height = Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px" @@ -67,7 +67,7 @@ NativeScrollbars.prototype = copyObj({ this.horiz.style.display = "block" this.horiz.style.right = needsV ? sWidth + "px" : "0" this.horiz.style.left = measure.barLeft + "px" - var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0) + let totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0) this.horiz.firstChild.style.width = (measure.scrollWidth - measure.clientWidth + totalWidth) + "px" } else { @@ -91,7 +91,7 @@ NativeScrollbars.prototype = copyObj({ if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert) }, zeroWidthHack: function() { - var w = mac && !mac_geMountainLion ? "12px" : "18px" + let w = mac && !mac_geMountainLion ? "12px" : "18px" this.horiz.style.height = this.vert.style.width = w this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none" this.disableHoriz = new Delayed @@ -106,15 +106,15 @@ NativeScrollbars.prototype = copyObj({ // itself (when the bar is still visible) or its filler child // (when the bar is hidden). If it is still visible, we keep // it enabled, if it's hidden, we disable pointer events. - var box = bar.getBoundingClientRect() - var elt = document.elementFromPoint(box.left + 1, box.bottom - 1) + let box = bar.getBoundingClientRect() + let elt = document.elementFromPoint(box.left + 1, box.bottom - 1) if (elt != bar) bar.style.pointerEvents = "none" else delay.set(1000, maybeDisable) } delay.set(1000, maybeDisable) }, clear: function() { - var parent = this.horiz.parentNode + let parent = this.horiz.parentNode parent.removeChild(this.horiz) parent.removeChild(this.vert) } @@ -131,9 +131,9 @@ NullScrollbars.prototype = copyObj({ export function updateScrollbars(cm, measure) { if (!measure) measure = measureForScrollbars(cm) - var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight + let startWidth = cm.display.barWidth, startHeight = cm.display.barHeight updateScrollbarsInner(cm, measure) - for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) { + for (let i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) { if (startWidth != cm.display.barWidth && cm.options.lineWrapping) updateHeightsInViewport(cm) updateScrollbarsInner(cm, measureForScrollbars(cm)) @@ -144,8 +144,8 @@ export function updateScrollbars(cm, measure) { // Re-synchronize the fake scrollbars with the actual size of the // content. function updateScrollbarsInner(cm, measure) { - var d = cm.display - var sizes = d.scrollbars.update(measure) + let d = cm.display + let sizes = d.scrollbars.update(measure) d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px" d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px" @@ -163,7 +163,7 @@ function updateScrollbarsInner(cm, measure) { } else d.gutterFiller.style.display = "" } -export var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars} +export let scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars} export function initScrollbars(cm) { if (cm.display.scrollbars) { diff --git a/src/display/scrolling.js b/src/display/scrolling.js index ec8cec6715..d58efe0bcf 100644 --- a/src/display/scrolling.js +++ b/src/display/scrolling.js @@ -13,11 +13,11 @@ import { setScrollLeft, setScrollTop } from "./scroll_events" export function maybeScrollWindow(cm, coords) { if (signalDOMEvent(cm, "scrollCursorIntoView")) return - var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null + let display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null if (coords.top + box.top < 0) doScroll = true else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false if (doScroll != null && !phantom) { - var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " + + let scrollNode = elt("div", "\u200b", null, "position: absolute; top: " + (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " + (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " + coords.left + "px; width: 2px;") @@ -32,14 +32,16 @@ export function maybeScrollWindow(cm, coords) { // measured, the position of something may 'drift' during drawing). export function scrollPosIntoView(cm, pos, end, margin) { if (margin == null) margin = 0 - for (var limit = 0; limit < 5; limit++) { - var changed = false, coords = cursorCoords(cm, pos) - var endCoords = !end || end == pos ? coords : cursorCoords(cm, end) - var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left), + let coords + for (let limit = 0; limit < 5; limit++) { + let changed = false + coords = cursorCoords(cm, pos) + let endCoords = !end || end == pos ? coords : cursorCoords(cm, end) + let scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left), Math.min(coords.top, endCoords.top) - margin, Math.max(coords.left, endCoords.left), Math.max(coords.bottom, endCoords.bottom) + margin) - var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft + let startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft if (scrollPos.scrollTop != null) { setScrollTop(cm, scrollPos.scrollTop) if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true @@ -55,7 +57,7 @@ export function scrollPosIntoView(cm, pos, end, margin) { // Scroll a given set of coordinates into view (immediately). export function scrollIntoView(cm, x1, y1, x2, y2) { - var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2) + let scrollPos = calculateScrollPos(cm, x1, y1, x2, y2) if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop) if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft) } @@ -65,23 +67,23 @@ export function scrollIntoView(cm, x1, y1, x2, y2) { // scrollLeft properties. When these are undefined, the // vertical/horizontal position does not need to be adjusted. export function calculateScrollPos(cm, x1, y1, x2, y2) { - var display = cm.display, snapMargin = textHeight(cm.display) + let display = cm.display, snapMargin = textHeight(cm.display) if (y1 < 0) y1 = 0 - var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop - var screen = displayHeight(cm), result = {} + let screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop + let screen = displayHeight(cm), result = {} if (y2 - y1 > screen) y2 = y1 + screen - var docBottom = cm.doc.height + paddingVert(display) - var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin + let docBottom = cm.doc.height + paddingVert(display) + let atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin if (y1 < screentop) { result.scrollTop = atTop ? 0 : y1 } else if (y2 > screentop + screen) { - var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen) + let newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen) if (newTop != screentop) result.scrollTop = newTop } - var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft - var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0) - var tooWide = x2 - x1 > screenw + let screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft + let screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0) + let tooWide = x2 - x1 > screenw if (tooWide) x2 = x1 + screenw if (x1 < 10) result.scrollLeft = 0 @@ -106,7 +108,7 @@ export function addToScrollPos(cm, left, top) { // shown. export function ensureCursorVisible(cm) { resolveScrollToPos(cm) - var cur = cm.getCursor(), from = cur, to = cur + let cur = cm.getCursor(), from = cur, to = cur if (!cm.options.lineWrapping) { from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur to = Pos(cur.line, cur.ch + 1) @@ -119,11 +121,11 @@ export function ensureCursorVisible(cm) { // 'simulates' scrolling that position into view in a cheap way, so // that the effect of intermediate scroll commands is not ignored. export function resolveScrollToPos(cm) { - var range = cm.curOp.scrollToPos + let range = cm.curOp.scrollToPos if (range) { cm.curOp.scrollToPos = null - var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to) - var sPos = calculateScrollPos(cm, Math.min(from.left, to.left), + let from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to) + let sPos = calculateScrollPos(cm, Math.min(from.left, to.left), Math.min(from.top, to.top) - range.margin, Math.max(from.right, to.right), Math.max(from.bottom, to.bottom) + range.margin) diff --git a/src/display/selection.js b/src/display/selection.js index 3ee79fa358..9fa8f6eefb 100644 --- a/src/display/selection.js +++ b/src/display/selection.js @@ -10,15 +10,15 @@ export function updateSelection(cm) { } export function prepareSelection(cm, primary) { - var doc = cm.doc, result = {} - var curFragment = result.cursors = document.createDocumentFragment() - var selFragment = result.selection = document.createDocumentFragment() + let doc = cm.doc, result = {} + let curFragment = result.cursors = document.createDocumentFragment() + let selFragment = result.selection = document.createDocumentFragment() - for (var i = 0; i < doc.sel.ranges.length; i++) { + for (let i = 0; i < doc.sel.ranges.length; i++) { if (primary === false && i == doc.sel.primIndex) continue - var range = doc.sel.ranges[i] + let range = doc.sel.ranges[i] if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue - var collapsed = range.empty() + let collapsed = range.empty() if (collapsed || cm.options.showCursorWhenSelecting) drawSelectionCursor(cm, range.head, curFragment) if (!collapsed) @@ -29,16 +29,16 @@ export function prepareSelection(cm, primary) { // Draws a cursor for the given range export function drawSelectionCursor(cm, head, output) { - var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine) + let pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine) - var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor")) + let cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor")) cursor.style.left = pos.left + "px" cursor.style.top = pos.top + "px" cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px" if (pos.other) { // Secondary cursor, shown when on a 'jump' in bi-directional text - var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor")) + let otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor")) otherCursor.style.display = "" otherCursor.style.left = pos.other.left + "px" otherCursor.style.top = pos.other.top + "px" @@ -48,10 +48,10 @@ export function drawSelectionCursor(cm, head, output) { // Draws the given range as a highlighted selection function drawSelectionRange(cm, range, output) { - var display = cm.display, doc = cm.doc - var fragment = document.createDocumentFragment() - var padding = paddingH(cm.display), leftSide = padding.left - var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right + let display = cm.display, doc = cm.doc + let fragment = document.createDocumentFragment() + let padding = paddingH(cm.display), leftSide = padding.left + let rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right function add(left, top, width, bottom) { if (top < 0) top = 0 @@ -63,21 +63,21 @@ function drawSelectionRange(cm, range, output) { } function drawForLine(line, fromArg, toArg) { - var lineObj = getLine(doc, line) - var lineLen = lineObj.text.length - var start, end + let lineObj = getLine(doc, line) + let lineLen = lineObj.text.length + let start, end function coords(ch, bias) { return charCoords(cm, Pos(line, ch), "div", lineObj, bias) } iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) { - var leftPos = coords(from, "left"), rightPos, left, right + let leftPos = coords(from, "left"), rightPos, left, right if (from == to) { rightPos = leftPos left = right = leftPos.left } else { rightPos = coords(to - 1, "right") - if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp } + if (dir == "rtl") { let tmp = leftPos; leftPos = rightPos; rightPos = tmp } left = leftPos.left right = rightPos.right } @@ -98,14 +98,14 @@ function drawSelectionRange(cm, range, output) { return {start: start, end: end} } - var sFrom = range.from(), sTo = range.to() + let sFrom = range.from(), sTo = range.to() if (sFrom.line == sTo.line) { drawForLine(sFrom.line, sFrom.ch, sTo.ch) } else { - var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line) - var singleVLine = visualLine(fromLine) == visualLine(toLine) - var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end - var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start + let fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line) + let singleVLine = visualLine(fromLine) == visualLine(toLine) + let leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end + let rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start if (singleVLine) { if (leftEnd.top < rightStart.top - 2) { add(leftEnd.right, leftEnd.top, null, leftEnd.bottom) @@ -124,9 +124,9 @@ function drawSelectionRange(cm, range, output) { // Cursor-blinking export function restartBlink(cm) { if (!cm.state.focused) return - var display = cm.display + let display = cm.display clearInterval(display.blinker) - var on = true + let on = true display.cursorDiv.style.visibility = "" if (cm.options.cursorBlinkRate > 0) display.blinker = setInterval(function() { diff --git a/src/display/update_display.js b/src/display/update_display.js index 06551eec8a..a8d6a4de13 100644 --- a/src/display/update_display.js +++ b/src/display/update_display.js @@ -18,7 +18,7 @@ import { adjustView, countDirtyView, resetView } from "./view_tracking" // DISPLAY DRAWING export function DisplayUpdate(cm, viewport, force) { - var display = cm.display + let display = cm.display this.viewport = viewport // Store some values that we'll need later (but don't want to force a relayout for) @@ -37,12 +37,12 @@ DisplayUpdate.prototype.signal = function(emitter, type) { this.events.push(arguments) } DisplayUpdate.prototype.finish = function() { - for (var i = 0; i < this.events.length; i++) + for (let i = 0; i < this.events.length; i++) signal.apply(null, this.events[i]) } export function maybeClipScrollbars(cm) { - var display = cm.display + let display = cm.display if (!display.scrollbarsClipped && display.scroller.offsetWidth) { display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth display.heightForcer.style.height = scrollGap(cm) + "px" @@ -56,7 +56,7 @@ export function maybeClipScrollbars(cm) { // (returning false) when there is nothing to be done and forced is // false. export function updateDisplayIfNeeded(cm, update) { - var display = cm.display, doc = cm.doc + let display = cm.display, doc = cm.doc if (update.editorIsHidden) { resetView(cm) @@ -76,9 +76,9 @@ export function updateDisplayIfNeeded(cm, update) { } // Compute a suitable new viewport (from & to) - var end = doc.first + doc.size - var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first) - var to = Math.min(end, update.visible.to + cm.options.viewportMargin) + let end = doc.first + doc.size + let from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first) + let to = Math.min(end, update.visible.to + cm.options.viewportMargin) if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom) if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo) if (sawCollapsedSpans) { @@ -86,7 +86,7 @@ export function updateDisplayIfNeeded(cm, update) { to = visualLineEndNo(cm.doc, to) } - var different = from != display.viewFrom || to != display.viewTo || + let different = from != display.viewFrom || to != display.viewTo || display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth adjustView(cm, from, to) @@ -94,14 +94,14 @@ export function updateDisplayIfNeeded(cm, update) { // Position the mover div to align with the current scroll position cm.display.mover.style.top = display.viewOffset + "px" - var toUpdate = countDirtyView(cm) + let toUpdate = countDirtyView(cm) if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view && (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo)) return false // For big changes, we hide the enclosing element during the // update, since that speeds up the operations on most browsers. - var focused = activeElt() + let focused = activeElt() if (toUpdate > 4) display.lineDiv.style.display = "none" patchDisplay(cm, display.updateLineNumbers, update.dims) if (toUpdate > 4) display.lineDiv.style.display = "" @@ -128,9 +128,9 @@ export function updateDisplayIfNeeded(cm, update) { } export function postUpdateDisplay(cm, update) { - var viewport = update.viewport + let viewport = update.viewport - for (var first = true;; first = false) { + for (let first = true;; first = false) { if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) { // Clip forced viewport to actual scrollable area. if (viewport && viewport.top != null) @@ -143,7 +143,7 @@ export function postUpdateDisplay(cm, update) { } if (!updateDisplayIfNeeded(cm, update)) break updateHeightsInViewport(cm) - var barMeasure = measureForScrollbars(cm) + let barMeasure = measureForScrollbars(cm) updateSelection(cm) updateScrollbars(cm, barMeasure) setDocumentHeight(cm, barMeasure) @@ -157,11 +157,11 @@ export function postUpdateDisplay(cm, update) { } export function updateDisplaySimple(cm, viewport) { - var update = new DisplayUpdate(cm, viewport) + let update = new DisplayUpdate(cm, viewport) if (updateDisplayIfNeeded(cm, update)) { updateHeightsInViewport(cm) postUpdateDisplay(cm, update) - var barMeasure = measureForScrollbars(cm) + let barMeasure = measureForScrollbars(cm) updateSelection(cm) updateScrollbars(cm, barMeasure) setDocumentHeight(cm, barMeasure) @@ -174,11 +174,11 @@ export function updateDisplaySimple(cm, viewport) { // that are not there yet, and updating the ones that are out of // date. function patchDisplay(cm, updateNumbersFrom, dims) { - var display = cm.display, lineNumbers = cm.options.lineNumbers - var container = display.lineDiv, cur = container.firstChild + let display = cm.display, lineNumbers = cm.options.lineNumbers + let container = display.lineDiv, cur = container.firstChild function rm(node) { - var next = node.nextSibling + let next = node.nextSibling // Works around a throw-scroll bug in OS X Webkit if (webkit && mac && cm.display.currentWheelTarget == node) node.style.display = "none" @@ -187,18 +187,18 @@ function patchDisplay(cm, updateNumbersFrom, dims) { return next } - var view = display.view, lineN = display.viewFrom + let view = display.view, lineN = display.viewFrom // Loop over the elements in the view, syncing cur (the DOM nodes // in display.lineDiv) with the view as we go. - for (var i = 0; i < view.length; i++) { - var lineView = view[i] + for (let i = 0; i < view.length; i++) { + let lineView = view[i] if (lineView.hidden) { } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet - var node = buildLineElement(cm, lineView, lineN, dims) + let node = buildLineElement(cm, lineView, lineN, dims) container.insertBefore(node, cur) } else { // Already drawn while (cur != lineView.node) cur = rm(cur) - var updateNumber = lineNumbers && updateNumbersFrom != null && + let updateNumber = lineNumbers && updateNumbersFrom != null && updateNumbersFrom <= lineN && lineView.lineNumber if (lineView.changes) { if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false @@ -216,7 +216,7 @@ function patchDisplay(cm, updateNumbersFrom, dims) { } export function updateGutterSpace(cm) { - var width = cm.display.gutters.offsetWidth + let width = cm.display.gutters.offsetWidth cm.display.sizer.style.marginLeft = width + "px" } diff --git a/src/display/update_lines.js b/src/display/update_lines.js index 8de0698c6f..095cddef3f 100644 --- a/src/display/update_lines.js +++ b/src/display/update_lines.js @@ -6,25 +6,25 @@ import { ie, ie_version } from "../util/browser" // Read the actual heights of the rendered lines, and update their // stored heights to match. export function updateHeightsInViewport(cm) { - var display = cm.display - var prevBottom = display.lineDiv.offsetTop - for (var i = 0; i < display.view.length; i++) { - var cur = display.view[i], height + let display = cm.display + let prevBottom = display.lineDiv.offsetTop + for (let i = 0; i < display.view.length; i++) { + let cur = display.view[i], height if (cur.hidden) continue if (ie && ie_version < 8) { - var bot = cur.node.offsetTop + cur.node.offsetHeight + let bot = cur.node.offsetTop + cur.node.offsetHeight height = bot - prevBottom prevBottom = bot } else { - var box = cur.node.getBoundingClientRect() + let box = cur.node.getBoundingClientRect() height = box.bottom - box.top } - var diff = cur.line.height - height + let diff = cur.line.height - height if (height < 2) height = textHeight(display) if (diff > .001 || diff < -.001) { updateLineHeight(cur.line, height) updateWidgetHeight(cur.line) - if (cur.rest) for (var j = 0; j < cur.rest.length; j++) + if (cur.rest) for (let j = 0; j < cur.rest.length; j++) updateWidgetHeight(cur.rest[j]) } } @@ -33,7 +33,7 @@ export function updateHeightsInViewport(cm) { // Read and store the height of line widgets associated with the // given line. function updateWidgetHeight(line) { - if (line.widgets) for (var i = 0; i < line.widgets.length; ++i) + if (line.widgets) for (let i = 0; i < line.widgets.length; ++i) line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight } @@ -41,15 +41,15 @@ function updateWidgetHeight(line) { // the the current scroll position). viewport may contain top, // height, and ensure (see op.scrollToPos) properties. export function visibleLines(display, doc, viewport) { - var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop + let top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop top = Math.floor(top - paddingTop(display)) - var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight + let bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight - var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom) + let from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom) // Ensure is a {from: {line, ch}, to: {line, ch}} object, and // forces those lines into the viewport (if possible). if (viewport && viewport.ensure) { - var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line + let ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line if (ensureFrom < from) { from = ensureFrom to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight) diff --git a/src/display/view_tracking.js b/src/display/view_tracking.js index d7ca682b1e..b9abd2fc40 100644 --- a/src/display/view_tracking.js +++ b/src/display/view_tracking.js @@ -15,7 +15,7 @@ export function regChange(cm, from, to, lendiff) { if (to == null) to = cm.doc.first + cm.doc.size if (!lendiff) lendiff = 0 - var display = cm.display + let display = cm.display if (lendiff && to < display.viewTo && (display.updateLineNumbers == null || display.updateLineNumbers > from)) display.updateLineNumbers = from @@ -35,7 +35,7 @@ export function regChange(cm, from, to, lendiff) { } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap resetView(cm) } else if (from <= display.viewFrom) { // Top overlap - var cut = viewCuttingPoint(cm, to, to + lendiff, 1) + let cut = viewCuttingPoint(cm, to, to + lendiff, 1) if (cut) { display.view = display.view.slice(cut.index) display.viewFrom = cut.lineN @@ -44,7 +44,7 @@ export function regChange(cm, from, to, lendiff) { resetView(cm) } } else if (to >= display.viewTo) { // Bottom overlap - var cut = viewCuttingPoint(cm, from, from, -1) + let cut = viewCuttingPoint(cm, from, from, -1) if (cut) { display.view = display.view.slice(0, cut.index) display.viewTo = cut.lineN @@ -52,8 +52,8 @@ export function regChange(cm, from, to, lendiff) { resetView(cm) } } else { // Gap in the middle - var cutTop = viewCuttingPoint(cm, from, from, -1) - var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1) + let cutTop = viewCuttingPoint(cm, from, from, -1) + let cutBot = viewCuttingPoint(cm, to, to + lendiff, 1) if (cutTop && cutBot) { display.view = display.view.slice(0, cutTop.index) .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN)) @@ -64,7 +64,7 @@ export function regChange(cm, from, to, lendiff) { } } - var ext = display.externalMeasured + let ext = display.externalMeasured if (ext) { if (to < ext.lineN) ext.lineN += lendiff @@ -77,14 +77,14 @@ export function regChange(cm, from, to, lendiff) { // "gutter", "class", "widget" export function regLineChange(cm, line, type) { cm.curOp.viewChanged = true - var display = cm.display, ext = cm.display.externalMeasured + let display = cm.display, ext = cm.display.externalMeasured if (ext && line >= ext.lineN && line < ext.lineN + ext.size) display.externalMeasured = null if (line < display.viewFrom || line >= display.viewTo) return - var lineView = display.view[findViewIndex(cm, line)] + let lineView = display.view[findViewIndex(cm, line)] if (lineView.node == null) return - var arr = lineView.changes || (lineView.changes = []) + let arr = lineView.changes || (lineView.changes = []) if (indexOf(arr, type) == -1) arr.push(type) } @@ -96,10 +96,11 @@ export function resetView(cm) { } function viewCuttingPoint(cm, oldN, newN, dir) { - var index = findViewIndex(cm, oldN), diff, view = cm.display.view + let index = findViewIndex(cm, oldN), diff, view = cm.display.view if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size) return {index: index, lineN: newN} - for (var i = 0, n = cm.display.viewFrom; i < index; i++) + let n = cm.display.viewFrom + for (let i = 0; i < index; i++) n += view[i].size if (n != oldN) { if (dir > 0) { @@ -122,7 +123,7 @@ function viewCuttingPoint(cm, oldN, newN, dir) { // Force the view to cover a given range, adding empty view element // or clipping off existing ones as needed. export function adjustView(cm, from, to) { - var display = cm.display, view = display.view + let display = cm.display, view = display.view if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) { display.view = buildViewArray(cm, from, to) display.viewFrom = from @@ -143,9 +144,9 @@ export function adjustView(cm, from, to) { // Count the number of lines in the view whose DOM representation is // out of date (or nonexistent). export function countDirtyView(cm) { - var view = cm.display.view, dirty = 0 - for (var i = 0; i < view.length; i++) { - var lineView = view[i] + let view = cm.display.view, dirty = 0 + for (let i = 0; i < view.length; i++) { + let lineView = view[i] if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty } return dirty diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js index ee549d54c8..90650ff059 100644 --- a/src/edit/CodeMirror.js +++ b/src/edit/CodeMirror.js @@ -34,12 +34,12 @@ export function CodeMirror(place, options) { copyObj(defaults, options, false) setGuttersForLineNumbers(options) - var doc = options.value + let doc = options.value if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator) this.doc = doc - var input = new CodeMirror.inputStyles[options.inputStyle](this) - var display = this.display = new Display(place, doc, input) + let input = new CodeMirror.inputStyles[options.inputStyle](this) + let display = this.display = new Display(place, doc, input) display.wrapper.CodeMirror = this updateGutters(this) themeChanged(this) @@ -64,7 +64,7 @@ export function CodeMirror(place, options) { specialChars: null } - var cm = this + let cm = this // Override magic textarea content restore that IE sometimes does // on our hidden textarea on reload @@ -82,11 +82,11 @@ export function CodeMirror(place, options) { else onBlur(this) - for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt)) + for (let opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt)) optionHandlers[opt](this, options[opt], Init) maybeUpdateLineNumberWidth(this) if (options.finishInit) options.finishInit(this) - for (var i = 0; i < initHooks.length; ++i) initHooks[i](this) + for (let i = 0; i < initHooks.length; ++i) initHooks[i](this) endOperation(this) // Suppress optimizelegibility in Webkit, since it breaks text // measuring on line wrapping boundaries. @@ -104,16 +104,16 @@ export default CodeMirror // Attach the necessary event handlers when initializing the editor function registerEventHandlers(cm) { - var d = cm.display + let d = cm.display on(d.scroller, "mousedown", operation(cm, onMouseDown)) // Older IE's will not fire a second mousedown for a double click if (ie && ie_version < 11) on(d.scroller, "dblclick", operation(cm, function(e) { if (signalDOMEvent(cm, e)) return - var pos = posFromMouse(cm, e) + let pos = posFromMouse(cm, e) if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return e_preventDefault(e) - var word = cm.findWordAt(pos) + let word = cm.findWordAt(pos) extendSelection(cm.doc, word.anchor, word.head) })) else @@ -124,7 +124,7 @@ function registerEventHandlers(cm) { if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e)}) // Used to suppress mouse event handling when a touch happens - var touchFinished, prevTouch = {end: 0} + let touchFinished, prevTouch = {end: 0} function finishTouch() { if (d.activeTouch) { touchFinished = setTimeout(function() {d.activeTouch = null}, 1000) @@ -134,18 +134,18 @@ function registerEventHandlers(cm) { } function isMouseLikeTouchEvent(e) { if (e.touches.length != 1) return false - var touch = e.touches[0] + let touch = e.touches[0] return touch.radiusX <= 1 && touch.radiusY <= 1 } function farAway(touch, other) { if (other.left == null) return true - var dx = other.left - touch.left, dy = other.top - touch.top + let dx = other.left - touch.left, dy = other.top - touch.top return dx * dx + dy * dy > 20 * 20 } on(d.scroller, "touchstart", function(e) { if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) { clearTimeout(touchFinished) - var now = +new Date + let now = +new Date d.activeTouch = {start: now, moved: false, prev: now - prevTouch.end <= 300 ? prevTouch : null} if (e.touches.length == 1) { @@ -158,10 +158,10 @@ function registerEventHandlers(cm) { if (d.activeTouch) d.activeTouch.moved = true }) on(d.scroller, "touchend", function(e) { - var touch = d.activeTouch + let touch = d.activeTouch if (touch && !eventInWidget(d, e) && touch.left != null && !touch.moved && new Date - touch.start < 300) { - var pos = cm.coordsChar(d.activeTouch, "page"), range + let pos = cm.coordsChar(d.activeTouch, "page"), range if (!touch.prev || farAway(touch, touch.prev)) // Single tap range = new Range(pos, pos) else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap @@ -201,7 +201,7 @@ function registerEventHandlers(cm) { leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm) }} } - var inp = d.input.getField() + let inp = d.input.getField() on(inp, "keyup", function(e) { onKeyUp.call(cm, e) }) on(inp, "keydown", operation(cm, onKeyDown)) on(inp, "keypress", operation(cm, onKeyPress)) @@ -209,5 +209,5 @@ function registerEventHandlers(cm) { on(inp, "blur", function (e) { onBlur(cm, e) }) } -var initHooks = [] +let initHooks = [] CodeMirror.defineInitHook = function(f) {initHooks.push(f)} diff --git a/src/edit/commands.js b/src/edit/commands.js index 2d670ab516..97a30d6d97 100644 --- a/src/edit/commands.js +++ b/src/edit/commands.js @@ -11,7 +11,7 @@ import { getOrder, lineLeft, lineRight } from "../util/bidi" // Commands are parameter-less actions that can be performed on an // editor, mostly used for keybindings. -export var commands = { +export let commands = { selectAll: selectAll, singleSelection: function(cm) { cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll) @@ -19,7 +19,7 @@ export var commands = { killLine: function(cm) { deleteNearSelection(cm, function(range) { if (range.empty()) { - var len = getLine(cm.doc, range.head.line).text.length + let len = getLine(cm.doc, range.head.line).text.length if (range.head.ch == len && range.head.line < cm.lastLine()) return {from: range.head, to: Pos(range.head.line + 1, 0)} else @@ -42,15 +42,15 @@ export var commands = { }, delWrappedLineLeft: function(cm) { deleteNearSelection(cm, function(range) { - var top = cm.charCoords(range.head, "div").top + 5 - var leftPos = cm.coordsChar({left: 0, top: top}, "div") + let top = cm.charCoords(range.head, "div").top + 5 + let leftPos = cm.coordsChar({left: 0, top: top}, "div") return {from: leftPos, to: range.from()} }) }, delWrappedLineRight: function(cm) { deleteNearSelection(cm, function(range) { - var top = cm.charCoords(range.head, "div").top + 5 - var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div") + let top = cm.charCoords(range.head, "div").top + 5 + let rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div") return {from: range.from(), to: rightPos } }) }, @@ -75,20 +75,20 @@ export var commands = { }, goLineRight: function(cm) { cm.extendSelectionsBy(function(range) { - var top = cm.charCoords(range.head, "div").top + 5 + let top = cm.charCoords(range.head, "div").top + 5 return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div") }, sel_move) }, goLineLeft: function(cm) { cm.extendSelectionsBy(function(range) { - var top = cm.charCoords(range.head, "div").top + 5 + let top = cm.charCoords(range.head, "div").top + 5 return cm.coordsChar({left: 0, top: top}, "div") }, sel_move) }, goLineLeftSmart: function(cm) { cm.extendSelectionsBy(function(range) { - var top = cm.charCoords(range.head, "div").top + 5 - var pos = cm.coordsChar({left: 0, top: top}, "div") + let top = cm.charCoords(range.head, "div").top + 5 + let pos = cm.coordsChar({left: 0, top: top}, "div") if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head) return pos }, sel_move) @@ -116,10 +116,10 @@ export var commands = { indentLess: function(cm) {cm.indentSelection("subtract")}, insertTab: function(cm) {cm.replaceSelection("\t")}, insertSoftTab: function(cm) { - var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize - for (var i = 0; i < ranges.length; i++) { - var pos = ranges[i].from() - var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize) + let spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize + for (let i = 0; i < ranges.length; i++) { + let pos = ranges[i].from() + let col = countColumn(cm.getLine(pos.line), pos.ch, tabSize) spaces.push(spaceStr(tabSize - col % tabSize)) } cm.replaceSelections(spaces) @@ -130,9 +130,9 @@ export var commands = { }, transposeChars: function(cm) { runInOp(cm, function() { - var ranges = cm.listSelections(), newSel = [] - for (var i = 0; i < ranges.length; i++) { - var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text + let ranges = cm.listSelections(), newSel = [] + for (let i = 0; i < ranges.length; i++) { + let cur = ranges[i].head, line = getLine(cm.doc, cur.line).text if (line) { if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1) if (cur.ch > 0) { @@ -140,7 +140,7 @@ export var commands = { cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2), Pos(cur.line, cur.ch - 2), cur, "+transpose") } else if (cur.line > cm.doc.first) { - var prev = getLine(cm.doc, cur.line - 1).text + let prev = getLine(cm.doc, cur.line - 1).text if (prev) cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() + prev.charAt(prev.length - 1), @@ -154,11 +154,11 @@ export var commands = { }, newlineAndIndent: function(cm) { runInOp(cm, function() { - var sels = cm.listSelections() - for (var i = sels.length - 1; i >= 0; i--) + let sels = cm.listSelections() + for (let i = sels.length - 1; i >= 0; i--) cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input") sels = cm.listSelections() - for (var i = 0; i < sels.length; i++) + for (let i = 0; i < sels.length; i++) cm.indentLine(sels[i].from().line, null, true) ensureCursorVisible(cm) }) @@ -169,30 +169,30 @@ export var commands = { function lineStart(cm, lineN) { - var line = getLine(cm.doc, lineN) - var visual = visualLine(line) + let line = getLine(cm.doc, lineN) + let visual = visualLine(line) if (visual != line) lineN = lineNo(visual) - var order = getOrder(visual) - var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual) + let order = getOrder(visual) + let ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual) return Pos(lineN, ch) } function lineEnd(cm, lineN) { - var merged, line = getLine(cm.doc, lineN) + let merged, line = getLine(cm.doc, lineN) while (merged = collapsedSpanAtEnd(line)) { line = merged.find(1, true).line lineN = null } - var order = getOrder(line) - var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line) + let order = getOrder(line) + let ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line) return Pos(lineN == null ? lineNo(line) : lineN, ch) } function lineStartSmart(cm, pos) { - var start = lineStart(cm, pos.line) - var line = getLine(cm.doc, start.line) - var order = getOrder(line) + let start = lineStart(cm, pos.line) + let line = getLine(cm.doc, start.line) + let order = getOrder(line) if (!order || order[0].level == 0) { - var firstNonWS = Math.max(0, line.text.search(/\S/)) - var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch + let firstNonWS = Math.max(0, line.text.search(/\S/)) + let inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch return Pos(start.line, inWS ? 0 : firstNonWS) } return start diff --git a/src/edit/deleteNearSelection.js b/src/edit/deleteNearSelection.js index 00b4aa08b9..38c5342ff2 100644 --- a/src/edit/deleteNearSelection.js +++ b/src/edit/deleteNearSelection.js @@ -7,13 +7,13 @@ import { lst } from "../util/misc" // Helper for deleting text near the selection(s), used to implement // backspace, delete, and similar functionality. export function deleteNearSelection(cm, compute) { - var ranges = cm.doc.sel.ranges, kill = [] + let ranges = cm.doc.sel.ranges, kill = [] // Build up a set of ranges to kill first, merging overlapping // ranges. - for (var i = 0; i < ranges.length; i++) { - var toKill = compute(ranges[i]) + for (let i = 0; i < ranges.length; i++) { + let toKill = compute(ranges[i]) while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) { - var replaced = kill.pop() + let replaced = kill.pop() if (cmp(replaced.from, toKill.from) < 0) { toKill.from = replaced.from break @@ -23,7 +23,7 @@ export function deleteNearSelection(cm, compute) { } // Next, remove those actual ranges. runInOp(cm, function() { - for (var i = kill.length - 1; i >= 0; i--) + for (let i = kill.length - 1; i >= 0; i--) replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete") ensureCursorVisible(cm) }) diff --git a/src/edit/drop_events.js b/src/edit/drop_events.js index d2aeaa7cef..b8024d920d 100644 --- a/src/edit/drop_events.js +++ b/src/edit/drop_events.js @@ -14,34 +14,34 @@ import { indexOf } from "../util/misc" // Kludge to work around strange IE behavior where it'll sometimes // re-fire a series of drag-related events right after the drop (#1551) -var lastDrop = 0 +let lastDrop = 0 export function onDrop(e) { - var cm = this + let cm = this clearDragCursor(cm) if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return e_preventDefault(e) if (ie) lastDrop = +new Date - var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files + let pos = posFromMouse(cm, e, true), files = e.dataTransfer.files if (!pos || cm.isReadOnly()) return // Might be a file drop, in which case we simply extract the text // and insert it. if (files && files.length && window.FileReader && window.File) { - var n = files.length, text = Array(n), read = 0 - var loadFile = function(file, i) { + let n = files.length, text = Array(n), read = 0 + let loadFile = function(file, i) { if (cm.options.allowDropFileTypes && indexOf(cm.options.allowDropFileTypes, file.type) == -1) return - var reader = new FileReader + let reader = new FileReader reader.onload = operation(cm, function() { - var content = reader.result + let content = reader.result if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = "" text[i] = content if (++read == n) { pos = clipPos(cm.doc, pos) - var change = {from: pos, to: pos, + let change = {from: pos, to: pos, text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())), origin: "paste"} makeChange(cm.doc, change) @@ -50,7 +50,7 @@ export function onDrop(e) { }) reader.readAsText(file) } - for (var i = 0; i < n; ++i) loadFile(files[i], i) + for (let i = 0; i < n; ++i) loadFile(files[i], i) } else { // Normal drop // Don't do a replace if the drop happened inside of the selected text. if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) { @@ -60,12 +60,13 @@ export function onDrop(e) { return } try { - var text = e.dataTransfer.getData("Text") + let text = e.dataTransfer.getData("Text") if (text) { + let selected if (cm.state.draggingText && !cm.state.draggingText.copy) - var selected = cm.listSelections() + selected = cm.listSelections() setSelectionNoUndo(cm.doc, simpleSelection(pos, pos)) - if (selected) for (var i = 0; i < selected.length; ++i) + if (selected) for (let i = 0; i < selected.length; ++i) replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag") cm.replaceSelection(text, "around", "paste") cm.display.input.focus() @@ -85,7 +86,7 @@ export function onDragStart(cm, e) { // Use dummy image instead of default browsers image. // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there. if (e.dataTransfer.setDragImage && !safari) { - var img = elt("img", null, null, "position: fixed; left: 0; top: 0;") + let img = elt("img", null, null, "position: fixed; left: 0; top: 0;") img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" if (presto) { img.width = img.height = 1 @@ -99,9 +100,9 @@ export function onDragStart(cm, e) { } export function onDragOver(cm, e) { - var pos = posFromMouse(cm, e) + let pos = posFromMouse(cm, e) if (!pos) return - var frag = document.createDocumentFragment() + let frag = document.createDocumentFragment() drawSelectionCursor(cm, pos, frag) if (!cm.display.dragCursor) { cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors") diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js index dda26d4bff..7d22101469 100644 --- a/src/edit/fromTextArea.js +++ b/src/edit/fromTextArea.js @@ -13,19 +13,22 @@ export function fromTextArea(textarea, options) { // Set autofocus to true if this textarea is focused, or if it has // autofocus and no other element is focused. if (options.autofocus == null) { - var hasFocus = activeElt() + let hasFocus = activeElt() options.autofocus = hasFocus == textarea || textarea.getAttribute("autofocus") != null && hasFocus == document.body } function save() {textarea.value = cm.getValue()} + + let realSubmit if (textarea.form) { on(textarea.form, "submit", save) // Deplorable hack to make the submit method do the right thing. if (!options.leaveSubmitMethodAlone) { - var form = textarea.form, realSubmit = form.submit + let form = textarea.form + realSubmit = form.submit try { - var wrappedSubmit = form.submit = function() { + let wrappedSubmit = form.submit = function() { save() form.submit = realSubmit form.submit() @@ -52,7 +55,7 @@ export function fromTextArea(textarea, options) { } textarea.style.display = "none" - var cm = CodeMirror(function(node) { + let cm = CodeMirror(function(node) { textarea.parentNode.insertBefore(node, textarea.nextSibling) }, options) return cm diff --git a/src/edit/global_events.js b/src/edit/global_events.js index 57542f2d32..a7ec22fe89 100644 --- a/src/edit/global_events.js +++ b/src/edit/global_events.js @@ -7,14 +7,14 @@ import { on } from "../util/event" function forEachCodeMirror(f) { if (!document.body.getElementsByClassName) return - var byClass = document.body.getElementsByClassName("CodeMirror") - for (var i = 0; i < byClass.length; i++) { - var cm = byClass[i].CodeMirror + let byClass = document.body.getElementsByClassName("CodeMirror") + for (let i = 0; i < byClass.length; i++) { + let cm = byClass[i].CodeMirror if (cm) f(cm) } } -var globalsRegistered = false +let globalsRegistered = false export function ensureGlobalHandlers() { if (globalsRegistered) return registerGlobalHandlers() @@ -22,7 +22,7 @@ export function ensureGlobalHandlers() { } function registerGlobalHandlers() { // When the window resizes, we need to refresh active editors. - var resizeTimer + let resizeTimer on(window, "resize", function() { if (resizeTimer == null) resizeTimer = setTimeout(function() { resizeTimer = null @@ -36,7 +36,7 @@ function registerGlobalHandlers() { } // Called when the window resizes function onResize(cm) { - var d = cm.display + let d = cm.display if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth) return // Might be a text scaling operation, clear size caches. diff --git a/src/edit/key_events.js b/src/edit/key_events.js index 9a4944414c..8530aef315 100644 --- a/src/edit/key_events.js +++ b/src/edit/key_events.js @@ -19,7 +19,7 @@ function doHandleBinding(cm, bound, dropShift) { // Ensure previous input has been read, so that the handler sees a // consistent view of the document cm.display.input.ensurePolled() - var prevShift = cm.display.shift, done = false + let prevShift = cm.display.shift, done = false try { if (cm.isReadOnly()) cm.state.suppressEdits = true if (dropShift) cm.display.shift = false @@ -32,17 +32,17 @@ function doHandleBinding(cm, bound, dropShift) { } function lookupKeyForEditor(cm, name, handle) { - for (var i = 0; i < cm.state.keyMaps.length; i++) { - var result = lookupKey(name, cm.state.keyMaps[i], handle, cm) + for (let i = 0; i < cm.state.keyMaps.length; i++) { + let result = lookupKey(name, cm.state.keyMaps[i], handle, cm) if (result) return result } return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm)) || lookupKey(name, cm.options.keyMap, handle, cm) } -var stopSeq = new Delayed +let stopSeq = new Delayed function dispatchKey(cm, name, e, handle) { - var seq = cm.state.keySeq + let seq = cm.state.keySeq if (seq) { if (isModifierKey(name)) return "handled" stopSeq.set(50, function() { @@ -53,7 +53,7 @@ function dispatchKey(cm, name, e, handle) { }) name = seq + " " + name } - var result = lookupKeyForEditor(cm, name, handle) + let result = lookupKeyForEditor(cm, name, handle) if (result == "multi") cm.state.keySeq = name @@ -74,7 +74,7 @@ function dispatchKey(cm, name, e, handle) { // Handle a key from the keydown event. function handleKeyBinding(cm, e) { - var name = keyName(e, true) + let name = keyName(e, true) if (!name) return false if (e.shiftKey && !cm.state.keySeq) { @@ -97,16 +97,16 @@ function handleCharBinding(cm, e, ch) { function(b) { return doHandleBinding(cm, b, true) }) } -var lastStoppedKey = null +let lastStoppedKey = null export function onKeyDown(e) { - var cm = this + let cm = this cm.curOp.focus = activeElt() if (signalDOMEvent(cm, e)) return // IE does strange things with escape. if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false - var code = e.keyCode + let code = e.keyCode cm.display.shift = code == 16 || e.shiftKey - var handled = handleKeyBinding(cm, e) + let handled = handleKeyBinding(cm, e) if (presto) { lastStoppedKey = handled ? code : null // Opera has no cut event... we try to at least catch the key combo @@ -120,7 +120,7 @@ export function onKeyDown(e) { } function showCrossHair(cm) { - var lineDiv = cm.display.lineDiv + let lineDiv = cm.display.lineDiv addClass(lineDiv, "CodeMirror-crosshair") function up(e) { @@ -140,12 +140,12 @@ export function onKeyUp(e) { } export function onKeyPress(e) { - var cm = this + let cm = this if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return - var keyCode = e.keyCode, charCode = e.charCode + let keyCode = e.keyCode, charCode = e.charCode if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return} if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return - var ch = String.fromCharCode(charCode == null ? keyCode : charCode) + let ch = String.fromCharCode(charCode == null ? keyCode : charCode) // Some browsers fire keypress events for backspace if (ch == "\x08") return if (handleCharBinding(cm, e, ch)) return diff --git a/src/edit/main.js b/src/edit/main.js index 3f76d70207..55432c0812 100644 --- a/src/edit/main.js +++ b/src/edit/main.js @@ -17,8 +17,8 @@ addEditorMethods(CodeMirror) import Doc from "../model/Doc" // Set up methods on CodeMirror's prototype to redirect to the editor's document. -var dontDelegate = "iter insert remove copy getEditor constructor".split(" ") -for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0) +let dontDelegate = "iter insert remove copy getEditor constructor".split(" ") +for (let prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0) CodeMirror.prototype[prop] = (function(method) { return function() {return method.apply(this.doc, arguments)} })(Doc.prototype[prop]) diff --git a/src/edit/methods.js b/src/edit/methods.js index 828304d3dc..04be851246 100644 --- a/src/edit/methods.js +++ b/src/edit/methods.js @@ -32,16 +32,16 @@ import { regChange, regLineChange } from "../display/view_tracking" // convenience. export default function(CodeMirror) { - var optionHandlers = CodeMirror.optionHandlers + let optionHandlers = CodeMirror.optionHandlers - var helpers = CodeMirror.helpers = {} + let helpers = CodeMirror.helpers = {} CodeMirror.prototype = { constructor: CodeMirror, focus: function(){window.focus(); this.display.input.focus()}, setOption: function(option, value) { - var options = this.options, old = options[option] + let options = this.options, old = options[option] if (options[option] == value && option != "mode") return options[option] = value if (optionHandlers.hasOwnProperty(option)) @@ -55,8 +55,8 @@ export default function(CodeMirror) { this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map)) }, removeKeyMap: function(map) { - var maps = this.state.keyMaps - for (var i = 0; i < maps.length; ++i) + let maps = this.state.keyMaps + for (let i = 0; i < maps.length; ++i) if (maps[i] == map || maps[i].name == map) { maps.splice(i, 1) return true @@ -64,7 +64,7 @@ export default function(CodeMirror) { }, addOverlay: methodOp(function(spec, options) { - var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec) + let mode = spec.token ? spec : CodeMirror.getMode(this.options, spec) if (mode.startState) throw new Error("Overlays may not be stateful.") insertSorted(this.state.overlays, {mode: mode, modeSpec: spec, opaque: options && options.opaque, @@ -74,9 +74,9 @@ export default function(CodeMirror) { regChange(this) }), removeOverlay: methodOp(function(spec) { - var overlays = this.state.overlays - for (var i = 0; i < overlays.length; ++i) { - var cur = overlays[i].modeSpec + let overlays = this.state.overlays + for (let i = 0; i < overlays.length; ++i) { + let cur = overlays[i].modeSpec if (cur == spec || typeof spec == "string" && cur.name == spec) { overlays.splice(i, 1) this.state.modeGen++ @@ -94,16 +94,16 @@ export default function(CodeMirror) { if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive) }), indentSelection: methodOp(function(how) { - var ranges = this.doc.sel.ranges, end = -1 - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i] + let ranges = this.doc.sel.ranges, end = -1 + for (let i = 0; i < ranges.length; i++) { + let range = ranges[i] if (!range.empty()) { - var from = range.from(), to = range.to() - var start = Math.max(end, from.line) + let from = range.from(), to = range.to() + let start = Math.max(end, from.line) end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1 - for (var j = start; j < end; ++j) + for (let j = start; j < end; ++j) indentLine(this, j, how) - var newRanges = this.doc.sel.ranges + let newRanges = this.doc.sel.ranges if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0) replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll) } else if (range.head.line > end) { @@ -126,22 +126,22 @@ export default function(CodeMirror) { getTokenTypeAt: function(pos) { pos = clipPos(this.doc, pos) - var styles = getLineStyles(this, getLine(this.doc, pos.line)) - var before = 0, after = (styles.length - 1) / 2, ch = pos.ch - var type + let styles = getLineStyles(this, getLine(this.doc, pos.line)) + let before = 0, after = (styles.length - 1) / 2, ch = pos.ch + let type if (ch == 0) type = styles[2] else for (;;) { - var mid = (before + after) >> 1 + let mid = (before + after) >> 1 if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid else if (styles[mid * 2 + 1] < ch) before = mid + 1 else { type = styles[mid * 2 + 2]; break } } - var cut = type ? type.indexOf("cm-overlay ") : -1 + let cut = type ? type.indexOf("cm-overlay ") : -1 return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1) }, getModeAt: function(pos) { - var mode = this.doc.mode + let mode = this.doc.mode if (!mode.innerMode) return mode return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode }, @@ -151,14 +151,14 @@ export default function(CodeMirror) { }, getHelpers: function(pos, type) { - var found = [] + let found = [] if (!helpers.hasOwnProperty(type)) return found - var help = helpers[type], mode = this.getModeAt(pos) + let help = helpers[type], mode = this.getModeAt(pos) if (typeof mode[type] == "string") { if (help[mode[type]]) found.push(help[mode[type]]) } else if (mode[type]) { - for (var i = 0; i < mode[type].length; i++) { - var val = help[mode[type][i]] + for (let i = 0; i < mode[type].length; i++) { + let val = help[mode[type][i]] if (val) found.push(val) } } else if (mode.helperType && help[mode.helperType]) { @@ -166,8 +166,8 @@ export default function(CodeMirror) { } else if (help[mode.name]) { found.push(help[mode.name]) } - for (var i = 0; i < help._global.length; i++) { - var cur = help._global[i] + for (let i = 0; i < help._global.length; i++) { + let cur = help._global[i] if (cur.pred(mode, this) && indexOf(found, cur.val) == -1) found.push(cur.val) } @@ -175,13 +175,13 @@ export default function(CodeMirror) { }, getStateAfter: function(line, precise) { - var doc = this.doc + let doc = this.doc line = clipLine(doc, line == null ? doc.first + doc.size - 1: line) return getStateBefore(this, line + 1, precise) }, cursorCoords: function(start, mode) { - var pos, range = this.doc.sel.primary() + let pos, range = this.doc.sel.primary() if (start == null) pos = range.head else if (typeof start == "object") pos = clipPos(this.doc, start) else pos = start ? range.from() : range.to() @@ -202,9 +202,9 @@ export default function(CodeMirror) { return lineAtHeight(this.doc, height + this.display.viewOffset) }, heightAtLine: function(line, mode) { - var end = false, lineObj + let end = false, lineObj if (typeof line == "number") { - var last = this.doc.first + this.doc.size - 1 + let last = this.doc.first + this.doc.size - 1 if (line < this.doc.first) line = this.doc.first else if (line > last) { line = last; end = true } lineObj = getLine(this.doc, line) @@ -220,7 +220,7 @@ export default function(CodeMirror) { setGutterMarker: methodOp(function(line, gutterID, value) { return changeLine(this.doc, line, "gutter", function(line) { - var markers = line.gutterMarkers || (line.gutterMarkers = {}) + let markers = line.gutterMarkers || (line.gutterMarkers = {}) markers[gutterID] = value if (!value && isEmpty(markers)) line.gutterMarkers = null return true @@ -228,7 +228,7 @@ export default function(CodeMirror) { }), clearGutter: methodOp(function(gutterID) { - var cm = this, doc = cm.doc, i = doc.first + let cm = this, doc = cm.doc, i = doc.first doc.iter(function(line) { if (line.gutterMarkers && line.gutterMarkers[gutterID]) { line.gutterMarkers[gutterID] = null @@ -240,13 +240,14 @@ export default function(CodeMirror) { }), lineInfo: function(line) { + let n if (typeof line == "number") { if (!isLine(this.doc, line)) return null - var n = line + n = line line = getLine(this.doc, line) if (!line) return null } else { - var n = lineNo(line) + n = lineNo(line) if (n == null) return null } return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers, @@ -257,9 +258,9 @@ export default function(CodeMirror) { getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}}, addWidget: function(pos, node, scroll, vert, horiz) { - var display = this.display + let display = this.display pos = cursorCoords(this, clipPos(this.doc, pos)) - var top = pos.bottom, left = pos.left + let top = pos.bottom, left = pos.left node.style.position = "absolute" node.setAttribute("cm-ignore-events", "true") this.display.input.setUneditable(node) @@ -267,7 +268,7 @@ export default function(CodeMirror) { if (vert == "over") { top = pos.top } else if (vert == "above" || vert == "near") { - var vspace = Math.max(display.wrapper.clientHeight, this.doc.height), + let vspace = Math.max(display.wrapper.clientHeight, this.doc.height), hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth) // Default to positioning above (if specified and possible); otherwise default to positioning below if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight) @@ -303,9 +304,10 @@ export default function(CodeMirror) { triggerElectric: methodOp(function(text) { triggerElectric(this, text) }), findPosH: function(from, amount, unit, visually) { - var dir = 1 + let dir = 1 if (amount < 0) { dir = -1; amount = -amount } - for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) { + let cur = clipPos(this.doc, from) + for (let i = 0; i < amount; ++i) { cur = findPosH(this.doc, cur, dir, unit, visually) if (cur.hitSide) break } @@ -313,7 +315,7 @@ export default function(CodeMirror) { }, moveH: methodOp(function(dir, unit) { - var cm = this + let cm = this cm.extendSelectionsBy(function(range) { if (cm.display.shift || cm.doc.extend || range.empty()) return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually) @@ -323,21 +325,22 @@ export default function(CodeMirror) { }), deleteH: methodOp(function(dir, unit) { - var sel = this.doc.sel, doc = this.doc + let sel = this.doc.sel, doc = this.doc if (sel.somethingSelected()) doc.replaceSelection("", null, "+delete") else deleteNearSelection(this, function(range) { - var other = findPosH(doc, range.head, dir, unit, false) + let other = findPosH(doc, range.head, dir, unit, false) return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other} }) }), findPosV: function(from, amount, unit, goalColumn) { - var dir = 1, x = goalColumn + let dir = 1, x = goalColumn if (amount < 0) { dir = -1; amount = -amount } - for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) { - var coords = cursorCoords(this, cur, "div") + let cur = clipPos(this.doc, from) + for (let i = 0; i < amount; ++i) { + let coords = cursorCoords(this, cur, "div") if (x == null) x = coords.left else coords.left = x cur = findPosV(this, coords, dir, unit) @@ -347,32 +350,32 @@ export default function(CodeMirror) { }, moveV: methodOp(function(dir, unit) { - var cm = this, doc = this.doc, goals = [] - var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected() + let cm = this, doc = this.doc, goals = [] + let collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected() doc.extendSelectionsBy(function(range) { if (collapse) return dir < 0 ? range.from() : range.to() - var headPos = cursorCoords(cm, range.head, "div") + let headPos = cursorCoords(cm, range.head, "div") if (range.goalColumn != null) headPos.left = range.goalColumn goals.push(headPos.left) - var pos = findPosV(cm, headPos, dir, unit) + let pos = findPosV(cm, headPos, dir, unit) if (unit == "page" && range == doc.sel.primary()) addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top) return pos }, sel_move) - if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++) + if (goals.length) for (let i = 0; i < doc.sel.ranges.length; i++) doc.sel.ranges[i].goalColumn = goals[i] }), // Find the word at the given position (as returned by coordsChar). findWordAt: function(pos) { - var doc = this.doc, line = getLine(doc, pos.line).text - var start = pos.ch, end = pos.ch + let doc = this.doc, line = getLine(doc, pos.line).text + let start = pos.ch, end = pos.ch if (line) { - var helper = this.getHelper(pos, "wordChars") + let helper = this.getHelper(pos, "wordChars") if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end - var startChar = line.charAt(start) - var check = isWordChar(startChar, helper) + let startChar = line.charAt(start) + let check = isWordChar(startChar, helper) ? function(ch) { return isWordChar(ch, helper) } : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch)} : function(ch) {return !/\s/.test(ch) && !isWordChar(ch)} @@ -400,7 +403,7 @@ export default function(CodeMirror) { if (y != null) this.curOp.scrollTop = y }), getScrollInfo: function() { - var scroller = this.display.scroller + let scroller = this.display.scroller return {left: scroller.scrollLeft, top: scroller.scrollTop, height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight, width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth, @@ -423,7 +426,7 @@ export default function(CodeMirror) { resolveScrollToPos(this) this.curOp.scrollToPos = range } else { - var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left), + let sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left), Math.min(range.from.top, range.to.top) - range.margin, Math.max(range.from.right, range.to.right), Math.max(range.from.bottom, range.to.bottom) + range.margin) @@ -432,16 +435,16 @@ export default function(CodeMirror) { }), setSize: methodOp(function(width, height) { - var cm = this + let cm = this function interpret(val) { return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val } if (width != null) cm.display.wrapper.style.width = interpret(width) if (height != null) cm.display.wrapper.style.height = interpret(height) if (cm.options.lineWrapping) clearLineMeasurementCache(this) - var lineNo = cm.display.viewFrom + let lineNo = cm.display.viewFrom cm.doc.iter(lineNo, cm.display.viewTo, function(line) { - if (line.widgets) for (var i = 0; i < line.widgets.length; i++) + if (line.widgets) for (let i = 0; i < line.widgets.length; i++) if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break } ++lineNo }) @@ -452,7 +455,7 @@ export default function(CodeMirror) { operation: function(f){return runInOp(this, f)}, refresh: methodOp(function() { - var oldHeight = this.display.cachedTextHeight + let oldHeight = this.display.cachedTextHeight regChange(this) this.curOp.forceUpdate = true clearCaches(this) @@ -464,7 +467,7 @@ export default function(CodeMirror) { }), swapDoc: methodOp(function(doc) { - var old = this.doc + let old = this.doc old.cm = null attachDoc(this, doc) clearCaches(this) @@ -502,16 +505,16 @@ export default function(CodeMirror) { // position. The resulting position will have a hitSide=true // property if it reached the end of the document. function findPosH(doc, pos, dir, unit, visually) { - var line = pos.line, ch = pos.ch, origDir = dir - var lineObj = getLine(doc, line) + let line = pos.line, ch = pos.ch, origDir = dir + let lineObj = getLine(doc, line) function findNextLine() { - var l = line + dir + let l = line + dir if (l < doc.first || l >= doc.first + doc.size) return false line = l return lineObj = getLine(doc, l) } function moveOnce(boundToLine) { - var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true) + let next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true) if (next == null) { if (!boundToLine && findNextLine()) { if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj) @@ -526,12 +529,12 @@ function findPosH(doc, pos, dir, unit, visually) { } else if (unit == "column") { moveOnce(true) } else if (unit == "word" || unit == "group") { - var sawType = null, group = unit == "group" - var helper = doc.cm && doc.cm.getHelper(pos, "wordChars") - for (var first = true;; first = false) { + let sawType = null, group = unit == "group" + let helper = doc.cm && doc.cm.getHelper(pos, "wordChars") + for (let first = true;; first = false) { if (dir < 0 && !moveOnce(!first)) break - var cur = lineObj.text.charAt(ch) || "\n" - var type = isWordChar(cur, helper) ? "w" + let cur = lineObj.text.charAt(ch) || "\n" + let type = isWordChar(cur, helper) ? "w" : group && cur == "\n" ? "n" : !group || /\s/.test(cur) ? null : "p" @@ -545,7 +548,7 @@ function findPosH(doc, pos, dir, unit, visually) { if (dir > 0 && !moveOnce(!first)) break } } - var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true) + let result = skipAtomic(doc, Pos(line, ch), pos, origDir, true) if (!cmp(pos, result)) result.hitSide = true return result } @@ -554,17 +557,18 @@ function findPosH(doc, pos, dir, unit, visually) { // "page" or "line". The resulting position will have a hitSide=true // property if it reached the end of the document. function findPosV(cm, pos, dir, unit) { - var doc = cm.doc, x = pos.left, y + let doc = cm.doc, x = pos.left, y if (unit == "page") { - var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight) - var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3) + let pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight) + let moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3) y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount } else if (unit == "line") { y = dir > 0 ? pos.bottom + 3 : pos.top - 3 } + let target for (;;) { - var target = coordsChar(cm, x, y) + target = coordsChar(cm, x, y) if (!target.outside) break if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break } y += dir * 5 diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js index 408cc497d1..5fe10ea39f 100644 --- a/src/edit/mouse_events.js +++ b/src/edit/mouse_events.js @@ -19,7 +19,7 @@ import { bind, countColumn, findColumn, sel_mouse } from "../util/misc" // middle-click-paste. Or it might be a click on something we should // not interfere with, such as a scrollbar or widget. export function onMouseDown(e) { - var cm = this, display = cm.display + let cm = this, display = cm.display if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return display.shift = e.shiftKey @@ -33,7 +33,7 @@ export function onMouseDown(e) { return } if (clickInGutter(cm, e)) return - var start = posFromMouse(cm, e) + let start = posFromMouse(cm, e) window.focus() switch (e_button(e)) { @@ -59,12 +59,12 @@ export function onMouseDown(e) { } } -var lastClick, lastDoubleClick +let lastClick, lastDoubleClick function leftButtonDown(cm, e, start) { if (ie) setTimeout(bind(ensureFocus, cm), 0) else cm.curOp.focus = activeElt() - var now = +new Date, type + let now = +new Date, type if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) { type = "triple" } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) { @@ -75,7 +75,7 @@ function leftButtonDown(cm, e, start) { lastClick = {time: now, pos: start} } - var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained + let sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() && type == "single" && (contained = sel.contains(start)) > -1 && (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) && @@ -88,8 +88,8 @@ function leftButtonDown(cm, e, start) { // Start a text drag. When it ends, see if any dragging actually // happen, and treat as a click if it didn't. function leftButtonStartDrag(cm, e, start, modifier) { - var display = cm.display, startTime = +new Date - var dragEnd = operation(cm, function(e2) { + let display = cm.display, startTime = +new Date + let dragEnd = operation(cm, function(e2) { if (webkit) display.scroller.draggable = false cm.state.draggingText = false off(document, "mouseup", dragEnd) @@ -117,10 +117,10 @@ function leftButtonStartDrag(cm, e, start, modifier) { // Normal selection, as opposed to text dragging. function leftButtonSelect(cm, e, start, type, addNew) { - var display = cm.display, doc = cm.doc + let display = cm.display, doc = cm.doc e_preventDefault(e) - var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges + let ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges if (addNew && !e.shiftKey) { ourIndex = doc.sel.contains(start) if (ourIndex > -1) @@ -138,13 +138,13 @@ function leftButtonSelect(cm, e, start, type, addNew) { start = posFromMouse(cm, e, true, true) ourIndex = -1 } else if (type == "double") { - var word = cm.findWordAt(start) + let word = cm.findWordAt(start) if (cm.display.shift || doc.extend) ourRange = extendRange(doc, ourRange, word.anchor, word.head) else ourRange = word } else if (type == "triple") { - var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0))) + let line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0))) if (cm.display.shift || doc.extend) ourRange = extendRange(doc, ourRange, line.anchor, line.head) else @@ -169,19 +169,19 @@ function leftButtonSelect(cm, e, start, type, addNew) { replaceOneSelection(doc, ourIndex, ourRange, sel_mouse) } - var lastPos = start + let lastPos = start function extendTo(pos) { if (cmp(lastPos, pos) == 0) return lastPos = pos if (type == "rect") { - var ranges = [], tabSize = cm.options.tabSize - var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize) - var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize) - var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol) - for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line)); + let ranges = [], tabSize = cm.options.tabSize + let startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize) + let posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize) + let left = Math.min(startCol, posCol), right = Math.max(startCol, posCol) + for (let line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line)); line <= end; line++) { - var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize) + let text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize) if (left == right) ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))) else if (text.length > leftPos) @@ -192,13 +192,14 @@ function leftButtonSelect(cm, e, start, type, addNew) { {origin: "*mouse", scroll: false}) cm.scrollIntoView(pos) } else { - var oldRange = ourRange - var anchor = oldRange.anchor, head = pos + let oldRange = ourRange + let anchor = oldRange.anchor, head = pos if (type != "single") { + let range if (type == "double") - var range = cm.findWordAt(pos) + range = cm.findWordAt(pos) else - var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0))) + range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0))) if (cmp(range.anchor, anchor) > 0) { head = range.head anchor = minPos(oldRange.from(), range.anchor) @@ -207,31 +208,31 @@ function leftButtonSelect(cm, e, start, type, addNew) { anchor = maxPos(oldRange.to(), range.head) } } - var ranges = startSel.ranges.slice(0) + let ranges = startSel.ranges.slice(0) ranges[ourIndex] = new Range(clipPos(doc, anchor), head) setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse) } } - var editorSize = display.wrapper.getBoundingClientRect() + let editorSize = display.wrapper.getBoundingClientRect() // Used to ensure timeout re-tries don't fire when another extend // happened in the meantime (clearTimeout isn't reliable -- at // least on Chrome, the timeouts still happen even when cleared, // if the clear happens after their scheduled firing time). - var counter = 0 + let counter = 0 function extend(e) { - var curCount = ++counter - var cur = posFromMouse(cm, e, true, type == "rect") + let curCount = ++counter + let cur = posFromMouse(cm, e, true, type == "rect") if (!cur) return if (cmp(cur, lastPos) != 0) { cm.curOp.focus = activeElt() extendTo(cur) - var visible = visibleLines(display, doc) + let visible = visibleLines(display, doc) if (cur.line >= visible.to || cur.line < visible.from) setTimeout(operation(cm, function(){if (counter == curCount) extend(e)}), 150) } else { - var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0 + let outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0 if (outside) setTimeout(operation(cm, function() { if (counter != curCount) return display.scroller.scrollTop += outside @@ -250,11 +251,11 @@ function leftButtonSelect(cm, e, start, type, addNew) { doc.history.lastSelOrigin = null } - var move = operation(cm, function(e) { + let move = operation(cm, function(e) { if (!e_button(e)) done(e) else extend(e) }) - var up = operation(cm, done) + let up = operation(cm, done) cm.state.selectingText = up on(document, "mousemove", move) on(document, "mouseup", up) @@ -264,22 +265,23 @@ function leftButtonSelect(cm, e, start, type, addNew) { // Determines whether an event happened in the gutter, and fires the // handlers for the corresponding event. function gutterEvent(cm, e, type, prevent) { - try { var mX = e.clientX, mY = e.clientY } + let mX, mY + try { mX = e.clientX; mY = e.clientY } catch(e) { return false } if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false if (prevent) e_preventDefault(e) - var display = cm.display - var lineBox = display.lineDiv.getBoundingClientRect() + let display = cm.display + let lineBox = display.lineDiv.getBoundingClientRect() if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e) mY -= lineBox.top - display.viewOffset - for (var i = 0; i < cm.options.gutters.length; ++i) { - var g = display.gutters.childNodes[i] + for (let i = 0; i < cm.options.gutters.length; ++i) { + let g = display.gutters.childNodes[i] if (g && g.getBoundingClientRect().right >= mX) { - var line = lineAtHeight(cm.doc, mY) - var gutter = cm.options.gutters[i] + let line = lineAtHeight(cm.doc, mY) + let gutter = cm.options.gutters[i] signal(cm, type, cm, line, gutter, e) return e_defaultPrevented(e) } diff --git a/src/edit/options.js b/src/edit/options.js index cf0d4d8185..a2ca1c6803 100644 --- a/src/edit/options.js +++ b/src/edit/options.js @@ -17,13 +17,13 @@ import { off, on } from "../util/event" import { themeChanged } from "./utils" -export var Init = {toString: function(){return "CodeMirror.Init"}} +export let Init = {toString: function(){return "CodeMirror.Init"}} -export var defaults = {} -export var optionHandlers = {} +export let defaults = {} +export let optionHandlers = {} export function defineOptions(CodeMirror) { - var optionHandlers = CodeMirror.optionHandlers + let optionHandlers = CodeMirror.optionHandlers function option(name, deflt, handle, notOnInit) { CodeMirror.defaults[name] = deflt @@ -57,17 +57,17 @@ export function defineOptions(CodeMirror) { option("lineSeparator", null, function(cm, val) { cm.doc.lineSep = val if (!val) return - var newBreaks = [], lineNo = cm.doc.first + let newBreaks = [], lineNo = cm.doc.first cm.doc.iter(function(line) { - for (var pos = 0;;) { - var found = line.text.indexOf(val, pos) + for (let pos = 0;;) { + let found = line.text.indexOf(val, pos) if (found == -1) break pos = found + val.length newBreaks.push(Pos(lineNo, found)) } lineNo++ }) - for (var i = newBreaks.length - 1; i >= 0; i--) + for (let i = newBreaks.length - 1; i >= 0; i--) replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)) }) option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) { @@ -90,8 +90,8 @@ export function defineOptions(CodeMirror) { guttersChanged(cm) }, true) option("keyMap", "default", function(cm, val, old) { - var next = getKeyMap(val) - var prev = old != Init && getKeyMap(old) + let next = getKeyMap(val) + let prev = old != Init && getKeyMap(old) if (prev && prev.detach) prev.detach(cm, next) if (next.attach) next.attach(cm, prev || null) }) @@ -168,10 +168,10 @@ function guttersChanged(cm) { } function dragDropChanged(cm, value, old) { - var wasOn = old && old != Init + let wasOn = old && old != Init if (!value != !wasOn) { - var funcs = cm.display.dragFunctions - var toggle = value ? on : off + let funcs = cm.display.dragFunctions + let toggle = value ? on : off toggle(cm.display.scroller, "dragstart", funcs.start) toggle(cm.display.scroller, "dragenter", funcs.enter) toggle(cm.display.scroller, "dragover", funcs.over) diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js index 51597d19fa..80e91f847f 100644 --- a/src/input/ContentEditableInput.js +++ b/src/input/ContentEditableInput.js @@ -25,8 +25,8 @@ export default function ContentEditableInput(cm) { ContentEditableInput.prototype = copyObj({ init: function(display) { - var input = this, cm = input.cm - var div = input.div = display.lineDiv + let input = this, cm = input.cm + let div = input.div = display.lineDiv disableBrowserMagic(div, cm.options.spellcheck) on(div, "paste", function(e) { @@ -38,12 +38,12 @@ ContentEditableInput.prototype = copyObj({ }) on(div, "compositionstart", function(e) { - var data = e.data + let data = e.data input.composing = {sel: cm.doc.sel, data: data, startData: data} if (!data) return - var prim = cm.doc.sel.primary() - var line = cm.getLine(prim.head.line) - var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length)) + let prim = cm.doc.sel.primary() + let line = cm.getLine(prim.head.line) + let found = line.indexOf(data, Math.max(0, prim.head.ch - data.length)) if (found > -1 && found <= prim.head.ch) input.composing.sel = simpleSelection(Pos(prim.head.line, found), Pos(prim.head.line, found + data.length)) @@ -52,7 +52,7 @@ ContentEditableInput.prototype = copyObj({ input.composing.data = e.data }) on(div, "compositionend", function(e) { - var ours = input.composing + let ours = input.composing if (!ours) return if (e.data != ours.startData && !/\u200b/.test(e.data)) ours.data = e.data @@ -85,7 +85,7 @@ ContentEditableInput.prototype = copyObj({ } else if (!cm.options.lineWiseCopyCut) { return } else { - var ranges = copyableRanges(cm) + let ranges = copyableRanges(cm) setLastCopied({lineWise: true, text: ranges.text}) if (e.type == "cut") { cm.operation(function() { @@ -96,7 +96,7 @@ ContentEditableInput.prototype = copyObj({ } if (e.clipboardData) { e.clipboardData.clearData() - var content = lastCopied.text.join("\n") + let content = lastCopied.text.join("\n") // iOS exposes the clipboard API, but seems to discard content inserted into it e.clipboardData.setData("Text", content) if (e.clipboardData.getData("Text") == content) { @@ -105,10 +105,10 @@ ContentEditableInput.prototype = copyObj({ } } // Old-fashioned briefly-focus-a-textarea hack - var kludge = hiddenTextarea(), te = kludge.firstChild + let kludge = hiddenTextarea(), te = kludge.firstChild cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild) te.value = lastCopied.text.join("\n") - var hadFocus = document.activeElement + let hadFocus = document.activeElement selectInput(te) setTimeout(function() { cm.display.lineSpace.removeChild(kludge) @@ -121,7 +121,7 @@ ContentEditableInput.prototype = copyObj({ }, prepareSelection: function() { - var result = prepareSelection(this.cm, false) + let result = prepareSelection(this.cm, false) result.focus = this.cm.state.focused return result }, @@ -133,29 +133,30 @@ ContentEditableInput.prototype = copyObj({ }, showPrimarySelection: function() { - var sel = window.getSelection(), prim = this.cm.doc.sel.primary() - var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset) - var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset) + let sel = window.getSelection(), prim = this.cm.doc.sel.primary() + let curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset) + let curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset) if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad && cmp(minPos(curAnchor, curFocus), prim.from()) == 0 && cmp(maxPos(curAnchor, curFocus), prim.to()) == 0) return - var start = posToDOM(this.cm, prim.from()) - var end = posToDOM(this.cm, prim.to()) + let start = posToDOM(this.cm, prim.from()) + let end = posToDOM(this.cm, prim.to()) if (!start && !end) return - var view = this.cm.display.view - var old = sel.rangeCount && sel.getRangeAt(0) + let view = this.cm.display.view + let old = sel.rangeCount && sel.getRangeAt(0) if (!start) { start = {node: view[0].measure.map[2], offset: 0} } else if (!end) { // FIXME dangerously hacky - var measure = view[view.length - 1].measure - var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map + let measure = view[view.length - 1].measure + let map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]} } - try { var rng = range(start.node, start.offset, end.offset, end.node) } + let rng + try { rng = range(start.node, start.offset, end.offset, end.node) } catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible if (rng) { if (!gecko && this.cm.state.focused) { @@ -172,7 +173,7 @@ ContentEditableInput.prototype = copyObj({ }, startGracePeriod: function() { - var input = this + let input = this clearTimeout(this.gracePeriod) this.gracePeriod = setTimeout(function() { input.gracePeriod = false @@ -187,15 +188,15 @@ ContentEditableInput.prototype = copyObj({ }, rememberSelection: function() { - var sel = window.getSelection() + let sel = window.getSelection() this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset }, selectionInEditor: function() { - var sel = window.getSelection() + let sel = window.getSelection() if (!sel.rangeCount) return false - var node = sel.getRangeAt(0).commonAncestorContainer + let node = sel.getRangeAt(0).commonAncestorContainer return contains(this.div, node) }, @@ -208,7 +209,7 @@ ContentEditableInput.prototype = copyObj({ supportsTouch: function() { return true }, receivedFocus: function() { - var input = this + let input = this if (this.selectionInEditor()) this.pollSelection() else @@ -224,17 +225,17 @@ ContentEditableInput.prototype = copyObj({ }, selectionChanged: function() { - var sel = window.getSelection() + let sel = window.getSelection() return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset || sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset }, pollSelection: function() { if (!this.composing && !this.gracePeriod && this.selectionChanged()) { - var sel = window.getSelection(), cm = this.cm + let sel = window.getSelection(), cm = this.cm this.rememberSelection() - var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset) - var head = domToPos(cm, sel.focusNode, sel.focusOffset) + let anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset) + let head = domToPos(cm, sel.focusNode, sel.focusOffset) if (anchor && head) runInOp(cm, function() { setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll) if (anchor.bad || head.bad) cm.curOp.selectionChanged = true @@ -243,41 +244,42 @@ ContentEditableInput.prototype = copyObj({ }, pollContent: function() { - var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary() - var from = sel.from(), to = sel.to() + let cm = this.cm, display = cm.display, sel = cm.doc.sel.primary() + let from = sel.from(), to = sel.to() if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false - var fromIndex + let fromIndex, fromLine, fromNode if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) { - var fromLine = lineNo(display.view[0].line) - var fromNode = display.view[0].node + fromLine = lineNo(display.view[0].line) + fromNode = display.view[0].node } else { - var fromLine = lineNo(display.view[fromIndex].line) - var fromNode = display.view[fromIndex - 1].node.nextSibling + fromLine = lineNo(display.view[fromIndex].line) + fromNode = display.view[fromIndex - 1].node.nextSibling } - var toIndex = findViewIndex(cm, to.line) + let toIndex = findViewIndex(cm, to.line) + let toLine, toNode if (toIndex == display.view.length - 1) { - var toLine = display.viewTo - 1 - var toNode = display.lineDiv.lastChild + toLine = display.viewTo - 1 + toNode = display.lineDiv.lastChild } else { - var toLine = lineNo(display.view[toIndex + 1].line) - 1 - var toNode = display.view[toIndex + 1].node.previousSibling + toLine = lineNo(display.view[toIndex + 1].line) - 1 + toNode = display.view[toIndex + 1].node.previousSibling } - var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine)) - var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length)) + let newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine)) + let oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length)) while (newText.length > 1 && oldText.length > 1) { if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine-- } else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++ } else break } - var cutFront = 0, cutEnd = 0 - var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length) + let cutFront = 0, cutEnd = 0 + let newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length) while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront)) ++cutFront - var newBot = lst(newText), oldBot = lst(oldText) - var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0), + let newBot = lst(newText), oldBot = lst(oldText) + let maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0), oldBot.length - (oldText.length == 1 ? cutFront : 0)) while (cutEnd < maxCutEnd && newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) @@ -286,8 +288,8 @@ ContentEditableInput.prototype = copyObj({ newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd) newText[0] = newText[0].slice(cutFront) - var chFrom = Pos(fromLine, cutFront) - var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0) + let chFrom = Pos(fromLine, cutFront) + let chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0) if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) { replaceRange(cm.doc, newText, chFrom, chTo, "+input") return true @@ -335,17 +337,17 @@ ContentEditableInput.prototype = copyObj({ }, ContentEditableInput.prototype) function posToDOM(cm, pos) { - var view = findViewForLine(cm, pos.line) + let view = findViewForLine(cm, pos.line) if (!view || view.hidden) return null - var line = getLine(cm.doc, pos.line) - var info = mapFromLineView(view, line, pos.line) + let line = getLine(cm.doc, pos.line) + let info = mapFromLineView(view, line, pos.line) - var order = getOrder(line), side = "left" + let order = getOrder(line), side = "left" if (order) { - var partPos = getBidiPartAt(order, pos.ch) + let partPos = getBidiPartAt(order, pos.ch) side = partPos % 2 ? "right" : "left" } - var result = nodeAndOffsetInLineMap(info.map, pos.ch, side) + let result = nodeAndOffsetInLineMap(info.map, pos.ch, side) result.offset = result.collapse == "right" ? result.end : result.start return result } @@ -353,30 +355,30 @@ function posToDOM(cm, pos) { function badPos(pos, bad) { if (bad) pos.bad = true; return pos } function domTextBetween(cm, from, to, fromLine, toLine) { - var text = "", closing = false, lineSep = cm.doc.lineSeparator() + let text = "", closing = false, lineSep = cm.doc.lineSeparator() function recognizeMarker(id) { return function(marker) { return marker.id == id } } function walk(node) { if (node.nodeType == 1) { - var cmText = node.getAttribute("cm-text") + let cmText = node.getAttribute("cm-text") if (cmText != null) { if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "") text += cmText return } - var markerID = node.getAttribute("cm-marker"), range + let markerID = node.getAttribute("cm-marker"), range if (markerID) { - var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID)) + let found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID)) if (found.length && (range = found[0].find())) text += getBetween(cm.doc, range.from, range.to).join(lineSep) return } if (node.getAttribute("contenteditable") == "false") return - for (var i = 0; i < node.childNodes.length; i++) + for (let i = 0; i < node.childNodes.length; i++) walk(node.childNodes[i]) if (/^(pre|div|p)$/i.test(node.nodeName)) closing = true } else if (node.nodeType == 3) { - var val = node.nodeValue + let val = node.nodeValue if (!val) return if (closing) { text += lineSep @@ -394,7 +396,7 @@ function domTextBetween(cm, from, to, fromLine, toLine) { } function domToPos(cm, node, offset) { - var lineNode + let lineNode if (node == cm.display.lineDiv) { lineNode = cm.display.lineDiv.childNodes[offset] if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true) @@ -405,60 +407,60 @@ function domToPos(cm, node, offset) { if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break } } - for (var i = 0; i < cm.display.view.length; i++) { - var lineView = cm.display.view[i] + for (let i = 0; i < cm.display.view.length; i++) { + let lineView = cm.display.view[i] if (lineView.node == lineNode) return locateNodeInLineView(lineView, node, offset) } } function locateNodeInLineView(lineView, node, offset) { - var wrapper = lineView.text.firstChild, bad = false + let wrapper = lineView.text.firstChild, bad = false if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true) if (node == wrapper) { bad = true node = wrapper.childNodes[offset] offset = 0 if (!node) { - var line = lineView.rest ? lst(lineView.rest) : lineView.line + let line = lineView.rest ? lst(lineView.rest) : lineView.line return badPos(Pos(lineNo(line), line.text.length), bad) } } - var textNode = node.nodeType == 3 ? node : null, topNode = node + let textNode = node.nodeType == 3 ? node : null, topNode = node if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) { textNode = node.firstChild if (offset) offset = textNode.nodeValue.length } while (topNode.parentNode != wrapper) topNode = topNode.parentNode - var measure = lineView.measure, maps = measure.maps + let measure = lineView.measure, maps = measure.maps function find(textNode, topNode, offset) { - for (var i = -1; i < (maps ? maps.length : 0); i++) { - var map = i < 0 ? measure.map : maps[i] - for (var j = 0; j < map.length; j += 3) { - var curNode = map[j + 2] + for (let i = -1; i < (maps ? maps.length : 0); i++) { + let map = i < 0 ? measure.map : maps[i] + for (let j = 0; j < map.length; j += 3) { + let curNode = map[j + 2] if (curNode == textNode || curNode == topNode) { - var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]) - var ch = map[j] + offset + let line = lineNo(i < 0 ? lineView.line : lineView.rest[i]) + let ch = map[j] + offset if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)] return Pos(line, ch) } } } } - var found = find(textNode, topNode, offset) + let found = find(textNode, topNode, offset) if (found) return badPos(found, bad) // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems - for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) { + for (let after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) { found = find(after, after.firstChild, 0) if (found) return badPos(Pos(found.line, found.ch - dist), bad) else dist += after.textContent.length } - for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) { + for (let before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) { found = find(before, before.firstChild, -1) if (found) return badPos(Pos(found.line, found.ch + dist), bad) diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js index 4c08f37797..e244a2d168 100644 --- a/src/input/TextareaInput.js +++ b/src/input/TextareaInput.js @@ -34,13 +34,13 @@ export default function TextareaInput(cm) { TextareaInput.prototype = copyObj({ init: function(display) { - var input = this, cm = this.cm + let input = this, cm = this.cm // Wraps and hides input textarea - var div = this.wrapper = hiddenTextarea() + let div = this.wrapper = hiddenTextarea() // The semihidden textarea that is focused when the editor is // focused, and receives input. - var te = this.textarea = div.firstChild + let te = this.textarea = div.firstChild display.wrapper.insertBefore(div, display.wrapper.firstChild) // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore) @@ -71,7 +71,7 @@ TextareaInput.prototype = copyObj({ } else if (!cm.options.lineWiseCopyCut) { return } else { - var ranges = copyableRanges(cm) + let ranges = copyableRanges(cm) setLastCopied({lineWise: true, text: ranges.text}) if (e.type == "cut") { cm.setSelections(ranges.ranges, null, sel_dontScroll) @@ -98,7 +98,7 @@ TextareaInput.prototype = copyObj({ }) on(te, "compositionstart", function() { - var start = cm.getCursor("from") + let start = cm.getCursor("from") if (input.composing) input.composing.range.clear() input.composing = { start: start, @@ -116,13 +116,13 @@ TextareaInput.prototype = copyObj({ prepareSelection: function() { // Redraw the selection and/or cursor - var cm = this.cm, display = cm.display, doc = cm.doc - var result = prepareSelection(cm) + let cm = this.cm, display = cm.display, doc = cm.doc + let result = prepareSelection(cm) // Move the hidden textarea near the cursor to prevent scrolling artifacts if (cm.options.moveInputWithCursor) { - var headPos = cursorCoords(cm, doc.sel.primary().head, "div") - var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect() + let headPos = cursorCoords(cm, doc.sel.primary().head, "div") + let wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect() result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10, headPos.top + lineOff.top - wrapOff.top)) result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10, @@ -133,7 +133,7 @@ TextareaInput.prototype = copyObj({ }, showSelection: function(drawn) { - var cm = this.cm, display = cm.display + let cm = this.cm, display = cm.display removeChildrenAndAdd(display.cursorDiv, drawn.cursors) removeChildrenAndAdd(display.selectionDiv, drawn.selection) if (drawn.teTop != null) { @@ -146,13 +146,13 @@ TextareaInput.prototype = copyObj({ // when not typing and nothing is selected) reset: function(typing) { if (this.contextMenuPending) return - var minimal, selected, cm = this.cm, doc = cm.doc + let minimal, selected, cm = this.cm, doc = cm.doc if (cm.somethingSelected()) { this.prevInput = "" - var range = doc.sel.primary() + let range = doc.sel.primary() minimal = hasCopyEvent && (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000) - var content = minimal ? "-" : selected || cm.getSelection() + let content = minimal ? "-" : selected || cm.getSelection() this.textarea.value = content if (cm.state.focused) selectInput(this.textarea) if (ie && ie_version >= 9) this.hasSelection = content @@ -185,7 +185,7 @@ TextareaInput.prototype = copyObj({ // Poll for input changes, using the normal rate of polling. This // runs as long as the editor is focused. slowPoll: function() { - var input = this + let input = this if (input.pollingFast) return input.polling.set(this.cm.options.pollInterval, function() { input.poll() @@ -197,10 +197,10 @@ TextareaInput.prototype = copyObj({ // something in the input textarea, we poll faster, to ensure that // the change appears on the screen quickly. fastPoll: function() { - var missed = false, input = this + let missed = false, input = this input.pollingFast = true function p() { - var changed = input.poll() + let changed = input.poll() if (!changed && !missed) {missed = true; input.polling.set(60, p)} else {input.pollingFast = false; input.slowPoll()} } @@ -214,7 +214,7 @@ TextareaInput.prototype = copyObj({ // seen text (can be empty), which is stored in prevInput (we must // not reset the textarea when typing, because that breaks IME). poll: function() { - var cm = this.cm, input = this.textarea, prevInput = this.prevInput + let cm = this.cm, input = this.textarea, prevInput = this.prevInput // Since this is called a *lot*, try to bail out as cheaply as // possible when it is clear that nothing happened. hasSelection // will be the case when there is a lot of text in the textarea, @@ -224,7 +224,7 @@ TextareaInput.prototype = copyObj({ cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq) return false - var text = input.value + let text = input.value // If nothing changed, bail. if (text == prevInput && !cm.somethingSelected()) return false // Work around nonsensical selection resetting in IE9/10, and @@ -237,15 +237,15 @@ TextareaInput.prototype = copyObj({ } if (cm.doc.sel == cm.display.selForContextMenu) { - var first = text.charCodeAt(0) + let first = text.charCodeAt(0) if (first == 0x200b && !prevInput) prevInput = "\u200b" if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo") } } // Find the part of the input that is actually new - var same = 0, l = Math.min(prevInput.length, text.length) + let same = 0, l = Math.min(prevInput.length, text.length) while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same - var self = this + let self = this runInOp(cm, function() { applyTextInput(cm, text.slice(same), prevInput.length - same, null, self.composing ? "*compose" : null) @@ -273,24 +273,25 @@ TextareaInput.prototype = copyObj({ }, onContextMenu: function(e) { - var input = this, cm = input.cm, display = cm.display, te = input.textarea - var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop + let input = this, cm = input.cm, display = cm.display, te = input.textarea + let pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop if (!pos || presto) return // Opera is difficult. // Reset the current text selection only if the click is done outside of the selection // and 'resetSelectionOnContextMenu' option is true. - var reset = cm.options.resetSelectionOnContextMenu + let reset = cm.options.resetSelectionOnContextMenu if (reset && cm.doc.sel.contains(pos) == -1) operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll) - var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText + let oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText input.wrapper.style.cssText = "position: absolute" - var wrapperBox = input.wrapper.getBoundingClientRect() + let wrapperBox = input.wrapper.getBoundingClientRect() te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) + "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " + (ie ? "rgba(255, 255, 255, .05)" : "transparent") + "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);" - if (webkit) var oldScrollY = window.scrollY // Work around Chrome issue (#2712) + let oldScrollY + if (webkit) oldScrollY = window.scrollY // Work around Chrome issue (#2712) display.input.focus() if (webkit) window.scrollTo(null, oldScrollY) display.input.reset() @@ -305,8 +306,8 @@ TextareaInput.prototype = copyObj({ // it got selected. function prepareSelectAllHack() { if (te.selectionStart != null) { - var selected = cm.somethingSelected() - var extval = "\u200b" + (selected ? te.value : "") + let selected = cm.somethingSelected() + let extval = "\u200b" + (selected ? te.value : "") te.value = "\u21da" // Used to catch context-menu undo te.value = extval input.prevInput = selected ? "" : "\u200b" @@ -325,7 +326,7 @@ TextareaInput.prototype = copyObj({ // Try to detect the user choosing select-all if (te.selectionStart != null) { if (!ie || (ie && ie_version < 9)) prepareSelectAllHack() - var i = 0, poll = function() { + let i = 0, poll = function() { if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 && te.selectionEnd > 0 && input.prevInput == "\u200b") operation(cm, selectAll)(cm) @@ -339,7 +340,7 @@ TextareaInput.prototype = copyObj({ if (ie && ie_version >= 9) prepareSelectAllHack() if (captureRightClick) { e_stop(e) - var mouseup = function() { + let mouseup = function() { off(window, "mouseup", mouseup) setTimeout(rehide, 20) } diff --git a/src/input/indent.js b/src/input/indent.js index f0fc78fd05..2c1755eb9f 100644 --- a/src/input/indent.js +++ b/src/input/indent.js @@ -12,7 +12,7 @@ import { countColumn, Pass, spaceStr } from "../util/misc" // lines are not indented, and places where the mode returns Pass // are left alone. export function indentLine(cm, n, how, aggressive) { - var doc = cm.doc, state + let doc = cm.doc, state if (how == null) how = "add" if (how == "smart") { // Fall back to "prev" when the mode doesn't have an indentation @@ -21,10 +21,10 @@ export function indentLine(cm, n, how, aggressive) { else state = getStateBefore(cm, n) } - var tabSize = cm.options.tabSize - var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize) + let tabSize = cm.options.tabSize + let line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize) if (line.stateAfter) line.stateAfter = null - var curSpaceString = line.text.match(/^\s*/)[0], indentation + let curSpaceString = line.text.match(/^\s*/)[0], indentation if (!aggressive && !/\S/.test(line.text)) { indentation = 0 how = "not" @@ -47,9 +47,9 @@ export function indentLine(cm, n, how, aggressive) { } indentation = Math.max(0, indentation) - var indentString = "", pos = 0 + let indentString = "", pos = 0 if (cm.options.indentWithTabs) - for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t"} + for (let i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t"} if (pos < indentation) indentString += spaceStr(indentation - pos) if (indentString != curSpaceString) { @@ -59,10 +59,10 @@ export function indentLine(cm, n, how, aggressive) { } else { // Ensure that, if the cursor was in the whitespace at the start // of the line, it is moved to the end of that space. - for (var i = 0; i < doc.sel.ranges.length; i++) { - var range = doc.sel.ranges[i] + for (let i = 0; i < doc.sel.ranges.length; i++) { + let range = doc.sel.ranges[i] if (range.head.line == n && range.head.ch < curSpaceString.length) { - var pos = Pos(n, curSpaceString.length) + let pos = Pos(n, curSpaceString.length) replaceOneSelection(doc, i, new Range(pos, pos)) break } diff --git a/src/input/input.js b/src/input/input.js index a084e08f8b..6cc3e9111f 100644 --- a/src/input/input.js +++ b/src/input/input.js @@ -13,25 +13,25 @@ import { indentLine } from "./indent" // This will be set to a {lineWise: bool, text: [string]} object, so // that, when pasting, we know what kind of selections the copied // text was made out of. -export var lastCopied = null +export let lastCopied = null export function setLastCopied(newLastCopied) { lastCopied = newLastCopied } export function applyTextInput(cm, inserted, deleted, sel, origin) { - var doc = cm.doc + let doc = cm.doc cm.display.shift = false if (!sel) sel = doc.sel - var paste = cm.state.pasteIncoming || origin == "paste" - var textLines = doc.splitLines(inserted), multiPaste = null + let paste = cm.state.pasteIncoming || origin == "paste" + let textLines = doc.splitLines(inserted), multiPaste = null // When pasing N lines into N selections, insert one line per selection if (paste && sel.ranges.length > 1) { if (lastCopied && lastCopied.text.join("\n") == inserted) { if (sel.ranges.length % lastCopied.text.length == 0) { multiPaste = [] - for (var i = 0; i < lastCopied.text.length; i++) + for (let i = 0; i < lastCopied.text.length; i++) multiPaste.push(doc.splitLines(lastCopied.text[i])) } } else if (textLines.length == sel.ranges.length) { @@ -39,10 +39,11 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) { } } + let updateInput // Normal behavior is to insert the new text into every selection - for (var i = sel.ranges.length - 1; i >= 0; i--) { - var range = sel.ranges[i] - var from = range.from(), to = range.to() + for (let i = sel.ranges.length - 1; i >= 0; i--) { + let range = sel.ranges[i] + let from = range.from(), to = range.to() if (range.empty()) { if (deleted && deleted > 0) // Handle deletion from = Pos(from.line, from.ch - deleted) @@ -51,8 +52,8 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) { else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted) from = to = Pos(from.line, 0) } - var updateInput = cm.curOp.updateInput - var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines, + updateInput = cm.curOp.updateInput + let changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines, origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")} makeChange(cm.doc, changeEvent) signalLater(cm, "inputRead", cm, changeEvent) @@ -67,7 +68,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) { } export function handlePaste(e, cm) { - var pasted = e.clipboardData && e.clipboardData.getData("Text") + let pasted = e.clipboardData && e.clipboardData.getData("Text") if (pasted) { e.preventDefault() if (!cm.isReadOnly() && !cm.options.disableInput) @@ -79,15 +80,15 @@ export function handlePaste(e, cm) { export function triggerElectric(cm, inserted) { // When an 'electric' character is inserted, immediately trigger a reindent if (!cm.options.electricChars || !cm.options.smartIndent) return - var sel = cm.doc.sel + let sel = cm.doc.sel - for (var i = sel.ranges.length - 1; i >= 0; i--) { - var range = sel.ranges[i] + for (let i = sel.ranges.length - 1; i >= 0; i--) { + let range = sel.ranges[i] if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue - var mode = cm.getModeAt(range.head) - var indented = false + let mode = cm.getModeAt(range.head) + let indented = false if (mode.electricChars) { - for (var j = 0; j < mode.electricChars.length; j++) + for (let j = 0; j < mode.electricChars.length; j++) if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) { indented = indentLine(cm, range.head.line, "smart") break @@ -101,10 +102,10 @@ export function triggerElectric(cm, inserted) { } export function copyableRanges(cm) { - var text = [], ranges = [] - for (var i = 0; i < cm.doc.sel.ranges.length; i++) { - var line = cm.doc.sel.ranges[i].head.line - var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)} + let text = [], ranges = [] + for (let i = 0; i < cm.doc.sel.ranges.length; i++) { + let line = cm.doc.sel.ranges[i].head.line + let lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)} ranges.push(lineRange) text.push(cm.getRange(lineRange.anchor, lineRange.head)) } @@ -118,8 +119,8 @@ export function disableBrowserMagic(field, spellcheck) { } export function hiddenTextarea() { - var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none") - var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;") + let te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none") + let div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;") // The textarea is kept positioned near the cursor to prevent the // fact that it'll be scrolled into view on input from scrolling // our fake cursor out of view. On webkit, when wrap=off, paste is diff --git a/src/input/keymap.js b/src/input/keymap.js index 0f5941e81a..1b9564ef4f 100644 --- a/src/input/keymap.js +++ b/src/input/keymap.js @@ -3,7 +3,7 @@ import { map } from "../util/misc" import { keyNames } from "./keynames" -export var keyMap = {} +export let keyMap = {} keyMap.basic = { "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown", @@ -49,10 +49,11 @@ keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault // KEYMAP DISPATCH function normalizeKeyName(name) { - var parts = name.split(/-(?!$)/), name = parts[parts.length - 1] - var alt, ctrl, shift, cmd - for (var i = 0; i < parts.length - 1; i++) { - var mod = parts[i] + let parts = name.split(/-(?!$)/) + name = parts[parts.length - 1] + let alt, ctrl, shift, cmd + for (let i = 0; i < parts.length - 1; i++) { + let mod = parts[i] if (/^(cmd|meta|m)$/i.test(mod)) cmd = true else if (/^a(lt)?$/i.test(mod)) alt = true else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true @@ -72,15 +73,15 @@ function normalizeKeyName(name) { // new normalized keymap, and then updates the old object to reflect // this. export function normalizeKeyMap(keymap) { - var copy = {} - for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) { - var value = keymap[keyname] + let copy = {} + for (let keyname in keymap) if (keymap.hasOwnProperty(keyname)) { + let value = keymap[keyname] if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue if (value == "...") { delete keymap[keyname]; continue } - var keys = map(keyname.split(" "), normalizeKeyName) - for (var i = 0; i < keys.length; i++) { - var val, name + let keys = map(keyname.split(" "), normalizeKeyName) + for (let i = 0; i < keys.length; i++) { + let val, name if (i == keys.length - 1) { name = keys.join(" ") val = value @@ -88,19 +89,19 @@ export function normalizeKeyMap(keymap) { name = keys.slice(0, i + 1).join(" ") val = "..." } - var prev = copy[name] + let prev = copy[name] if (!prev) copy[name] = val else if (prev != val) throw new Error("Inconsistent bindings for " + name) } delete keymap[keyname] } - for (var prop in copy) keymap[prop] = copy[prop] + for (let prop in copy) keymap[prop] = copy[prop] return keymap } export function lookupKey(key, map, handle, context) { map = getKeyMap(map) - var found = map.call ? map.call(key, context) : map[key] + let found = map.call ? map.call(key, context) : map[key] if (found === false) return "nothing" if (found === "...") return "multi" if (found != null && handle(found)) return "handled" @@ -108,8 +109,8 @@ export function lookupKey(key, map, handle, context) { if (map.fallthrough) { if (Object.prototype.toString.call(map.fallthrough) != "[object Array]") return lookupKey(key, map.fallthrough, handle, context) - for (var i = 0; i < map.fallthrough.length; i++) { - var result = lookupKey(key, map.fallthrough[i], handle, context) + for (let i = 0; i < map.fallthrough.length; i++) { + let result = lookupKey(key, map.fallthrough[i], handle, context) if (result) return result } } @@ -118,14 +119,14 @@ export function lookupKey(key, map, handle, context) { // Modifier key presses don't count as 'real' key presses for the // purpose of keymap fallthrough. export function isModifierKey(value) { - var name = typeof value == "string" ? value : keyNames[value.keyCode] + let name = typeof value == "string" ? value : keyNames[value.keyCode] return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod" } // Look up the name of a key as indicated by an event object. export function keyName(event, noShift) { if (presto && event.keyCode == 34 && event["char"]) return false - var base = keyNames[event.keyCode], name = base + let base = keyNames[event.keyCode], name = base if (name == null || event.altGraphKey) return false if (event.altKey && base != "Alt") name = "Alt-" + name if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name diff --git a/src/input/keynames.js b/src/input/keynames.js index 8cf11f38cd..66bc80010c 100644 --- a/src/input/keynames.js +++ b/src/input/keynames.js @@ -1,4 +1,4 @@ -export var keyNames = { +export let keyNames = { 3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt", 19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End", 36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert", @@ -10,8 +10,8 @@ export var keyNames = { } // Number keys -for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i) +for (let i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i) // Alphabetic keys -for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i) +for (let i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i) // Function keys -for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i +for (let i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i diff --git a/src/line/highlight.js b/src/line/highlight.js index 0632be6e3e..8fd6d47b99 100644 --- a/src/line/highlight.js +++ b/src/line/highlight.js @@ -12,20 +12,20 @@ import { clipPos } from "./pos" export function highlightLine(cm, line, state, forceToEnd) { // A styles array always starts with a number identifying the // mode/overlays that it is based on (for easy invalidation). - var st = [cm.state.modeGen], lineClasses = {} + let st = [cm.state.modeGen], lineClasses = {} // Compute the base array of styles runMode(cm, line.text, cm.doc.mode, state, function(end, style) { st.push(end, style) }, lineClasses, forceToEnd) // Run overlays, adjust style array. - for (var o = 0; o < cm.state.overlays.length; ++o) { - var overlay = cm.state.overlays[o], i = 1, at = 0 + for (let o = 0; o < cm.state.overlays.length; ++o) { + let overlay = cm.state.overlays[o], i = 1, at = 0 runMode(cm, line.text, overlay.mode, true, function(end, style) { - var start = i + let start = i // Ensure there's a token end at the current position, and that i points at it while (at < end) { - var i_end = st[i] + let i_end = st[i] if (i_end > end) st.splice(i, 1, end, st[i+1], i_end) i += 2 @@ -37,7 +37,7 @@ export function highlightLine(cm, line, state, forceToEnd) { i = start + 2 } else { for (; start < i; start += 2) { - var cur = st[start+1] + let cur = st[start+1] st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style } } @@ -49,8 +49,8 @@ export function highlightLine(cm, line, state, forceToEnd) { export function getLineStyles(cm, line, updateFrontier) { if (!line.styles || line.styles[0] != cm.state.modeGen) { - var state = getStateBefore(cm, lineNo(line)) - var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state) + let state = getStateBefore(cm, lineNo(line)) + let result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state) line.stateAfter = state line.styles = result.styles if (result.classes) line.styleClasses = result.classes @@ -61,14 +61,14 @@ export function getLineStyles(cm, line, updateFrontier) { } export function getStateBefore(cm, n, precise) { - var doc = cm.doc, display = cm.display + let doc = cm.doc, display = cm.display if (!doc.mode.startState) return true - var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter + let pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter if (!state) state = startState(doc.mode) else state = copyState(doc.mode, state) doc.iter(pos, n, function(line) { processLine(cm, line.text, state) - var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo + let save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo line.stateAfter = save ? copyState(doc.mode, state) : null ++pos }) @@ -80,8 +80,8 @@ export function getStateBefore(cm, n, precise) { // update state, but don't save a style array. Used for lines that // aren't currently visible. export function processLine(cm, text, state, startAt) { - var mode = cm.doc.mode - var stream = new StringStream(text, cm.options.tabSize) + let mode = cm.doc.mode + let stream = new StringStream(text, cm.options.tabSize) stream.start = stream.pos = startAt || 0 if (text == "") callBlankLine(mode, state) while (!stream.eol()) { @@ -93,14 +93,14 @@ export function processLine(cm, text, state, startAt) { function callBlankLine(mode, state) { if (mode.blankLine) return mode.blankLine(state) if (!mode.innerMode) return - var inner = innerMode(mode, state) + let inner = innerMode(mode, state) if (inner.mode.blankLine) return inner.mode.blankLine(inner.state) } export function readToken(mode, stream, state, inner) { - for (var i = 0; i < 10; i++) { + for (let i = 0; i < 10; i++) { if (inner) inner[0] = innerMode(mode, state).mode - var style = mode.token(stream, state) + let style = mode.token(stream, state) if (stream.pos > stream.start) return style } throw new Error("Mode " + mode.name + " failed to advance stream.") @@ -115,10 +115,10 @@ export function takeToken(cm, pos, precise, asArray) { state: copy ? copyState(doc.mode, state) : state} } - var doc = cm.doc, mode = doc.mode, style + let doc = cm.doc, mode = doc.mode, style pos = clipPos(doc, pos) - var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise) - var stream = new StringStream(line.text, cm.options.tabSize), tokens + let line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise) + let stream = new StringStream(line.text, cm.options.tabSize), tokens if (asArray) tokens = [] while ((asArray || stream.pos < pos.ch) && !stream.eol()) { stream.start = stream.pos @@ -130,10 +130,10 @@ export function takeToken(cm, pos, precise, asArray) { function extractLineClasses(type, output) { if (type) for (;;) { - var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/) + let lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/) if (!lineClass) break type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length) - var prop = lineClass[1] ? "bgClass" : "textClass" + let prop = lineClass[1] ? "bgClass" : "textClass" if (output[prop] == null) output[prop] = lineClass[2] else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop])) @@ -144,11 +144,11 @@ function extractLineClasses(type, output) { // Run the given mode's parser over a line, calling f for each token. function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) { - var flattenSpans = mode.flattenSpans + let flattenSpans = mode.flattenSpans if (flattenSpans == null) flattenSpans = cm.options.flattenSpans - var curStart = 0, curStyle = null - var stream = new StringStream(text, cm.options.tabSize), style - var inner = cm.options.addModeClass && [null] + let curStart = 0, curStyle = null + let stream = new StringStream(text, cm.options.tabSize), style + let inner = cm.options.addModeClass && [null] if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses) while (!stream.eol()) { if (stream.pos > cm.options.maxHighlightLength) { @@ -160,7 +160,7 @@ function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) { style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses) } if (inner) { - var mName = inner[0].name + let mName = inner[0].name if (mName) style = "m-" + (style ? mName + " " + style : mName) } if (!flattenSpans || curStyle != style) { @@ -176,7 +176,7 @@ function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) { // Webkit seems to refuse to render text nodes longer than 57444 // characters, and returns inaccurate measurements in nodes // starting around 5000 chars. - var pos = Math.min(stream.pos, curStart + 5000) + let pos = Math.min(stream.pos, curStart + 5000) f(pos, curStyle) curStart = pos } @@ -188,13 +188,13 @@ function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) { // smallest indentation, which tends to need the least context to // parse correctly. function findStartLine(cm, n, precise) { - var minindent, minline, doc = cm.doc - var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100) - for (var search = n; search > lim; --search) { + let minindent, minline, doc = cm.doc + let lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100) + for (let search = n; search > lim; --search) { if (search <= doc.first) return doc.first - var line = getLine(doc, search - 1) + let line = getLine(doc, search - 1) if (line.stateAfter && (!precise || search <= doc.frontier)) return search - var indented = countColumn(line.text, null, cm.options.tabSize) + let indented = countColumn(line.text, null, cm.options.tabSize) if (minline == null || minindent > indented) { minline = search - 1 minindent = indented diff --git a/src/line/line_data.js b/src/line/line_data.js index 8b247d5306..7a3a412211 100644 --- a/src/line/line_data.js +++ b/src/line/line_data.js @@ -31,7 +31,7 @@ export function updateLine(line, text, markedSpans, estimateHeight) { if (line.order != null) line.order = null detachMarkedSpans(line) attachMarkedSpans(line, markedSpans) - var estHeight = estimateHeight ? estimateHeight(line) : 1 + let estHeight = estimateHeight ? estimateHeight(line) : 1 if (estHeight != line.height) updateLineHeight(line, estHeight) } @@ -44,10 +44,10 @@ export function cleanUpLine(line) { // Convert a style as returned by a mode (either null, or a string // containing one or more styles) to a CSS style. This is cached, // and also looks for line-wide styles. -var styleToClassCache = {}, styleToClassCacheWithMode = {} +let styleToClassCache = {}, styleToClassCacheWithMode = {} function interpretTokenStyle(style, options) { if (!style || /^\s*$/.test(style)) return null - var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache + let cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache return cache[style] || (cache[style] = style.replace(/\S+/g, "cm-$&")) } @@ -61,16 +61,16 @@ export function buildLineContent(cm, lineView) { // The padding-right forces the element to have a 'border', which // is needed on Webkit to be able to get line-level bounding // rectangles for it (in measureChar). - var content = elt("span", null, null, webkit ? "padding-right: .1px" : null) - var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content, + let content = elt("span", null, null, webkit ? "padding-right: .1px" : null) + let builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content, col: 0, pos: 0, cm: cm, trailingSpace: false, splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")} lineView.measure = {} // Iterate over the logical lines that make up this visual line. - for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) { - var line = i ? lineView.rest[i - 1] : lineView.line, order + for (let i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) { + let line = i ? lineView.rest[i - 1] : lineView.line, order builder.pos = 0 builder.addToken = buildToken // Optionally wire in some hacks into the token-rendering @@ -78,7 +78,7 @@ export function buildLineContent(cm, lineView) { if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line))) builder.addToken = buildTokenBadBidi(builder.addToken, order) builder.map = [] - var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line) + let allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line) insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate)) if (line.styleClasses) { if (line.styleClasses.bgClass) @@ -103,7 +103,7 @@ export function buildLineContent(cm, lineView) { // See issue #2901 if (webkit) { - var last = builder.content.lastChild + let last = builder.content.lastChild if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab"))) builder.content.className = "cm-tab-wrap-hack" } @@ -116,7 +116,7 @@ export function buildLineContent(cm, lineView) { } export function defaultSpecialCharPlaceholder(ch) { - var token = elt("span", "\u2022", "cm-invalidchar") + let token = elt("span", "\u2022", "cm-invalidchar") token.title = "\\u" + ch.charCodeAt(0).toString(16) token.setAttribute("aria-label", token.title) return token @@ -126,22 +126,24 @@ export function defaultSpecialCharPlaceholder(ch) { // the line map. Takes care to render special characters separately. function buildToken(builder, text, style, startStyle, endStyle, title, css) { if (!text) return - var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text - var special = builder.cm.state.specialChars, mustWrap = false + let displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text + let special = builder.cm.state.specialChars, mustWrap = false + let content if (!special.test(text)) { builder.col += text.length - var content = document.createTextNode(displayText) + content = document.createTextNode(displayText) builder.map.push(builder.pos, builder.pos + text.length, content) if (ie && ie_version < 9) mustWrap = true builder.pos += text.length } else { - var content = document.createDocumentFragment(), pos = 0 + content = document.createDocumentFragment() + let pos = 0 while (true) { special.lastIndex = pos - var m = special.exec(text) - var skipped = m ? m.index - pos : text.length - pos + let m = special.exec(text) + let skipped = m ? m.index - pos : text.length - pos if (skipped) { - var txt = document.createTextNode(displayText.slice(pos, pos + skipped)) + let txt = document.createTextNode(displayText.slice(pos, pos + skipped)) if (ie && ie_version < 9) content.appendChild(elt("span", [txt])) else content.appendChild(txt) builder.map.push(builder.pos, builder.pos + skipped, txt) @@ -150,18 +152,19 @@ function buildToken(builder, text, style, startStyle, endStyle, title, css) { } if (!m) break pos += skipped + 1 + let txt if (m[0] == "\t") { - var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize - var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab")) + let tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize + txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab")) txt.setAttribute("role", "presentation") txt.setAttribute("cm-text", "\t") builder.col += tabWidth } else if (m[0] == "\r" || m[0] == "\n") { - var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar")) + txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar")) txt.setAttribute("cm-text", m[0]) builder.col += 1 } else { - var txt = builder.cm.options.specialCharPlaceholder(m[0]) + txt = builder.cm.options.specialCharPlaceholder(m[0]) txt.setAttribute("cm-text", m[0]) if (ie && ie_version < 9) content.appendChild(elt("span", [txt])) else content.appendChild(txt) @@ -173,10 +176,10 @@ function buildToken(builder, text, style, startStyle, endStyle, title, css) { } builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32 if (style || startStyle || endStyle || mustWrap || css) { - var fullStyle = style || "" + let fullStyle = style || "" if (startStyle) fullStyle += startStyle if (endStyle) fullStyle += endStyle - var token = elt("span", [content], fullStyle, css) + let token = elt("span", [content], fullStyle, css) if (title) token.title = title return builder.content.appendChild(token) } @@ -185,9 +188,9 @@ function buildToken(builder, text, style, startStyle, endStyle, title, css) { function splitSpaces(text, trailingBefore) { if (text.length > 1 && !/ /.test(text)) return text - var spaceBefore = trailingBefore, result = "" - for (var i = 0; i < text.length; i++) { - var ch = text.charAt(i) + let spaceBefore = trailingBefore, result = "" + for (let i = 0; i < text.length; i++) { + let ch = text.charAt(i) if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32)) ch = "\u00a0" result += ch @@ -201,11 +204,12 @@ function splitSpaces(text, trailingBefore) { function buildTokenBadBidi(inner, order) { return function(builder, text, style, startStyle, endStyle, title, css) { style = style ? style + " cm-force-border" : "cm-force-border" - var start = builder.pos, end = start + text.length + let start = builder.pos, end = start + text.length for (;;) { // Find the part that overlaps with the start of this text - for (var i = 0; i < order.length; i++) { - var part = order[i] + let part + for (let i = 0; i < order.length; i++) { + part = order[i] if (part.to > start && part.from <= start) break } if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css) @@ -218,7 +222,7 @@ function buildTokenBadBidi(inner, order) { } function buildCollapsedSpan(builder, size, marker, ignoreWidget) { - var widget = !ignoreWidget && marker.widgetNode + let widget = !ignoreWidget && marker.widgetNode if (widget) builder.map.push(builder.pos, builder.pos + size, widget) if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) { if (!widget) @@ -236,22 +240,22 @@ function buildCollapsedSpan(builder, size, marker, ignoreWidget) { // Outputs a number of spans to make up a line, taking highlighting // and marked text into account. function insertLineContent(line, builder, styles) { - var spans = line.markedSpans, allText = line.text, at = 0 + let spans = line.markedSpans, allText = line.text, at = 0 if (!spans) { - for (var i = 1; i < styles.length; i+=2) + for (let i = 1; i < styles.length; i+=2) builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options)) return } - var len = allText.length, pos = 0, i = 1, text = "", style, css - var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed + let len = allText.length, pos = 0, i = 1, text = "", style, css + let nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed for (;;) { if (nextChange == pos) { // Update current marker set spanStyle = spanEndStyle = spanStartStyle = title = css = "" collapsed = null; nextChange = Infinity - var foundBookmarks = [], endStyles - for (var j = 0; j < spans.length; ++j) { - var sp = spans[j], m = sp.marker + let foundBookmarks = [], endStyles + for (let j = 0; j < spans.length; ++j) { + let sp = spans[j], m = sp.marker if (m.type == "bookmark" && sp.from == pos && m.widgetNode) { foundBookmarks.push(m) } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) { @@ -270,10 +274,10 @@ function insertLineContent(line, builder, styles) { nextChange = sp.from } } - if (endStyles) for (var j = 0; j < endStyles.length; j += 2) + if (endStyles) for (let j = 0; j < endStyles.length; j += 2) if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j] - if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j) + if (!collapsed || collapsed.from == pos) for (let j = 0; j < foundBookmarks.length; ++j) buildCollapsedSpan(builder, 0, foundBookmarks[j]) if (collapsed && (collapsed.from || 0) == pos) { buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos, @@ -284,12 +288,12 @@ function insertLineContent(line, builder, styles) { } if (pos >= len) break - var upto = Math.min(len, nextChange) + let upto = Math.min(len, nextChange) while (true) { if (text) { - var end = pos + text.length + let end = pos + text.length if (!collapsed) { - var tokenText = end > upto ? text.slice(0, upto - pos) : text + let tokenText = end > upto ? text.slice(0, upto - pos) : text builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle, spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css) } @@ -320,9 +324,9 @@ export function LineView(doc, line, lineN) { // Create a range of LineView objects for the given lines. export function buildViewArray(cm, from, to) { - var array = [], nextPos - for (var pos = from; pos < to; pos = nextPos) { - var view = new LineView(cm.doc, getLine(cm.doc, pos), pos) + let array = [], nextPos + for (let pos = from; pos < to; pos = nextPos) { + let view = new LineView(cm.doc, getLine(cm.doc, pos), pos) nextPos = pos + view.size array.push(view) } diff --git a/src/line/pos.js b/src/line/pos.js index b5d2513abe..73b2e0b8e8 100644 --- a/src/line/pos.js +++ b/src/line/pos.js @@ -19,17 +19,18 @@ export function minPos(a, b) { return cmp(a, b) < 0 ? a : b } export function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))} export function clipPos(doc, pos) { if (pos.line < doc.first) return Pos(doc.first, 0) - var last = doc.first + doc.size - 1 + let last = doc.first + doc.size - 1 if (pos.line > last) return Pos(last, getLine(doc, last).text.length) return clipToLen(pos, getLine(doc, pos.line).text.length) } function clipToLen(pos, linelen) { - var ch = pos.ch + let ch = pos.ch if (ch == null || ch > linelen) return Pos(pos.line, linelen) else if (ch < 0) return Pos(pos.line, 0) else return pos } export function clipPosArray(doc, array) { - for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]) + let out = [] + for (let i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]) return out } diff --git a/src/line/saw_special_spans.js b/src/line/saw_special_spans.js index 0cf5ff320b..d315e7ba99 100644 --- a/src/line/saw_special_spans.js +++ b/src/line/saw_special_spans.js @@ -1,5 +1,5 @@ // Optimize some code when these features are not used. -export var sawReadOnlySpans = false, sawCollapsedSpans = false +export let sawReadOnlySpans = false, sawCollapsedSpans = false export function seeReadOnlySpans() { sawReadOnlySpans = true diff --git a/src/line/spans.js b/src/line/spans.js index fd9bd55408..63acacfc83 100644 --- a/src/line/spans.js +++ b/src/line/spans.js @@ -13,15 +13,16 @@ export function MarkedSpan(marker, from, to) { // Search an array of spans for a span matching the given marker. export function getMarkedSpanFor(spans, marker) { - if (spans) for (var i = 0; i < spans.length; ++i) { - var span = spans[i] + if (spans) for (let i = 0; i < spans.length; ++i) { + let span = spans[i] if (span.marker == marker) return span } } // Remove a span from an array, returning undefined if no spans are // left (we don't store arrays for lines without spans). export function removeMarkedSpan(spans, span) { - for (var r, i = 0; i < spans.length; ++i) + let r + for (let i = 0; i < spans.length; ++i) if (spans[i] != span) (r || (r = [])).push(spans[i]) return r } @@ -36,22 +37,24 @@ export function addMarkedSpan(line, span) { // character position, returning an array of remaining chunks (or // undefined if nothing remains). function markedSpansBefore(old, startCh, isInsert) { - if (old) for (var i = 0, nw; i < old.length; ++i) { - var span = old[i], marker = span.marker - var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh) + let nw + if (old) for (let i = 0; i < old.length; ++i) { + let span = old[i], marker = span.marker + let startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh) if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) { - var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh) + let endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh) ;(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to)) } } return nw } function markedSpansAfter(old, endCh, isInsert) { - if (old) for (var i = 0, nw; i < old.length; ++i) { - var span = old[i], marker = span.marker - var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh) + let nw + if (old) for (let i = 0; i < old.length; ++i) { + let span = old[i], marker = span.marker + let endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh) if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) { - var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh) + let startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh) ;(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh, span.to == null ? null : span.to - endCh)) } @@ -67,23 +70,23 @@ function markedSpansAfter(old, endCh, isInsert) { // arrays with one element for each line in (after) the change. export function stretchSpansOverChange(doc, change) { if (change.full) return null - var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans - var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans + let oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans + let oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans if (!oldFirst && !oldLast) return null - var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0 + let startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0 // Get the spans that 'stick out' on both sides - var first = markedSpansBefore(oldFirst, startCh, isInsert) - var last = markedSpansAfter(oldLast, endCh, isInsert) + let first = markedSpansBefore(oldFirst, startCh, isInsert) + let last = markedSpansAfter(oldLast, endCh, isInsert) // Next, merge those two ends - var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0) + let sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0) if (first) { // Fix up .to properties of first - for (var i = 0; i < first.length; ++i) { - var span = first[i] + for (let i = 0; i < first.length; ++i) { + let span = first[i] if (span.to == null) { - var found = getMarkedSpanFor(last, span.marker) + let found = getMarkedSpanFor(last, span.marker) if (!found) span.to = startCh else if (sameLine) span.to = found.to == null ? null : found.to + offset } @@ -91,11 +94,11 @@ export function stretchSpansOverChange(doc, change) { } if (last) { // Fix up .from in last (or move them into first in case of sameLine) - for (var i = 0; i < last.length; ++i) { - var span = last[i] + for (let i = 0; i < last.length; ++i) { + let span = last[i] if (span.to != null) span.to += offset if (span.from == null) { - var found = getMarkedSpanFor(first, span.marker) + let found = getMarkedSpanFor(first, span.marker) if (!found) { span.from = offset if (sameLine) (first || (first = [])).push(span) @@ -110,15 +113,15 @@ export function stretchSpansOverChange(doc, change) { if (first) first = clearEmptySpans(first) if (last && last != first) last = clearEmptySpans(last) - var newMarkers = [first] + let newMarkers = [first] if (!sameLine) { // Fill gap with whole-line-spans - var gap = change.text.length - 2, gapMarkers + let gap = change.text.length - 2, gapMarkers if (gap > 0 && first) - for (var i = 0; i < first.length; ++i) + for (let i = 0; i < first.length; ++i) if (first[i].to == null) (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null)) - for (var i = 0; i < gap; ++i) + for (let i = 0; i < gap; ++i) newMarkers.push(gapMarkers) newMarkers.push(last) } @@ -128,8 +131,8 @@ export function stretchSpansOverChange(doc, change) { // Remove spans that are empty and don't have a clearWhenEmpty // option of false. function clearEmptySpans(spans) { - for (var i = 0; i < spans.length; ++i) { - var span = spans[i] + for (let i = 0; i < spans.length; ++i) { + let span = spans[i] if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false) spans.splice(i--, 1) } @@ -139,22 +142,22 @@ function clearEmptySpans(spans) { // Used to 'clip' out readOnly ranges when making a change. export function removeReadOnlyRanges(doc, from, to) { - var markers = null + let markers = null doc.iter(from.line, to.line + 1, function(line) { - if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) { - var mark = line.markedSpans[i].marker + if (line.markedSpans) for (let i = 0; i < line.markedSpans.length; ++i) { + let mark = line.markedSpans[i].marker if (mark.readOnly && (!markers || indexOf(markers, mark) == -1)) (markers || (markers = [])).push(mark) } }) if (!markers) return null - var parts = [{from: from, to: to}] - for (var i = 0; i < markers.length; ++i) { - var mk = markers[i], m = mk.find(0) - for (var j = 0; j < parts.length; ++j) { - var p = parts[j] + let parts = [{from: from, to: to}] + for (let i = 0; i < markers.length; ++i) { + let mk = markers[i], m = mk.find(0) + for (let j = 0; j < parts.length; ++j) { + let p = parts[j] if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue - var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to) + let newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to) if (dfrom < 0 || !mk.inclusiveLeft && !dfrom) newParts.push({from: p.from, to: m.from}) if (dto > 0 || !mk.inclusiveRight && !dto) @@ -168,15 +171,15 @@ export function removeReadOnlyRanges(doc, from, to) { // Connect or disconnect spans from a line. export function detachMarkedSpans(line) { - var spans = line.markedSpans + let spans = line.markedSpans if (!spans) return - for (var i = 0; i < spans.length; ++i) + for (let i = 0; i < spans.length; ++i) spans[i].marker.detachLine(line) line.markedSpans = null } export function attachMarkedSpans(line, spans) { if (!spans) return - for (var i = 0; i < spans.length; ++i) + for (let i = 0; i < spans.length; ++i) spans[i].marker.attachLine(line) line.markedSpans = spans } @@ -190,12 +193,12 @@ function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 } // spans is larger (and thus includes the other). Falls back to // comparing ids when the spans cover exactly the same range. export function compareCollapsedMarkers(a, b) { - var lenDiff = a.lines.length - b.lines.length + let lenDiff = a.lines.length - b.lines.length if (lenDiff != 0) return lenDiff - var aPos = a.find(), bPos = b.find() - var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b) + let aPos = a.find(), bPos = b.find() + let fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b) if (fromCmp) return -fromCmp - var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b) + let toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b) if (toCmp) return toCmp return b.id - a.id } @@ -203,8 +206,8 @@ export function compareCollapsedMarkers(a, b) { // Find out whether a line ends or starts in a collapsed span. If // so, return the marker for that span. function collapsedSpanAtSide(line, start) { - var sps = sawCollapsedSpans && line.markedSpans, found - if (sps) for (var sp, i = 0; i < sps.length; ++i) { + let sps = sawCollapsedSpans && line.markedSpans, found + if (sps) for (let sp, i = 0; i < sps.length; ++i) { sp = sps[i] if (sp.marker.collapsed && (start ? sp.from : sp.to) == null && (!found || compareCollapsedMarkers(found, sp.marker) < 0)) @@ -219,14 +222,14 @@ export function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, fals // overlaps (covers the start or end, but not both) of a new span. // Such overlap is not allowed. export function conflictingCollapsedRange(doc, lineNo, from, to, marker) { - var line = getLine(doc, lineNo) - var sps = sawCollapsedSpans && line.markedSpans - if (sps) for (var i = 0; i < sps.length; ++i) { - var sp = sps[i] + let line = getLine(doc, lineNo) + let sps = sawCollapsedSpans && line.markedSpans + if (sps) for (let i = 0; i < sps.length; ++i) { + let sp = sps[i] if (!sp.marker.collapsed) continue - var found = sp.marker.find(0) - var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker) - var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker) + let found = sp.marker.find(0) + let fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker) + let toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker) if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) || fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0)) @@ -239,7 +242,7 @@ export function conflictingCollapsedRange(doc, lineNo, from, to, marker) { // visual line. This finds the start of the visual line that the // given line is part of (usually that is the line itself). export function visualLine(line) { - var merged + let merged while (merged = collapsedSpanAtStart(line)) line = merged.find(-1, true).line return line @@ -248,7 +251,7 @@ export function visualLine(line) { // Returns an array of logical lines that continue the visual line // started by the argument, or undefined if there are no such lines. export function visualLineContinued(line) { - var merged, lines + let merged, lines while (merged = collapsedSpanAtEnd(line)) { line = merged.find(1, true).line ;(lines || (lines = [])).push(line) @@ -259,7 +262,7 @@ export function visualLineContinued(line) { // Get the line number of the start of the visual line that the // given line number is part of. export function visualLineNo(doc, lineN) { - var line = getLine(doc, lineN), vis = visualLine(line) + let line = getLine(doc, lineN), vis = visualLine(line) if (line == vis) return lineN return lineNo(vis) } @@ -268,7 +271,7 @@ export function visualLineNo(doc, lineN) { // the given line. export function visualLineEndNo(doc, lineN) { if (lineN > doc.lastLine()) return lineN - var line = getLine(doc, lineN), merged + let line = getLine(doc, lineN), merged if (!lineIsHidden(doc, line)) return lineN while (merged = collapsedSpanAtEnd(line)) line = merged.find(1, true).line @@ -279,8 +282,8 @@ export function visualLineEndNo(doc, lineN) { // are part of a visual line that starts with another line, or when // they are entirely covered by collapsed, non-widget span. export function lineIsHidden(doc, line) { - var sps = sawCollapsedSpans && line.markedSpans - if (sps) for (var sp, i = 0; i < sps.length; ++i) { + let sps = sawCollapsedSpans && line.markedSpans + if (sps) for (let sp, i = 0; i < sps.length; ++i) { sp = sps[i] if (!sp.marker.collapsed) continue if (sp.from == null) return true @@ -291,12 +294,12 @@ export function lineIsHidden(doc, line) { } function lineIsHiddenInner(doc, line, span) { if (span.to == null) { - var end = span.marker.find(1, true) + let end = span.marker.find(1, true) return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker)) } if (span.marker.inclusiveRight && span.to == line.text.length) return true - for (var sp, i = 0; i < line.markedSpans.length; ++i) { + for (let sp, i = 0; i < line.markedSpans.length; ++i) { sp = line.markedSpans[i] if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to && (sp.to == null || sp.to != span.from) && @@ -309,15 +312,15 @@ function lineIsHiddenInner(doc, line, span) { export function heightAtLine(lineObj) { lineObj = visualLine(lineObj) - var h = 0, chunk = lineObj.parent - for (var i = 0; i < chunk.lines.length; ++i) { - var line = chunk.lines[i] + let h = 0, chunk = lineObj.parent + for (let i = 0; i < chunk.lines.length; ++i) { + let line = chunk.lines[i] if (line == lineObj) break else h += line.height } - for (var p = chunk.parent; p; chunk = p, p = chunk.parent) { - for (var i = 0; i < p.children.length; ++i) { - var cur = p.children[i] + for (let p = chunk.parent; p; chunk = p, p = chunk.parent) { + for (let i = 0; i < p.children.length; ++i) { + let cur = p.children[i] if (cur == chunk) break else h += cur.height } @@ -330,15 +333,15 @@ export function heightAtLine(lineObj) { // other lines onto it. export function lineLength(line) { if (line.height == 0) return 0 - var len = line.text.length, merged, cur = line + let len = line.text.length, merged, cur = line while (merged = collapsedSpanAtStart(cur)) { - var found = merged.find(0, true) + let found = merged.find(0, true) cur = found.from.line len += found.from.ch - found.to.ch } cur = line while (merged = collapsedSpanAtEnd(cur)) { - var found = merged.find(0, true) + let found = merged.find(0, true) len -= cur.text.length - found.from.ch cur = found.to.line len += cur.text.length - found.to.ch @@ -348,12 +351,12 @@ export function lineLength(line) { // Find the longest line in the document. export function findMaxLine(cm) { - var d = cm.display, doc = cm.doc + let d = cm.display, doc = cm.doc d.maxLine = getLine(doc, doc.first) d.maxLineLength = lineLength(d.maxLine) d.maxLineChanged = true doc.iter(function(line) { - var len = lineLength(line) + let len = lineLength(line) if (len > d.maxLineLength) { d.maxLineLength = len d.maxLine = line diff --git a/src/line/utils_line.js b/src/line/utils_line.js index 4e10a1d8d8..647c07791e 100644 --- a/src/line/utils_line.js +++ b/src/line/utils_line.js @@ -4,9 +4,10 @@ import { indexOf } from "../util/misc" export function getLine(doc, n) { n -= doc.first if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document.") - for (var chunk = doc; !chunk.lines;) { - for (var i = 0;; ++i) { - var child = chunk.children[i], sz = child.chunkSize() + let chunk = doc + while (!chunk.lines) { + for (let i = 0;; ++i) { + let child = chunk.children[i], sz = child.chunkSize() if (n < sz) { chunk = child; break } n -= sz } @@ -17,9 +18,9 @@ export function getLine(doc, n) { // Get the part of a document between two positions, as an array of // strings. export function getBetween(doc, start, end) { - var out = [], n = start.line + let out = [], n = start.line doc.iter(start.line, end.line + 1, function(line) { - var text = line.text + let text = line.text if (n == end.line) text = text.slice(0, end.ch) if (n == start.line) text = text.slice(start.ch) out.push(text) @@ -29,7 +30,7 @@ export function getBetween(doc, start, end) { } // Get the lines between from and to, as array of strings. export function getLines(doc, from, to) { - var out = [] + let out = [] doc.iter(from, to, function(line) { out.push(line.text) }) return out } @@ -37,17 +38,17 @@ export function getLines(doc, from, to) { // Update the height of a line, propagating the height change // upwards to parent nodes. export function updateLineHeight(line, height) { - var diff = height - line.height - if (diff) for (var n = line; n; n = n.parent) n.height += diff + let diff = height - line.height + if (diff) for (let n = line; n; n = n.parent) n.height += diff } // Given a line object, find its line number by walking up through // its parent links. export function lineNo(line) { if (line.parent == null) return null - var cur = line.parent, no = indexOf(cur.lines, line) - for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) { - for (var i = 0;; ++i) { + let cur = line.parent, no = indexOf(cur.lines, line) + for (let chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) { + for (let i = 0;; ++i) { if (chunk.children[i] == cur) break no += chunk.children[i].chunkSize() } @@ -58,18 +59,19 @@ export function lineNo(line) { // Find the line at the given vertical position, using the height // information in the document tree. export function lineAtHeight(chunk, h) { - var n = chunk.first + let n = chunk.first outer: do { - for (var i = 0; i < chunk.children.length; ++i) { - var child = chunk.children[i], ch = child.height + for (let i = 0; i < chunk.children.length; ++i) { + let child = chunk.children[i], ch = child.height if (h < ch) { chunk = child; continue outer } h -= ch n += child.chunkSize() } return n } while (!chunk.lines) - for (var i = 0; i < chunk.lines.length; ++i) { - var line = chunk.lines[i], lh = line.height + let i = 0 + for (; i < chunk.lines.length; ++i) { + let line = chunk.lines[i], lh = line.height if (h < lh) break h -= lh } diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js index 75011a34d3..63e3771b1f 100644 --- a/src/measurement/position_measurement.js +++ b/src/measurement/position_measurement.js @@ -18,9 +18,9 @@ export function paddingTop(display) {return display.lineSpace.offsetTop} export function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight} export function paddingH(display) { if (display.cachedPaddingH) return display.cachedPaddingH - var e = removeChildrenAndAdd(display.measure, elt("pre", "x")) - var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle - var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)} + let e = removeChildrenAndAdd(display.measure, elt("pre", "x")) + let style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle + let data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)} if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data return data } @@ -38,15 +38,15 @@ export function displayHeight(cm) { // line. When lineWrapping is on, there might be more than one // height. function ensureLineHeights(cm, lineView, rect) { - var wrapping = cm.options.lineWrapping - var curWidth = wrapping && displayWidth(cm) + let wrapping = cm.options.lineWrapping + let curWidth = wrapping && displayWidth(cm) if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) { - var heights = lineView.measure.heights = [] + let heights = lineView.measure.heights = [] if (wrapping) { lineView.measure.width = curWidth - var rects = lineView.text.firstChild.getClientRects() - for (var i = 0; i < rects.length - 1; i++) { - var cur = rects[i], next = rects[i + 1] + let rects = lineView.text.firstChild.getClientRects() + for (let i = 0; i < rects.length - 1; i++) { + let cur = rects[i], next = rects[i + 1] if (Math.abs(cur.bottom - next.bottom) > 2) heights.push((cur.bottom + next.top) / 2 - rect.top) } @@ -61,10 +61,10 @@ function ensureLineHeights(cm, lineView, rect) { export function mapFromLineView(lineView, line, lineN) { if (lineView.line == line) return {map: lineView.measure.map, cache: lineView.measure.cache} - for (var i = 0; i < lineView.rest.length; i++) + for (let i = 0; i < lineView.rest.length; i++) if (lineView.rest[i] == line) return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]} - for (var i = 0; i < lineView.rest.length; i++) + for (let i = 0; i < lineView.rest.length; i++) if (lineNo(lineView.rest[i]) > lineN) return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true} } @@ -73,10 +73,10 @@ export function mapFromLineView(lineView, line, lineN) { // when measurement is needed for a line that's not in the viewport. function updateExternalMeasurement(cm, line) { line = visualLine(line) - var lineN = lineNo(line) - var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN) + let lineN = lineNo(line) + let view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN) view.lineN = lineN - var built = view.built = buildLineContent(cm, view) + let built = view.built = buildLineContent(cm, view) view.text = built.pre removeChildrenAndAdd(cm.display.lineMeasure, built.pre) return view @@ -92,7 +92,7 @@ export function measureChar(cm, line, ch, bias) { export function findViewForLine(cm, lineN) { if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) return cm.display.view[findViewIndex(cm, lineN)] - var ext = cm.display.externalMeasured + let ext = cm.display.externalMeasured if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size) return ext } @@ -103,8 +103,8 @@ export function findViewForLine(cm, lineN) { // measurements in a row, can thus ensure that the set-up work is // only done once. function prepareMeasureForLine(cm, line) { - var lineN = lineNo(line) - var view = findViewForLine(cm, lineN) + let lineN = lineNo(line) + let view = findViewForLine(cm, lineN) if (view && !view.text) { view = null } else if (view && view.changes) { @@ -114,7 +114,7 @@ function prepareMeasureForLine(cm, line) { if (!view) view = updateExternalMeasurement(cm, line) - var info = mapFromLineView(view, line, lineN) + let info = mapFromLineView(view, line, lineN) return { line: line, view: view, rect: null, map: info.map, cache: info.cache, before: info.before, @@ -126,7 +126,7 @@ function prepareMeasureForLine(cm, line) { // actual character (or fetches it from the cache). function measureCharPrepared(cm, prepared, ch, bias, varHeight) { if (prepared.before) ch = -1 - var key = ch + (bias || ""), found + let key = ch + (bias || ""), found if (prepared.cache.hasOwnProperty(key)) { found = prepared.cache[key] } else { @@ -144,14 +144,15 @@ function measureCharPrepared(cm, prepared, ch, bias, varHeight) { bottom: varHeight ? found.rbottom : found.bottom} } -var nullRect = {left: 0, right: 0, top: 0, bottom: 0} +let nullRect = {left: 0, right: 0, top: 0, bottom: 0} export function nodeAndOffsetInLineMap(map, ch, bias) { - var node, start, end, collapse + let node, start, end, collapse, mStart, mEnd // First, search the line map for the text node corresponding to, // or closest to, the target character. - for (var i = 0; i < map.length; i += 3) { - var mStart = map[i], mEnd = map[i + 1] + for (let i = 0; i < map.length; i += 3) { + mStart = map[i] + mEnd = map[i + 1] if (ch < mStart) { start = 0; end = 1 collapse = "left" @@ -184,22 +185,22 @@ export function nodeAndOffsetInLineMap(map, ch, bias) { } function getUsefulRect(rects, bias) { - var rect = nullRect - if (bias == "left") for (var i = 0; i < rects.length; i++) { + let rect = nullRect + if (bias == "left") for (let i = 0; i < rects.length; i++) { if ((rect = rects[i]).left != rect.right) break - } else for (var i = rects.length - 1; i >= 0; i--) { + } else for (let i = rects.length - 1; i >= 0; i--) { if ((rect = rects[i]).left != rect.right) break } return rect } function measureCharInner(cm, prepared, ch, bias) { - var place = nodeAndOffsetInLineMap(prepared.map, ch, bias) - var node = place.node, start = place.start, end = place.end, collapse = place.collapse + let place = nodeAndOffsetInLineMap(prepared.map, ch, bias) + let node = place.node, start = place.start, end = place.end, collapse = place.collapse - var rect + let rect if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates. - for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned + for (let i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) @@ -214,27 +215,28 @@ function measureCharInner(cm, prepared, ch, bias) { if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect) } else { // If it is a widget, simply get the box for the whole widget. if (start > 0) collapse = bias = "right" - var rects + let rects if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1) rect = rects[bias == "right" ? rects.length - 1 : 0] else rect = node.getBoundingClientRect() } if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) { - var rSpan = node.parentNode.getClientRects()[0] + let rSpan = node.parentNode.getClientRects()[0] if (rSpan) rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom} else rect = nullRect } - var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top - var mid = (rtop + rbot) / 2 - var heights = prepared.view.measure.heights - for (var i = 0; i < heights.length - 1; i++) + let rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top + let mid = (rtop + rbot) / 2 + let heights = prepared.view.measure.heights + let i = 0 + for (; i < heights.length - 1; i++) if (mid < heights[i]) break - var top = i ? heights[i - 1] : 0, bot = heights[i] - var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left, + let top = i ? heights[i - 1] : 0, bot = heights[i] + let result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left, right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left, top: top, bottom: bot} if (!rect.left && !rect.right) result.bogus = true @@ -249,8 +251,8 @@ function maybeUpdateRectForZooming(measure, rect) { if (!window.screen || screen.logicalXDPI == null || screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure)) return rect - var scaleX = screen.logicalXDPI / screen.deviceXDPI - var scaleY = screen.logicalYDPI / screen.deviceYDPI + let scaleX = screen.logicalXDPI / screen.deviceXDPI + let scaleY = screen.logicalYDPI / screen.deviceYDPI return {left: rect.left * scaleX, right: rect.right * scaleX, top: rect.top * scaleY, bottom: rect.bottom * scaleY} } @@ -259,7 +261,7 @@ export function clearLineMeasurementCacheFor(lineView) { if (lineView.measure) { lineView.measure.cache = {} lineView.measure.heights = null - if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++) + if (lineView.rest) for (let i = 0; i < lineView.rest.length; i++) lineView.measure.caches[i] = {} } } @@ -267,7 +269,7 @@ export function clearLineMeasurementCacheFor(lineView) { export function clearLineMeasurementCache(cm) { cm.display.externalMeasure = null removeChildren(cm.display.lineMeasure) - for (var i = 0; i < cm.display.view.length; i++) + for (let i = 0; i < cm.display.view.length; i++) clearLineMeasurementCacheFor(cm.display.view[i]) } @@ -286,19 +288,19 @@ function pageScrollY() { return window.pageYOffset || (document.documentElement // "line", "div" (display.lineDiv), "local"./null (editor), "window", // or "page". export function intoCoordSystem(cm, lineObj, rect, context) { - if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) { - var size = widgetHeight(lineObj.widgets[i]) + if (lineObj.widgets) for (let i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) { + let size = widgetHeight(lineObj.widgets[i]) rect.top += size; rect.bottom += size } if (context == "line") return rect if (!context) context = "local" - var yOff = heightAtLine(lineObj) + let yOff = heightAtLine(lineObj) if (context == "local") yOff += paddingTop(cm.display) else yOff -= cm.display.viewOffset if (context == "page" || context == "window") { - var lOff = cm.display.lineSpace.getBoundingClientRect() + let lOff = cm.display.lineSpace.getBoundingClientRect() yOff += lOff.top + (context == "window" ? 0 : pageScrollY()) - var xOff = lOff.left + (context == "window" ? 0 : pageScrollX()) + let xOff = lOff.left + (context == "window" ? 0 : pageScrollX()) rect.left += xOff; rect.right += xOff } rect.top += yOff; rect.bottom += yOff @@ -309,18 +311,18 @@ export function intoCoordSystem(cm, lineObj, rect, context) { // Context may be "window", "page", "div", or "local"./null. export function fromCoordSystem(cm, coords, context) { if (context == "div") return coords - var left = coords.left, top = coords.top + let left = coords.left, top = coords.top // First move into "page" coordinate system if (context == "page") { left -= pageScrollX() top -= pageScrollY() } else if (context == "local" || !context) { - var localBox = cm.display.sizer.getBoundingClientRect() + let localBox = cm.display.sizer.getBoundingClientRect() left += localBox.left top += localBox.top } - var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect() + let lineSpaceBox = cm.display.lineSpace.getBoundingClientRect() return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top} } @@ -336,12 +338,12 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig lineObj = lineObj || getLine(cm.doc, pos.line) if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj) function get(ch, right) { - var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight) + let m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight) if (right) m.left = m.right; else m.right = m.left return intoCoordSystem(cm, lineObj, m, context) } function getBidi(ch, partPos) { - var part = order[partPos], right = part.level % 2 + let part = order[partPos], right = part.level % 2 if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) { part = order[--partPos] ch = bidiRight(part) - (part.level % 2 ? 0 : 1) @@ -354,10 +356,10 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig if (right && ch == part.to && ch > part.from) return get(ch - 1) return get(ch, right) } - var order = getOrder(lineObj), ch = pos.ch + let order = getOrder(lineObj), ch = pos.ch if (!order) return get(ch) - var partPos = getBidiPartAt(order, ch) - var val = getBidi(ch, partPos) + let partPos = getBidiPartAt(order, ch) + let val = getBidi(ch, partPos) if (bidiOther != null) val.other = getBidi(ch, bidiOther) return val } @@ -365,10 +367,11 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig // Used to cheaply estimate the coordinates for a position. Used for // intermediate scroll updates. export function estimateCoords(cm, pos) { - var left = 0, pos = clipPos(cm.doc, pos) + let left = 0 + pos = clipPos(cm.doc, pos) if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch - var lineObj = getLine(cm.doc, pos.line) - var top = heightAtLine(lineObj) + paddingTop(cm.display) + let lineObj = getLine(cm.doc, pos.line) + let top = heightAtLine(lineObj) + paddingTop(cm.display) return {left: left, right: left, top: top, bottom: top + lineObj.height} } @@ -379,7 +382,7 @@ export function estimateCoords(cm, pos) { // is true, that means the coordinates lie outside the line's // vertical range. function PosWithInfo(line, ch, outside, xRel) { - var pos = Pos(line, ch) + let pos = Pos(line, ch) pos.xRel = xRel if (outside) pos.outside = true return pos @@ -388,19 +391,19 @@ function PosWithInfo(line, ch, outside, xRel) { // Compute the character position closest to the given coordinates. // Input must be lineSpace-local ("div" coordinate system). export function coordsChar(cm, x, y) { - var doc = cm.doc + let doc = cm.doc y += cm.display.viewOffset if (y < 0) return PosWithInfo(doc.first, 0, true, -1) - var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1 + let lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1 if (lineN > last) return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1) if (x < 0) x = 0 - var lineObj = getLine(doc, lineN) + let lineObj = getLine(doc, lineN) for (;;) { - var found = coordsCharInner(cm, lineObj, lineN, x, y) - var merged = collapsedSpanAtEnd(lineObj) - var mergedPos = merged && merged.find(0, true) + let found = coordsCharInner(cm, lineObj, lineN, x, y) + let merged = collapsedSpanAtEnd(lineObj) + let mergedPos = merged && merged.find(0, true) if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0)) lineN = lineNo(lineObj = mergedPos.to.line) else @@ -409,12 +412,12 @@ export function coordsChar(cm, x, y) { } function coordsCharInner(cm, lineObj, lineNo, x, y) { - var innerOff = y - heightAtLine(lineObj) - var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth - var preparedMeasure = prepareMeasureForLine(cm, lineObj) + let innerOff = y - heightAtLine(lineObj) + let wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth + let preparedMeasure = prepareMeasureForLine(cm, lineObj) function getX(ch) { - var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure) + let sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure) wrongLine = true if (innerOff > sp.bottom) return sp.left - adjust else if (innerOff < sp.top) return sp.left + adjust @@ -422,24 +425,24 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) { return sp.left } - var bidi = getOrder(lineObj), dist = lineObj.text.length - var from = lineLeft(lineObj), to = lineRight(lineObj) - var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine + let bidi = getOrder(lineObj), dist = lineObj.text.length + let from = lineLeft(lineObj), to = lineRight(lineObj) + let fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1) // Do a binary search between these bounds. for (;;) { if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) { - var ch = x < fromX || x - fromX <= toX - x ? from : to - var outside = ch == from ? fromOutside : toOutside - var xDiff = x - (ch == from ? fromX : toX) + let ch = x < fromX || x - fromX <= toX - x ? from : to + let outside = ch == from ? fromOutside : toOutside + let xDiff = x - (ch == from ? fromX : toX) // This is a kludge to handle the case where the coordinates // are after a line-wrapped line. We should replace it with a // more general handling of cursor positions around line // breaks. (Issue #4078) if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 && ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) { - var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right") + let charSize = measureCharPrepared(cm, preparedMeasure, ch, "right") if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) { outside = false ch++ @@ -447,21 +450,21 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) { } } while (isExtendingChar(lineObj.text.charAt(ch))) ++ch - var pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0) + let pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0) return pos } - var step = Math.ceil(dist / 2), middle = from + step + let step = Math.ceil(dist / 2), middle = from + step if (bidi) { middle = from - for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1) + for (let i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1) } - var middleX = getX(middle) + let middleX = getX(middle) if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step} else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step} } } -var measureText +let measureText // Compute the default text height. export function textHeight(display) { if (display.cachedTextHeight != null) return display.cachedTextHeight @@ -469,14 +472,14 @@ export function textHeight(display) { measureText = elt("pre") // Measure a bunch of lines, for browsers that compute // fractional heights. - for (var i = 0; i < 49; ++i) { + for (let i = 0; i < 49; ++i) { measureText.appendChild(document.createTextNode("x")) measureText.appendChild(elt("br")) } measureText.appendChild(document.createTextNode("x")) } removeChildrenAndAdd(display.measure, measureText) - var height = measureText.offsetHeight / 50 + let height = measureText.offsetHeight / 50 if (height > 3) display.cachedTextHeight = height removeChildren(display.measure) return height || 1 @@ -485,10 +488,10 @@ export function textHeight(display) { // Compute the default character width. export function charWidth(display) { if (display.cachedCharWidth != null) return display.cachedCharWidth - var anchor = elt("span", "xxxxxxxxxx") - var pre = elt("pre", [anchor]) + let anchor = elt("span", "xxxxxxxxxx") + let pre = elt("pre", [anchor]) removeChildrenAndAdd(display.measure, pre) - var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10 + let rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10 if (width > 2) display.cachedCharWidth = width return width || 10 } @@ -496,9 +499,9 @@ export function charWidth(display) { // Do a bulk-read of the DOM positions and sizes needed to draw the // view, so that we don't interleave reading and writing to the DOM. export function getDimensions(cm) { - var d = cm.display, left = {}, width = {} - var gutterLeft = d.gutters.clientLeft - for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) { + let d = cm.display, left = {}, width = {} + let gutterLeft = d.gutters.clientLeft + for (let n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) { left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft width[cm.options.gutters[i]] = n.clientWidth } @@ -520,13 +523,13 @@ export function compensateForHScroll(display) { // first approximation until the line becomes visible (and is thus // properly measurable). export function estimateHeight(cm) { - var th = textHeight(cm.display), wrapping = cm.options.lineWrapping - var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3) + let th = textHeight(cm.display), wrapping = cm.options.lineWrapping + let perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3) return function(line) { if (lineIsHidden(cm.doc, line)) return 0 - var widgetsHeight = 0 - if (line.widgets) for (var i = 0; i < line.widgets.length; i++) { + let widgetsHeight = 0 + if (line.widgets) for (let i = 0; i < line.widgets.length; i++) { if (line.widgets[i].height) widgetsHeight += line.widgets[i].height } @@ -538,9 +541,9 @@ export function estimateHeight(cm) { } export function estimateLineHeights(cm) { - var doc = cm.doc, est = estimateHeight(cm) + let doc = cm.doc, est = estimateHeight(cm) doc.iter(function(line) { - var estHeight = est(line) + let estHeight = est(line) if (estHeight != line.height) updateLineHeight(line, estHeight) }) } @@ -551,16 +554,16 @@ export function estimateLineHeights(cm) { // selections, and tries to estimate a character position even for // coordinates beyond the right of the text. export function posFromMouse(cm, e, liberal, forRect) { - var display = cm.display + let display = cm.display if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null - var x, y, space = display.lineSpace.getBoundingClientRect() + let x, y, space = display.lineSpace.getBoundingClientRect() // Fails unpredictably on IE[67] when mouse is dragged around quickly. try { x = e.clientX - space.left; y = e.clientY - space.top } catch (e) { return null } - var coords = coordsChar(cm, x, y), line + let coords = coordsChar(cm, x, y), line if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) { - var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length + let colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff)) } return coords @@ -572,8 +575,8 @@ export function findViewIndex(cm, n) { if (n >= cm.display.viewTo) return null n -= cm.display.viewFrom if (n < 0) return null - var view = cm.display.view - for (var i = 0; i < view.length; i++) { + let view = cm.display.view + for (let i = 0; i < view.length; i++) { n -= view[i].size if (n < 0) return i } diff --git a/src/measurement/update_line.js b/src/measurement/update_line.js index be94b00940..4a80a7666c 100644 --- a/src/measurement/update_line.js +++ b/src/measurement/update_line.js @@ -8,8 +8,8 @@ import { signalLater } from "../util/operation_group" // lineView.changes. This updates the relevant part of the line's // DOM structure. export function updateLineForChanges(cm, lineView, lineN, dims) { - for (var j = 0; j < lineView.changes.length; j++) { - var type = lineView.changes[j] + for (let j = 0; j < lineView.changes.length; j++) { + let type = lineView.changes[j] if (type == "text") updateLineText(cm, lineView) else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims) else if (type == "class") updateLineClasses(lineView) @@ -32,13 +32,13 @@ function ensureLineWrapped(lineView) { } function updateLineBackground(lineView) { - var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass + let cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass if (cls) cls += " CodeMirror-linebackground" if (lineView.background) { if (cls) lineView.background.className = cls else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null } } else if (cls) { - var wrap = ensureLineWrapped(lineView) + let wrap = ensureLineWrapped(lineView) lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild) } } @@ -46,7 +46,7 @@ function updateLineBackground(lineView) { // Wrapper around buildLineContent which will reuse the structure // in display.externalMeasured when possible. function getLineContent(cm, lineView) { - var ext = cm.display.externalMeasured + let ext = cm.display.externalMeasured if (ext && ext.line == lineView.line) { cm.display.externalMeasured = null lineView.measure = ext.measure @@ -59,8 +59,8 @@ function getLineContent(cm, lineView) { // classes because the mode may output tokens that influence these // classes. function updateLineText(cm, lineView) { - var cls = lineView.text.className - var built = getLineContent(cm, lineView) + let cls = lineView.text.className + let built = getLineContent(cm, lineView) if (lineView.text == lineView.node) lineView.node = built.pre lineView.text.parentNode.replaceChild(built.pre, lineView.text) lineView.text = built.pre @@ -79,7 +79,7 @@ function updateLineClasses(lineView) { ensureLineWrapped(lineView).className = lineView.line.wrapClass else if (lineView.node != lineView.text) lineView.node.className = "" - var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass + let textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass lineView.text.className = textClass || "" } @@ -93,16 +93,16 @@ function updateLineGutter(cm, lineView, lineN, dims) { lineView.gutterBackground = null } if (lineView.line.gutterClass) { - var wrap = ensureLineWrapped(lineView) + let wrap = ensureLineWrapped(lineView) lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass, "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px; width: " + dims.gutterTotalWidth + "px") wrap.insertBefore(lineView.gutterBackground, lineView.text) } - var markers = lineView.line.gutterMarkers + let markers = lineView.line.gutterMarkers if (cm.options.lineNumbers || markers) { - var wrap = ensureLineWrapped(lineView) - var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " + + let wrap = ensureLineWrapped(lineView) + let gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px") cm.display.input.setUneditable(gutterWrap) wrap.insertBefore(gutterWrap, lineView.text) @@ -114,8 +114,8 @@ function updateLineGutter(cm, lineView, lineN, dims) { "CodeMirror-linenumber CodeMirror-gutter-elt", "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: " + cm.display.lineNumInnerWidth + "px")) - if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) { - var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id] + if (markers) for (let k = 0; k < cm.options.gutters.length; ++k) { + let id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id] if (found) gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " + dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px")) @@ -125,8 +125,8 @@ function updateLineGutter(cm, lineView, lineN, dims) { function updateLineWidgets(cm, lineView, dims) { if (lineView.alignable) lineView.alignable = null - for (var node = lineView.node.firstChild, next; node; node = next) { - var next = node.nextSibling + for (let node = lineView.node.firstChild, next; node; node = next) { + next = node.nextSibling if (node.className == "CodeMirror-linewidget") lineView.node.removeChild(node) } @@ -135,7 +135,7 @@ function updateLineWidgets(cm, lineView, dims) { // Build a line's DOM representation from scratch export function buildLineElement(cm, lineView, lineN, dims) { - var built = getLineContent(cm, lineView) + let built = getLineContent(cm, lineView) lineView.text = lineView.node = built.pre if (built.bgClass) lineView.bgClass = built.bgClass if (built.textClass) lineView.textClass = built.textClass @@ -150,15 +150,15 @@ export function buildLineElement(cm, lineView, lineN, dims) { // collapsed spans). The widgets for all of them need to be drawn. function insertLineWidgets(cm, lineView, dims) { insertLineWidgetsFor(cm, lineView.line, lineView, dims, true) - if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++) + if (lineView.rest) for (let i = 0; i < lineView.rest.length; i++) insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false) } function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) { if (!line.widgets) return - var wrap = ensureLineWrapped(lineView) - for (var i = 0, ws = line.widgets; i < ws.length; ++i) { - var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget") + let wrap = ensureLineWrapped(lineView) + for (let i = 0, ws = line.widgets; i < ws.length; ++i) { + let widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget") if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true") positionLineWidget(widget, node, lineView, dims) cm.display.input.setUneditable(node) @@ -173,7 +173,7 @@ function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) { function positionLineWidget(widget, node, lineView, dims) { if (widget.noHScroll) { ;(lineView.alignable || (lineView.alignable = [])).push(node) - var width = dims.wrapperWidth + let width = dims.wrapperWidth node.style.left = dims.fixedPos + "px" if (!widget.coverGutter) { width -= dims.gutterTotalWidth diff --git a/src/measurement/widgets.js b/src/measurement/widgets.js index f20d313e6d..554cf80977 100644 --- a/src/measurement/widgets.js +++ b/src/measurement/widgets.js @@ -3,10 +3,10 @@ import { e_target } from "../util/event" export function widgetHeight(widget) { if (widget.height != null) return widget.height - var cm = widget.doc.cm + let cm = widget.doc.cm if (!cm) return 0 if (!contains(document.body, widget.node)) { - var parentStyle = "position: relative;" + let parentStyle = "position: relative;" if (widget.coverGutter) parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;" if (widget.noHScroll) @@ -18,7 +18,7 @@ export function widgetHeight(widget) { // Return true when the given mouse event happened in a widget export function eventInWidget(display, e) { - for (var n = e_target(e); n != display.wrapper; n = n.parentNode) { + for (let n = e_target(e); n != display.wrapper; n = n.parentNode) { if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") || (n.parentNode == display.sizer && n != display.mover)) return true diff --git a/src/model/Doc.js b/src/model/Doc.js index ba004631d3..c02fe062f1 100644 --- a/src/model/Doc.js +++ b/src/model/Doc.js @@ -19,8 +19,8 @@ import { copySharedMarkers, detachSharedMarkers, findSharedMarkers, markText } f import { normalizeSelection, Range, simpleSelection } from "./selection" import { extendSelection, extendSelections, setSelection, setSelectionReplaceHistory, setSimpleSelection } from "./selection_updates" -var nextDocId = 0 -var Doc = function(text, mode, firstLine, lineSep) { +let nextDocId = 0 +let Doc = function(text, mode, firstLine, lineSep) { if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep) if (firstLine == null) firstLine = 0 @@ -30,7 +30,7 @@ var Doc = function(text, mode, firstLine, lineSep) { this.cantEdit = false this.cleanGeneration = 1 this.frontier = firstLine - var start = Pos(firstLine, 0) + let start = Pos(firstLine, 0) this.sel = simpleSelection(start) this.history = new History(null) this.id = ++nextDocId @@ -56,8 +56,8 @@ Doc.prototype = createObj(BranchChunk.prototype, { // Non-public interface for adding and removing lines. insert: function(at, lines) { - var height = 0 - for (var i = 0; i < lines.length; ++i) height += lines[i].height + let height = 0 + for (let i = 0; i < lines.length; ++i) height += lines[i].height this.insertInner(at - this.first, lines, height) }, remove: function(at, n) { this.removeInner(at - this.first, n) }, @@ -66,12 +66,12 @@ Doc.prototype = createObj(BranchChunk.prototype, { // are also available from CodeMirror (editor) instances. getValue: function(lineSep) { - var lines = getLines(this, this.first, this.first + this.size) + let lines = getLines(this, this.first, this.first + this.size) if (lineSep === false) return lines return lines.join(lineSep || this.lineSeparator()) }, setValue: docMethodOp(function(code) { - var top = Pos(this.first, 0), last = this.first + this.size - 1 + let top = Pos(this.first, 0), last = this.first + this.size - 1 makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length), text: this.splitLines(code), origin: "setValue", full: true}, true) setSelection(this, simpleSelection(top)) @@ -82,12 +82,12 @@ Doc.prototype = createObj(BranchChunk.prototype, { replaceRange(this, code, from, to, origin) }, getRange: function(from, to, lineSep) { - var lines = getBetween(this, clipPos(this, from), clipPos(this, to)) + let lines = getBetween(this, clipPos(this, from), clipPos(this, to)) if (lineSep === false) return lines return lines.join(lineSep || this.lineSeparator()) }, - getLine: function(line) {var l = this.getLineHandle(line); return l && l.text}, + getLine: function(line) {let l = this.getLineHandle(line); return l && l.text}, getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line)}, getLineNumber: function(line) {return lineNo(line)}, @@ -104,7 +104,7 @@ Doc.prototype = createObj(BranchChunk.prototype, { clipPos: function(pos) {return clipPos(this, pos)}, getCursor: function(start) { - var range = this.sel.primary(), pos + let range = this.sel.primary(), pos if (start == null || start == "head") pos = range.head else if (start == "anchor") pos = range.anchor else if (start == "end" || start == "to" || start === false) pos = range.to() @@ -127,55 +127,56 @@ Doc.prototype = createObj(BranchChunk.prototype, { extendSelections(this, clipPosArray(this, heads), options) }), extendSelectionsBy: docMethodOp(function(f, options) { - var heads = map(this.sel.ranges, f) + let heads = map(this.sel.ranges, f) extendSelections(this, clipPosArray(this, heads), options) }), setSelections: docMethodOp(function(ranges, primary, options) { if (!ranges.length) return - for (var i = 0, out = []; i < ranges.length; i++) + let out = [] + for (let i = 0; i < ranges.length; i++) out[i] = new Range(clipPos(this, ranges[i].anchor), clipPos(this, ranges[i].head)) if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex) setSelection(this, normalizeSelection(out, primary), options) }), addSelection: docMethodOp(function(anchor, head, options) { - var ranges = this.sel.ranges.slice(0) + let ranges = this.sel.ranges.slice(0) ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor))) setSelection(this, normalizeSelection(ranges, ranges.length - 1), options) }), getSelection: function(lineSep) { - var ranges = this.sel.ranges, lines - for (var i = 0; i < ranges.length; i++) { - var sel = getBetween(this, ranges[i].from(), ranges[i].to()) + let ranges = this.sel.ranges, lines + for (let i = 0; i < ranges.length; i++) { + let sel = getBetween(this, ranges[i].from(), ranges[i].to()) lines = lines ? lines.concat(sel) : sel } if (lineSep === false) return lines else return lines.join(lineSep || this.lineSeparator()) }, getSelections: function(lineSep) { - var parts = [], ranges = this.sel.ranges - for (var i = 0; i < ranges.length; i++) { - var sel = getBetween(this, ranges[i].from(), ranges[i].to()) + let parts = [], ranges = this.sel.ranges + for (let i = 0; i < ranges.length; i++) { + let sel = getBetween(this, ranges[i].from(), ranges[i].to()) if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator()) parts[i] = sel } return parts }, replaceSelection: function(code, collapse, origin) { - var dup = [] - for (var i = 0; i < this.sel.ranges.length; i++) + let dup = [] + for (let i = 0; i < this.sel.ranges.length; i++) dup[i] = code this.replaceSelections(dup, collapse, origin || "+input") }, replaceSelections: docMethodOp(function(code, collapse, origin) { - var changes = [], sel = this.sel - for (var i = 0; i < sel.ranges.length; i++) { - var range = sel.ranges[i] + let changes = [], sel = this.sel + for (let i = 0; i < sel.ranges.length; i++) { + let range = sel.ranges[i] changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin} } - var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse) - for (var i = changes.length - 1; i >= 0; i--) + let newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse) + for (let i = changes.length - 1; i >= 0; i--) makeChange(this, changes[i]) if (newSel) setSelectionReplaceHistory(this, newSel) else if (this.cm) ensureCursorVisible(this.cm) @@ -189,9 +190,9 @@ Doc.prototype = createObj(BranchChunk.prototype, { getExtending: function() {return this.extend}, historySize: function() { - var hist = this.history, done = 0, undone = 0 - for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done - for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone + let hist = this.history, done = 0, undone = 0 + for (let i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done + for (let i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone return {undo: done, redo: undone} }, clearHistory: function() {this.history = new History(this.history.maxGeneration)}, @@ -213,14 +214,14 @@ Doc.prototype = createObj(BranchChunk.prototype, { undone: copyHistoryArray(this.history.undone)} }, setHistory: function(histData) { - var hist = this.history = new History(this.history.maxGeneration) + let hist = this.history = new History(this.history.maxGeneration) hist.done = copyHistoryArray(histData.done.slice(0), null, true) hist.undone = copyHistoryArray(histData.undone.slice(0), null, true) }, addLineClass: docMethodOp(function(handle, where, cls) { return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) { - var prop = where == "text" ? "textClass" + let prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : where == "gutter" ? "gutterClass" : "wrapClass" if (!line[prop]) line[prop] = cls @@ -231,16 +232,16 @@ Doc.prototype = createObj(BranchChunk.prototype, { }), removeLineClass: docMethodOp(function(handle, where, cls) { return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) { - var prop = where == "text" ? "textClass" + let prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : where == "gutter" ? "gutterClass" : "wrapClass" - var cur = line[prop] + let cur = line[prop] if (!cur) return false else if (cls == null) line[prop] = null else { - var found = cur.match(classTest(cls)) + let found = cur.match(classTest(cls)) if (!found) return false - var end = found.index + found[0].length + let end = found.index + found[0].length line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null } return true @@ -256,7 +257,7 @@ Doc.prototype = createObj(BranchChunk.prototype, { return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range") }, setBookmark: function(pos, options) { - var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options), + let realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options), insertLeft: options && options.insertLeft, clearWhenEmpty: false, shared: options && options.shared, handleMouseEvents: options && options.handleMouseEvents} @@ -265,9 +266,9 @@ Doc.prototype = createObj(BranchChunk.prototype, { }, findMarksAt: function(pos) { pos = clipPos(this, pos) - var markers = [], spans = getLine(this, pos.line).markedSpans - if (spans) for (var i = 0; i < spans.length; ++i) { - var span = spans[i] + let markers = [], spans = getLine(this, pos.line).markedSpans + if (spans) for (let i = 0; i < spans.length; ++i) { + let span = spans[i] if ((span.from == null || span.from <= pos.ch) && (span.to == null || span.to >= pos.ch)) markers.push(span.marker.parent || span.marker) @@ -276,11 +277,11 @@ Doc.prototype = createObj(BranchChunk.prototype, { }, findMarks: function(from, to, filter) { from = clipPos(this, from); to = clipPos(this, to) - var found = [], lineNo = from.line + let found = [], lineNo = from.line this.iter(from.line, to.line + 1, function(line) { - var spans = line.markedSpans - if (spans) for (var i = 0; i < spans.length; i++) { - var span = spans[i] + let spans = line.markedSpans + if (spans) for (let i = 0; i < spans.length; i++) { + let span = spans[i] if (!(span.to != null && lineNo == from.line && from.ch >= span.to || span.from == null && lineNo != from.line || span.from != null && lineNo == to.line && span.from >= to.ch) && @@ -292,19 +293,19 @@ Doc.prototype = createObj(BranchChunk.prototype, { return found }, getAllMarks: function() { - var markers = [] + let markers = [] this.iter(function(line) { - var sps = line.markedSpans - if (sps) for (var i = 0; i < sps.length; ++i) + let sps = line.markedSpans + if (sps) for (let i = 0; i < sps.length; ++i) if (sps[i].from != null) markers.push(sps[i].marker) }) return markers }, posFromIndex: function(off) { - var ch, lineNo = this.first, sepSize = this.lineSeparator().length + let ch, lineNo = this.first, sepSize = this.lineSeparator().length this.iter(function(line) { - var sz = line.text.length + sepSize + let sz = line.text.length + sepSize if (sz > off) { ch = off; return true } off -= sz ++lineNo @@ -313,9 +314,9 @@ Doc.prototype = createObj(BranchChunk.prototype, { }, indexFromPos: function (coords) { coords = clipPos(this, coords) - var index = coords.ch + let index = coords.ch if (coords.line < this.first || coords.ch < 0) return 0 - var sepSize = this.lineSeparator().length + let sepSize = this.lineSeparator().length this.iter(this.first, coords.line, function (line) { index += line.text.length + sepSize }) @@ -323,7 +324,7 @@ Doc.prototype = createObj(BranchChunk.prototype, { }, copy: function(copyHistory) { - var doc = new Doc(getLines(this, this.first, this.first + this.size), + let doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first, this.lineSep) doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft doc.sel = this.sel @@ -337,10 +338,10 @@ Doc.prototype = createObj(BranchChunk.prototype, { linkedDoc: function(options) { if (!options) options = {} - var from = this.first, to = this.first + this.size + let from = this.first, to = this.first + this.size if (options.from != null && options.from > from) from = options.from if (options.to != null && options.to < to) to = options.to - var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep) + let copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep) if (options.sharedHist) copy.history = this.history ;(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist}) copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}] @@ -349,8 +350,8 @@ Doc.prototype = createObj(BranchChunk.prototype, { }, unlinkDoc: function(other) { if (other instanceof CodeMirror) other = other.doc - if (this.linked) for (var i = 0; i < this.linked.length; ++i) { - var link = this.linked[i] + if (this.linked) for (let i = 0; i < this.linked.length; ++i) { + let link = this.linked[i] if (link.doc != other) continue this.linked.splice(i, 1) other.unlinkDoc(this) @@ -359,7 +360,7 @@ Doc.prototype = createObj(BranchChunk.prototype, { } // If the histories were shared, split them again if (other.history == this.history) { - var splitIds = [other.id] + let splitIds = [other.id] linkedDocs(other, function(doc) {splitIds.push(doc.id)}, true) other.history = new History(null) other.history.done = copyHistoryArray(this.history.done, splitIds) diff --git a/src/model/change_measurement.js b/src/model/change_measurement.js index ac14fa5458..881f39eb46 100644 --- a/src/model/change_measurement.js +++ b/src/model/change_measurement.js @@ -17,15 +17,15 @@ function adjustForChange(pos, change) { if (cmp(pos, change.from) < 0) return pos if (cmp(pos, change.to) <= 0) return changeEnd(change) - var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch + let line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch return Pos(line, ch) } export function computeSelAfterChange(doc, change) { - var out = [] - for (var i = 0; i < doc.sel.ranges.length; i++) { - var range = doc.sel.ranges[i] + let out = [] + for (let i = 0; i < doc.sel.ranges.length; i++) { + let range = doc.sel.ranges[i] out.push(new Range(adjustForChange(range.anchor, change), adjustForChange(range.head, change))) } @@ -42,16 +42,16 @@ function offsetPos(pos, old, nw) { // Used by replaceSelections to allow moving the selection to the // start or around the replaced test. Hint may be "start" or "around". export function computeReplacedSel(doc, changes, hint) { - var out = [] - var oldPrev = Pos(doc.first, 0), newPrev = oldPrev - for (var i = 0; i < changes.length; i++) { - var change = changes[i] - var from = offsetPos(change.from, oldPrev, newPrev) - var to = offsetPos(changeEnd(change), oldPrev, newPrev) + let out = [] + let oldPrev = Pos(doc.first, 0), newPrev = oldPrev + for (let i = 0; i < changes.length; i++) { + let change = changes[i] + let from = offsetPos(change.from, oldPrev, newPrev) + let to = offsetPos(changeEnd(change), oldPrev, newPrev) oldPrev = change.to newPrev = to if (hint == "around") { - var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0 + let range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0 out[i] = new Range(inv ? to : from, inv ? from : to) } else { out[i] = new Range(from, from) diff --git a/src/model/changes.js b/src/model/changes.js index 6a8606afcb..e39bc30392 100644 --- a/src/model/changes.js +++ b/src/model/changes.js @@ -20,7 +20,7 @@ import { setSelection, setSelectionNoUndo } from "./selection_updates" // Allow "beforeChange" event handlers to influence a change function filterChange(doc, change, update) { - var obj = { + let obj = { canceled: false, from: change.from, to: change.to, @@ -56,9 +56,9 @@ export function makeChange(doc, change, ignoreReadOnly) { // Possibly split or suppress the update based on the presence // of read-only spans in its range. - var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to) + let split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to) if (split) { - for (var i = split.length - 1; i >= 0; --i) + for (let i = split.length - 1; i >= 0; --i) makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text}) } else { makeChangeInner(doc, change) @@ -67,11 +67,11 @@ export function makeChange(doc, change, ignoreReadOnly) { function makeChangeInner(doc, change) { if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return - var selAfter = computeSelAfterChange(doc, change) + let selAfter = computeSelAfterChange(doc, change) addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN) makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change)) - var rebased = [] + let rebased = [] linkedDocs(doc, function(doc, sharedHist) { if (!sharedHist && indexOf(rebased, doc.history) == -1) { @@ -86,12 +86,13 @@ function makeChangeInner(doc, change) { export function makeChangeFromHistory(doc, type, allowSelectionOnly) { if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return - var hist = doc.history, event, selAfter = doc.sel - var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done + let hist = doc.history, event, selAfter = doc.sel + let source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done // Verify that there is a useable event (so that ctrl-z won't // needlessly clear selection events) - for (var i = 0; i < source.length; i++) { + let i = 0 + for (; i < source.length; i++) { event = source[i] if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges) break @@ -114,15 +115,15 @@ export function makeChangeFromHistory(doc, type, allowSelectionOnly) { // Build up a reverse change object to add to the opposite history // stack (redo when undoing, and vice versa). - var antiChanges = [] + let antiChanges = [] pushSelectionToHistory(selAfter, dest) dest.push({changes: antiChanges, generation: hist.generation}) hist.generation = event.generation || ++hist.maxGeneration - var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange") + let filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange") - for (var i = event.changes.length - 1; i >= 0; --i) { - var change = event.changes[i] + for (let i = event.changes.length - 1; i >= 0; --i) { + let change = event.changes[i] change.origin = type if (filter && !filterChange(doc, change, false)) { source.length = 0 @@ -131,10 +132,10 @@ export function makeChangeFromHistory(doc, type, allowSelectionOnly) { antiChanges.push(historyChangeFromChange(doc, change)) - var after = i ? computeSelAfterChange(doc, change) : lst(source) + let after = i ? computeSelAfterChange(doc, change) : lst(source) makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change)) if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)}) - var rebased = [] + let rebased = [] // Propagate to the linked documents linkedDocs(doc, function(doc, sharedHist) { @@ -158,7 +159,7 @@ function shiftDoc(doc, distance) { }), doc.sel.primIndex) if (doc.cm) { regChange(doc.cm, doc.first, doc.first - distance, distance) - for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++) + for (let d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++) regLineChange(doc.cm, l, "gutter") } } @@ -177,12 +178,12 @@ function makeChangeSingleDoc(doc, change, selAfter, spans) { // Clip the change to the size of this doc if (change.from.line < doc.first) { - var shift = change.text.length - 1 - (doc.first - change.from.line) + let shift = change.text.length - 1 - (doc.first - change.from.line) shiftDoc(doc, shift) change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch), text: [lst(change.text)], origin: change.origin} } - var last = doc.lastLine() + let last = doc.lastLine() if (change.to.line > last) { change = {from: change.from, to: Pos(last, getLine(doc, last).text.length), text: [change.text[0]], origin: change.origin} @@ -199,9 +200,9 @@ function makeChangeSingleDoc(doc, change, selAfter, spans) { // Handle the interaction of a change to a document with the editor // that this document is part of. function makeChangeSingleDocInEditor(cm, change, spans) { - var doc = cm.doc, display = cm.display, from = change.from, to = change.to + let doc = cm.doc, display = cm.display, from = change.from, to = change.to - var recomputeMaxLength = false, checkWidthStart = from.line + let recomputeMaxLength = false, checkWidthStart = from.line if (!cm.options.lineWrapping) { checkWidthStart = lineNo(visualLine(getLine(doc, from.line))) doc.iter(checkWidthStart, to.line + 1, function(line) { @@ -219,7 +220,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) { if (!cm.options.lineWrapping) { doc.iter(checkWidthStart, from.line + change.text.length, function(line) { - var len = lineLength(line) + let len = lineLength(line) if (len > display.maxLineLength) { display.maxLine = line display.maxLineLength = len @@ -234,7 +235,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) { doc.frontier = Math.min(doc.frontier, from.line) startWorker(cm, 400) - var lendiff = change.text.length - (to.line - from.line) - 1 + let lendiff = change.text.length - (to.line - from.line) - 1 // Remember that these lines changed, for updating the display if (change.full) regChange(cm) @@ -243,9 +244,9 @@ function makeChangeSingleDocInEditor(cm, change, spans) { else regChange(cm, from.line, to.line + 1, lendiff) - var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change") + let changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change") if (changeHandler || changesHandler) { - var obj = { + let obj = { from: from, to: to, text: change.text, removed: change.removed, @@ -259,7 +260,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) { export function replaceRange(doc, code, from, to, origin) { if (!to) to = from - if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp } + if (cmp(to, from) < 0) { let tmp = to; to = from; from = tmp } if (typeof code == "string") code = doc.splitLines(code) makeChange(doc, {from: from, to: to, text: code, origin: origin}) } @@ -283,18 +284,18 @@ function rebaseHistSelSingle(pos, from, to, diff) { // reallocate them all on every rebase, but also avoid problems with // shared position objects being unsafely updated. function rebaseHistArray(array, from, to, diff) { - for (var i = 0; i < array.length; ++i) { - var sub = array[i], ok = true + for (let i = 0; i < array.length; ++i) { + let sub = array[i], ok = true if (sub.ranges) { if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true } - for (var j = 0; j < sub.ranges.length; j++) { + for (let j = 0; j < sub.ranges.length; j++) { rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff) rebaseHistSelSingle(sub.ranges[j].head, from, to, diff) } continue } - for (var j = 0; j < sub.changes.length; ++j) { - var cur = sub.changes[j] + for (let j = 0; j < sub.changes.length; ++j) { + let cur = sub.changes[j] if (to < cur.from.line) { cur.from = Pos(cur.from.line + diff, cur.from.ch) cur.to = Pos(cur.to.line + diff, cur.to.ch) @@ -311,7 +312,7 @@ function rebaseHistArray(array, from, to, diff) { } function rebaseHist(hist, change) { - var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1 + let from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1 rebaseHistArray(hist.done, from, to, diff) rebaseHistArray(hist.undone, from, to, diff) } @@ -320,7 +321,7 @@ function rebaseHist(hist, change) { // returning the number and optionally registering the line as // changed. export function changeLine(doc, handle, changeType, op) { - var no = handle, line = handle + let no = handle, line = handle if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle)) else no = lineNo(handle) if (no == null) return null diff --git a/src/model/chunk.js b/src/model/chunk.js index 0aee95fe2f..2a05d7c545 100644 --- a/src/model/chunk.js +++ b/src/model/chunk.js @@ -18,7 +18,8 @@ import { signalLater } from "../util/operation_group" export function LeafChunk(lines) { this.lines = lines this.parent = null - for (var i = 0, height = 0; i < lines.length; ++i) { + let height = 0 + for (let i = 0; i < lines.length; ++i) { lines[i].parent = this height += lines[i].height } @@ -29,8 +30,8 @@ LeafChunk.prototype = { chunkSize: function() { return this.lines.length }, // Remove the n lines at offset 'at'. removeInner: function(at, n) { - for (var i = at, e = at + n; i < e; ++i) { - var line = this.lines[i] + for (let i = at, e = at + n; i < e; ++i) { + let line = this.lines[i] this.height -= line.height cleanUpLine(line) signalLater(line, "delete") @@ -46,20 +47,20 @@ LeafChunk.prototype = { insertInner: function(at, lines, height) { this.height += height this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at)) - for (var i = 0; i < lines.length; ++i) lines[i].parent = this + for (let i = 0; i < lines.length; ++i) lines[i].parent = this }, // Used to iterate over a part of the tree. iterN: function(at, n, op) { - for (var e = at + n; at < e; ++at) + for (let e = at + n; at < e; ++at) if (op(this.lines[at])) return true } } export function BranchChunk(children) { this.children = children - var size = 0, height = 0 - for (var i = 0; i < children.length; ++i) { - var ch = children[i] + let size = 0, height = 0 + for (let i = 0; i < children.length; ++i) { + let ch = children[i] size += ch.chunkSize(); height += ch.height ch.parent = this } @@ -72,10 +73,10 @@ BranchChunk.prototype = { chunkSize: function() { return this.size }, removeInner: function(at, n) { this.size -= n - for (var i = 0; i < this.children.length; ++i) { - var child = this.children[i], sz = child.chunkSize() + for (let i = 0; i < this.children.length; ++i) { + let child = this.children[i], sz = child.chunkSize() if (at < sz) { - var rm = Math.min(n, sz - at), oldHeight = child.height + let rm = Math.min(n, sz - at), oldHeight = child.height child.removeInner(at, rm) this.height -= oldHeight - child.height if (sz == rm) { this.children.splice(i--, 1); child.parent = null } @@ -87,28 +88,28 @@ BranchChunk.prototype = { // single leaf node. if (this.size - n < 25 && (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) { - var lines = [] + let lines = [] this.collapse(lines) this.children = [new LeafChunk(lines)] this.children[0].parent = this } }, collapse: function(lines) { - for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines) + for (let i = 0; i < this.children.length; ++i) this.children[i].collapse(lines) }, insertInner: function(at, lines, height) { this.size += lines.length this.height += height - for (var i = 0; i < this.children.length; ++i) { - var child = this.children[i], sz = child.chunkSize() + for (let i = 0; i < this.children.length; ++i) { + let child = this.children[i], sz = child.chunkSize() if (at <= sz) { child.insertInner(at, lines, height) if (child.lines && child.lines.length > 50) { // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced. // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest. - var remaining = child.lines.length % 25 + 25 - for (var pos = remaining; pos < child.lines.length;) { - var leaf = new LeafChunk(child.lines.slice(pos, pos += 25)) + let remaining = child.lines.length % 25 + 25 + for (let pos = remaining; pos < child.lines.length;) { + let leaf = new LeafChunk(child.lines.slice(pos, pos += 25)) child.height -= leaf.height this.children.splice(++i, 0, leaf) leaf.parent = this @@ -124,19 +125,19 @@ BranchChunk.prototype = { // When a node has grown, check whether it should be split. maybeSpill: function() { if (this.children.length <= 10) return - var me = this + let me = this do { - var spilled = me.children.splice(me.children.length - 5, 5) - var sibling = new BranchChunk(spilled) + let spilled = me.children.splice(me.children.length - 5, 5) + let sibling = new BranchChunk(spilled) if (!me.parent) { // Become the parent node - var copy = new BranchChunk(me.children) + let copy = new BranchChunk(me.children) copy.parent = me me.children = [copy, sibling] me = copy } else { me.size -= sibling.size me.height -= sibling.height - var myIndex = indexOf(me.parent.children, me) + let myIndex = indexOf(me.parent.children, me) me.parent.children.splice(myIndex + 1, 0, sibling) } sibling.parent = me.parent @@ -144,10 +145,10 @@ BranchChunk.prototype = { me.parent.maybeSpill() }, iterN: function(at, n, op) { - for (var i = 0; i < this.children.length; ++i) { - var child = this.children[i], sz = child.chunkSize() + for (let i = 0; i < this.children.length; ++i) { + let child = this.children[i], sz = child.chunkSize() if (at < sz) { - var used = Math.min(n, sz - at) + let used = Math.min(n, sz - at) if (child.iterN(at, used, op)) return true if ((n -= used) == 0) break at = 0 diff --git a/src/model/document_data.js b/src/model/document_data.js index 8e423bafd3..6ce2ae58e7 100644 --- a/src/model/document_data.js +++ b/src/model/document_data.js @@ -25,14 +25,15 @@ export function updateDoc(doc, change, markedSpans, estimateHeight) { signalLater(line, "change", line, change) } function linesFor(start, end) { - for (var i = start, result = []; i < end; ++i) + let result = [] + for (let i = start; i < end; ++i) result.push(new Line(text[i], spansFor(i), estimateHeight)) return result } - var from = change.from, to = change.to, text = change.text - var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line) - var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line + let from = change.from, to = change.to, text = change.text + let firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line) + let lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line // Adjust the line structure if (change.full) { @@ -41,7 +42,7 @@ export function updateDoc(doc, change, markedSpans, estimateHeight) { } else if (isWholeLineUpdate(doc, change)) { // This is a whole-line replace. Treated specially to make // sure line objects move the way they are supposed to. - var added = linesFor(0, text.length - 1) + let added = linesFor(0, text.length - 1) update(lastLine, lastLine.text, lastSpans) if (nlines) doc.remove(from.line, nlines) if (added.length) doc.insert(from.line, added) @@ -49,7 +50,7 @@ export function updateDoc(doc, change, markedSpans, estimateHeight) { if (text.length == 1) { update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans) } else { - var added = linesFor(1, text.length - 1) + let added = linesFor(1, text.length - 1) added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight)) update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)) doc.insert(from.line + 1, added) @@ -60,7 +61,7 @@ export function updateDoc(doc, change, markedSpans, estimateHeight) { } else { update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)) update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans) - var added = linesFor(1, text.length - 1) + let added = linesFor(1, text.length - 1) if (nlines > 1) doc.remove(from.line + 1, nlines - 1) doc.insert(from.line + 1, added) } @@ -71,10 +72,10 @@ export function updateDoc(doc, change, markedSpans, estimateHeight) { // Call f for all linked documents. export function linkedDocs(doc, f, sharedHistOnly) { function propagate(doc, skip, sharedHist) { - if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) { - var rel = doc.linked[i] + if (doc.linked) for (let i = 0; i < doc.linked.length; ++i) { + let rel = doc.linked[i] if (rel.doc == skip) continue - var shared = sharedHist && rel.sharedHist + let shared = sharedHist && rel.sharedHist if (sharedHistOnly && !shared) continue f(rel.doc, shared) propagate(rel.doc, doc, shared) diff --git a/src/model/history.js b/src/model/history.js index 8cc77b1ab0..0c7cf5bba1 100644 --- a/src/model/history.js +++ b/src/model/history.js @@ -26,7 +26,7 @@ export function History(startGen) { // Create a history change event from an updateDoc-style change // object. export function historyChangeFromChange(doc, change) { - var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)} + let histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)} attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1) linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1)}, true) return histChange @@ -36,7 +36,7 @@ export function historyChangeFromChange(doc, change) { // a change event. function clearSelectionEvents(array) { while (array.length) { - var last = lst(array) + let last = lst(array) if (last.ranges) array.pop() else break } @@ -60,9 +60,10 @@ function lastChangeEvent(hist, force) { // a single operation, or are close together with an origin that // allows merging (starting with "+") into a single event. export function addChangeToHistory(doc, change, selAfter, opId) { - var hist = doc.history + let hist = doc.history hist.undone.length = 0 - var time = +new Date, cur + let time = +new Date, cur + let last if ((hist.lastOp == opId || hist.lastOrigin == change.origin && change.origin && @@ -70,7 +71,7 @@ export function addChangeToHistory(doc, change, selAfter, opId) { change.origin.charAt(0) == "*")) && (cur = lastChangeEvent(hist, hist.lastOp == opId))) { // Merge this change into the last event - var last = lst(cur.changes) + last = lst(cur.changes) if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) { // Optimized case for simple insertion -- don't want to add // new changesets for every character typed @@ -81,7 +82,7 @@ export function addChangeToHistory(doc, change, selAfter, opId) { } } else { // Can not be merged, start a new event. - var before = lst(hist.done) + let before = lst(hist.done) if (!before || !before.ranges) pushSelectionToHistory(doc.sel, hist.done) cur = {changes: [historyChangeFromChange(doc, change)], @@ -102,7 +103,7 @@ export function addChangeToHistory(doc, change, selAfter, opId) { } function selectionEventCanBeMerged(doc, origin, prev, sel) { - var ch = origin.charAt(0) + let ch = origin.charAt(0) return ch == "*" || ch == "+" && prev.ranges.length == sel.ranges.length && @@ -115,7 +116,7 @@ function selectionEventCanBeMerged(doc, origin, prev, sel) { // selection into the 'done' array when it was significantly // different (in number of selected ranges, emptiness, or time). export function addSelectionToHistory(doc, sel, opId, options) { - var hist = doc.history, origin = options && options.origin + let hist = doc.history, origin = options && options.origin // A new event is started when the previous origin does not match // the current, or the origins don't allow matching. Origins @@ -137,14 +138,14 @@ export function addSelectionToHistory(doc, sel, opId, options) { } export function pushSelectionToHistory(sel, dest) { - var top = lst(dest) + let top = lst(dest) if (!(top && top.ranges && top.equals(sel))) dest.push(sel) } // Used to store marked span information in the history. function attachLocalSpans(doc, change, from, to) { - var existing = change["spans_" + doc.id], n = 0 + let existing = change["spans_" + doc.id], n = 0 doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) { if (line.markedSpans) (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans @@ -156,7 +157,8 @@ function attachLocalSpans(doc, change, from, to) { // that have been explicitly cleared should not be restored. function removeClearedSpans(spans) { if (!spans) return null - for (var i = 0, out; i < spans.length; ++i) { + let out + for (let i = 0; i < spans.length; ++i) { if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i) } else if (out) out.push(spans[i]) } @@ -165,9 +167,10 @@ function removeClearedSpans(spans) { // Retrieve and filter the old marked spans stored in a change event. function getOldSpans(doc, change) { - var found = change["spans_" + doc.id] + let found = change["spans_" + doc.id] if (!found) return null - for (var i = 0, nw = []; i < change.text.length; ++i) + let nw = [] + for (let i = 0; i < change.text.length; ++i) nw.push(removeClearedSpans(found[i])) return nw } @@ -177,17 +180,17 @@ function getOldSpans(doc, change) { // existed in the history (so that deleting around a span and then // undoing brings back the span). export function mergeOldSpans(doc, change) { - var old = getOldSpans(doc, change) - var stretched = stretchSpansOverChange(doc, change) + let old = getOldSpans(doc, change) + let stretched = stretchSpansOverChange(doc, change) if (!old) return stretched if (!stretched) return old - for (var i = 0; i < old.length; ++i) { - var oldCur = old[i], stretchCur = stretched[i] + for (let i = 0; i < old.length; ++i) { + let oldCur = old[i], stretchCur = stretched[i] if (oldCur && stretchCur) { - spans: for (var j = 0; j < stretchCur.length; ++j) { - var span = stretchCur[j] - for (var k = 0; k < oldCur.length; ++k) + spans: for (let j = 0; j < stretchCur.length; ++j) { + let span = stretchCur[j] + for (let k = 0; k < oldCur.length; ++k) if (oldCur[k].marker == span.marker) continue spans oldCur.push(span) } @@ -201,18 +204,19 @@ export function mergeOldSpans(doc, change) { // Used both to provide a JSON-safe object in .getHistory, and, when // detaching a document, to split the history in two export function copyHistoryArray(events, newGroup, instantiateSel) { - for (var i = 0, copy = []; i < events.length; ++i) { - var event = events[i] + let copy = [] + for (let i = 0; i < events.length; ++i) { + let event = events[i] if (event.ranges) { copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event) continue } - var changes = event.changes, newChanges = [] + let changes = event.changes, newChanges = [] copy.push({changes: newChanges}) - for (var j = 0; j < changes.length; ++j) { - var change = changes[j], m + for (let j = 0; j < changes.length; ++j) { + let change = changes[j], m newChanges.push({from: change.from, to: change.to, text: change.text}) - if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) { + if (newGroup) for (let prop in change) if (m = prop.match(/^spans_(\d+)$/)) { if (indexOf(newGroup, Number(m[1])) > -1) { lst(newChanges)[prop] = change[prop] delete change[prop] diff --git a/src/model/line_widget.js b/src/model/line_widget.js index b3b422aafb..23b2381b95 100644 --- a/src/model/line_widget.js +++ b/src/model/line_widget.js @@ -10,7 +10,7 @@ import { eventMixin } from "../util/event" // Line widgets are block elements displayed above or below a line. export function LineWidget(doc, node, options) { - if (options) for (var opt in options) if (options.hasOwnProperty(opt)) + if (options) for (let opt in options) if (options.hasOwnProperty(opt)) this[opt] = options[opt] this.doc = doc this.node = node @@ -23,11 +23,11 @@ function adjustScrollWhenAboveVisible(cm, line, diff) { } LineWidget.prototype.clear = function() { - var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line) + let cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line) if (no == null || !ws) return - for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1) + for (let i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1) if (!ws.length) line.widgets = null - var height = widgetHeight(this) + let height = widgetHeight(this) updateLineHeight(line, Math.max(0, line.height - height)) if (cm) runInOp(cm, function() { adjustScrollWhenAboveVisible(cm, line, -height) @@ -35,9 +35,9 @@ LineWidget.prototype.clear = function() { }) } LineWidget.prototype.changed = function() { - var oldH = this.height, cm = this.doc.cm, line = this.line + let oldH = this.height, cm = this.doc.cm, line = this.line this.height = null - var diff = widgetHeight(this) - oldH + let diff = widgetHeight(this) - oldH if (!diff) return updateLineHeight(line, line.height + diff) if (cm) runInOp(cm, function() { @@ -47,16 +47,16 @@ LineWidget.prototype.changed = function() { } export function addLineWidget(doc, handle, node, options) { - var widget = new LineWidget(doc, node, options) - var cm = doc.cm + let widget = new LineWidget(doc, node, options) + let cm = doc.cm if (cm && widget.noHScroll) cm.display.alignWidgets = true changeLine(doc, handle, "widget", function(line) { - var widgets = line.widgets || (line.widgets = []) + let widgets = line.widgets || (line.widgets = []) if (widget.insertAt == null) widgets.push(widget) else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget) widget.line = line if (cm && !lineIsHidden(doc, line)) { - var aboveVisible = heightAtLine(line) < doc.scrollTop + let aboveVisible = heightAtLine(line) < doc.scrollTop updateLineHeight(line, line.height + widgetHeight(widget)) if (aboveVisible) addToScrollPos(cm, null, widget.height) cm.curOp.forceUpdate = true diff --git a/src/model/mark_text.js b/src/model/mark_text.js index c103a57481..f15cefb29a 100644 --- a/src/model/mark_text.js +++ b/src/model/mark_text.js @@ -27,7 +27,10 @@ import { reCheckSelection } from "./selection_updates" // marker continues beyond the start/end of the line. Markers have // links back to the lines they currently touch. -var nextMarkerId = 0 +// Collapsed markers have unique ids, in order to be able to order +// them, which is needed for uniquely determining an outer marker +// when they overlap (they may nest, but not partially overlap). +let nextMarkerId = 0 export function TextMarker(doc, type) { this.lines = [] @@ -40,16 +43,16 @@ eventMixin(TextMarker) // Clear the marker. TextMarker.prototype.clear = function() { if (this.explicitlyCleared) return - var cm = this.doc.cm, withOp = cm && !cm.curOp + let cm = this.doc.cm, withOp = cm && !cm.curOp if (withOp) startOperation(cm) if (hasHandler(this, "clear")) { - var found = this.find() + let found = this.find() if (found) signalLater(this, "clear", found.from, found.to) } - var min = null, max = null - for (var i = 0; i < this.lines.length; ++i) { - var line = this.lines[i] - var span = getMarkedSpanFor(line.markedSpans, this) + let min = null, max = null + for (let i = 0; i < this.lines.length; ++i) { + let line = this.lines[i] + let span = getMarkedSpanFor(line.markedSpans, this) if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text") else if (cm) { if (span.to != null) max = lineNo(line) @@ -59,8 +62,8 @@ TextMarker.prototype.clear = function() { if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm) updateLineHeight(line, textHeight(cm.display)) } - if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) { - var visual = visualLine(this.lines[i]), len = lineLength(visual) + if (cm && this.collapsed && !cm.options.lineWrapping) for (let i = 0; i < this.lines.length; ++i) { + let visual = visualLine(this.lines[i]), len = lineLength(visual) if (len > cm.display.maxLineLength) { cm.display.maxLine = visual cm.display.maxLineLength = len @@ -87,10 +90,10 @@ TextMarker.prototype.clear = function() { // number (used to prevent looking up the same line twice). TextMarker.prototype.find = function(side, lineObj) { if (side == null && this.type == "bookmark") side = 1 - var from, to - for (var i = 0; i < this.lines.length; ++i) { - var line = this.lines[i] - var span = getMarkedSpanFor(line.markedSpans, this) + let from, to + for (let i = 0; i < this.lines.length; ++i) { + let line = this.lines[i] + let span = getMarkedSpanFor(line.markedSpans, this) if (span.from != null) { from = Pos(lineObj ? line : lineNo(line), span.from) if (side == -1) return from @@ -106,20 +109,20 @@ TextMarker.prototype.find = function(side, lineObj) { // Signals that the marker's widget changed, and surrounding layout // should be recomputed. TextMarker.prototype.changed = function() { - var pos = this.find(-1, true), widget = this, cm = this.doc.cm + let pos = this.find(-1, true), widget = this, cm = this.doc.cm if (!pos || !cm) return runInOp(cm, function() { - var line = pos.line, lineN = lineNo(pos.line) - var view = findViewForLine(cm, lineN) + let line = pos.line, lineN = lineNo(pos.line) + let view = findViewForLine(cm, lineN) if (view) { clearLineMeasurementCacheFor(view) cm.curOp.selectionChanged = cm.curOp.forceUpdate = true } cm.curOp.updateMaxLine = true if (!lineIsHidden(widget.doc, line) && widget.height != null) { - var oldHeight = widget.height + let oldHeight = widget.height widget.height = null - var dHeight = widgetHeight(widget) - oldHeight + let dHeight = widgetHeight(widget) - oldHeight if (dHeight) updateLineHeight(line, line.height + dHeight) } @@ -128,7 +131,7 @@ TextMarker.prototype.changed = function() { TextMarker.prototype.attachLine = function(line) { if (!this.lines.length && this.doc.cm) { - var op = this.doc.cm.curOp + let op = this.doc.cm.curOp if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1) (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this) } @@ -137,16 +140,11 @@ TextMarker.prototype.attachLine = function(line) { TextMarker.prototype.detachLine = function(line) { this.lines.splice(indexOf(this.lines, line), 1) if (!this.lines.length && this.doc.cm) { - var op = this.doc.cm.curOp + let op = this.doc.cm.curOp ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this) } } -// Collapsed markers have unique ids, in order to be able to order -// them, which is needed for uniquely determining an outer marker -// when they overlap (they may nest, but not partially overlap). -var nextMarkerId = 0 - // Create a marker, wire it up to the right lines, and export function markText(doc, from, to, options, type) { // Shared markers (across linked documents) are handled separately @@ -156,7 +154,7 @@ export function markText(doc, from, to, options, type) { // Ensure we are in an operation. if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type) - var marker = new TextMarker(doc, type), diff = cmp(from, to) + let marker = new TextMarker(doc, type), diff = cmp(from, to) if (options) copyObj(options, marker, false) // Don't connect empty markers unless clearWhenEmpty is false if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false) @@ -178,7 +176,7 @@ export function markText(doc, from, to, options, type) { if (marker.addToHistory) addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN) - var curLine = from.line, cm = doc.cm, updateMaxLine + let curLine = from.line, cm = doc.cm, updateMaxLine doc.iter(curLine, to.line + 1, function(line) { if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine) updateMaxLine = true @@ -210,7 +208,7 @@ export function markText(doc, from, to, options, type) { if (marker.collapsed) regChange(cm, from.line, to.line + 1) else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css) - for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text") + for (let i = from.line; i <= to.line; i++) regLineChange(cm, i, "text") if (marker.atomic) reCheckSelection(cm.doc) signalLater(cm, "markerAdded", cm, marker) } @@ -225,7 +223,7 @@ export function markText(doc, from, to, options, type) { export function SharedTextMarker(markers, primary) { this.markers = markers this.primary = primary - for (var i = 0; i < markers.length; ++i) + for (let i = 0; i < markers.length; ++i) markers[i].parent = this } eventMixin(SharedTextMarker) @@ -233,7 +231,7 @@ eventMixin(SharedTextMarker) SharedTextMarker.prototype.clear = function() { if (this.explicitlyCleared) return this.explicitlyCleared = true - for (var i = 0; i < this.markers.length; ++i) + for (let i = 0; i < this.markers.length; ++i) this.markers[i].clear() signalLater(this, "clear") } @@ -244,12 +242,12 @@ SharedTextMarker.prototype.find = function(side, lineObj) { function markTextShared(doc, from, to, options, type) { options = copyObj(options) options.shared = false - var markers = [markText(doc, from, to, options, type)], primary = markers[0] - var widget = options.widgetNode + let markers = [markText(doc, from, to, options, type)], primary = markers[0] + let widget = options.widgetNode linkedDocs(doc, function(doc) { if (widget) options.widgetNode = widget.cloneNode(true) markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type)) - for (var i = 0; i < doc.linked.length; ++i) + for (let i = 0; i < doc.linked.length; ++i) if (doc.linked[i].isParent) return primary = lst(markers) }) @@ -262,11 +260,11 @@ export function findSharedMarkers(doc) { } export function copySharedMarkers(doc, markers) { - for (var i = 0; i < markers.length; i++) { - var marker = markers[i], pos = marker.find() - var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to) + for (let i = 0; i < markers.length; i++) { + let marker = markers[i], pos = marker.find() + let mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to) if (cmp(mFrom, mTo)) { - var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type) + let subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type) marker.markers.push(subMark) subMark.parent = marker } @@ -274,11 +272,11 @@ export function copySharedMarkers(doc, markers) { } export function detachSharedMarkers(markers) { - for (var i = 0; i < markers.length; i++) { - var marker = markers[i], linked = [marker.primary.doc] + for (let i = 0; i < markers.length; i++) { + let marker = markers[i], linked = [marker.primary.doc] linkedDocs(marker.primary.doc, function(d) { linked.push(d) }) - for (var j = 0; j < marker.markers.length; j++) { - var subMarker = marker.markers[j] + for (let j = 0; j < marker.markers.length; j++) { + let subMarker = marker.markers[j] if (indexOf(linked, subMarker.doc) == -1) { subMarker.parent = null marker.markers.splice(j--, 1) diff --git a/src/model/selection.js b/src/model/selection.js index c75fcd6186..63371954e1 100644 --- a/src/model/selection.js +++ b/src/model/selection.js @@ -16,26 +16,27 @@ Selection.prototype = { equals: function(other) { if (other == this) return true if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false - for (var i = 0; i < this.ranges.length; i++) { - var here = this.ranges[i], there = other.ranges[i] + for (let i = 0; i < this.ranges.length; i++) { + let here = this.ranges[i], there = other.ranges[i] if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false } return true }, deepCopy: function() { - for (var out = [], i = 0; i < this.ranges.length; i++) + let out = [] + for (let i = 0; i < this.ranges.length; i++) out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head)) return new Selection(out, this.primIndex) }, somethingSelected: function() { - for (var i = 0; i < this.ranges.length; i++) + for (let i = 0; i < this.ranges.length; i++) if (!this.ranges[i].empty()) return true return false }, contains: function(pos, end) { if (!end) end = pos - for (var i = 0; i < this.ranges.length; i++) { - var range = this.ranges[i] + for (let i = 0; i < this.ranges.length; i++) { + let range = this.ranges[i] if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0) return i } @@ -59,14 +60,14 @@ Range.prototype = { // build a selection out of it. 'Consumes' ranges array (modifying // it). export function normalizeSelection(ranges, primIndex) { - var prim = ranges[primIndex] + let prim = ranges[primIndex] ranges.sort(function(a, b) { return cmp(a.from(), b.from()) }) primIndex = indexOf(ranges, prim) - for (var i = 1; i < ranges.length; i++) { - var cur = ranges[i], prev = ranges[i - 1] + for (let i = 1; i < ranges.length; i++) { + let cur = ranges[i], prev = ranges[i - 1] if (cmp(prev.to(), cur.from()) >= 0) { - var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to()) - var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head + let from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to()) + let inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head if (i <= primIndex) --primIndex ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to)) } diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js index 640af1f249..0e310a5d2d 100644 --- a/src/model/selection_updates.js +++ b/src/model/selection_updates.js @@ -18,9 +18,9 @@ import { normalizeSelection, Range, Selection, simpleSelection } from "./selecti // Used for cursor motion and such. export function extendRange(doc, range, head, other) { if (doc.cm && doc.cm.display.shift || doc.extend) { - var anchor = range.anchor + let anchor = range.anchor if (other) { - var posBefore = cmp(head, anchor) < 0 + let posBefore = cmp(head, anchor) < 0 if (posBefore != (cmp(other, anchor) < 0)) { anchor = head head = other @@ -42,15 +42,16 @@ export function extendSelection(doc, head, other, options) { // Extend all selections (pos is an array of selections with length // equal the number of selections) export function extendSelections(doc, heads, options) { - for (var out = [], i = 0; i < doc.sel.ranges.length; i++) + let out = [] + for (let i = 0; i < doc.sel.ranges.length; i++) out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null) - var newSel = normalizeSelection(out, doc.sel.primIndex) + let newSel = normalizeSelection(out, doc.sel.primIndex) setSelection(doc, newSel, options) } // Updates a single range in the selection. export function replaceOneSelection(doc, i, range, options) { - var ranges = doc.sel.ranges.slice(0) + let ranges = doc.sel.ranges.slice(0) ranges[i] = range setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options) } @@ -63,11 +64,11 @@ export function setSimpleSelection(doc, anchor, head, options) { // Give beforeSelectionChange handlers a change to influence a // selection update. function filterSelectionChange(doc, sel, options) { - var obj = { + let obj = { ranges: sel.ranges, update: function(ranges) { this.ranges = [] - for (var i = 0; i < ranges.length; i++) + for (let i = 0; i < ranges.length; i++) this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor), clipPos(doc, ranges[i].head)) }, @@ -80,7 +81,7 @@ function filterSelectionChange(doc, sel, options) { } export function setSelectionReplaceHistory(doc, sel, options) { - var done = doc.history.done, last = lst(done) + let done = doc.history.done, last = lst(done) if (last && last.ranges) { done[done.length - 1] = sel setSelectionNoUndo(doc, sel, options) @@ -99,7 +100,7 @@ export function setSelectionNoUndo(doc, sel, options) { if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange")) sel = filterSelectionChange(doc, sel, options) - var bias = options && options.bias || + let bias = options && options.bias || (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1) setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true)) @@ -128,12 +129,12 @@ export function reCheckSelection(doc) { // Return a selection that does not partially select any atomic // ranges. function skipAtomicInSelection(doc, sel, bias, mayClear) { - var out - for (var i = 0; i < sel.ranges.length; i++) { - var range = sel.ranges[i] - var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i] - var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear) - var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear) + let out + for (let i = 0; i < sel.ranges.length; i++) { + let range = sel.ranges[i] + let old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i] + let newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear) + let newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear) if (out || newAnchor != range.anchor || newHead != range.head) { if (!out) out = sel.ranges.slice(0, i) out[i] = new Range(newAnchor, newHead) @@ -143,9 +144,9 @@ function skipAtomicInSelection(doc, sel, bias, mayClear) { } function skipAtomicInner(doc, pos, oldPos, dir, mayClear) { - var line = getLine(doc, pos.line) - if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) { - var sp = line.markedSpans[i], m = sp.marker + let line = getLine(doc, pos.line) + if (line.markedSpans) for (let i = 0; i < line.markedSpans.length; ++i) { + let sp = line.markedSpans[i], m = sp.marker if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) && (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) { if (mayClear) { @@ -158,14 +159,14 @@ function skipAtomicInner(doc, pos, oldPos, dir, mayClear) { if (!m.atomic) continue if (oldPos) { - var near = m.find(dir < 0 ? 1 : -1), diff + let near = m.find(dir < 0 ? 1 : -1), diff if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft) near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null) if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0)) return skipAtomicInner(doc, near, pos, dir, mayClear) } - var far = m.find(dir < 0 ? -1 : 1) + let far = m.find(dir < 0 ? -1 : 1) if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight) far = movePos(doc, far, dir, far.line == pos.line ? line : null) return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null @@ -176,8 +177,8 @@ function skipAtomicInner(doc, pos, oldPos, dir, mayClear) { // Ensure a given position is not inside an atomic range. export function skipAtomic(doc, pos, oldPos, bias, mayClear) { - var dir = bias || 1 - var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) || + let dir = bias || 1 + let found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) || (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) || skipAtomicInner(doc, pos, oldPos, -dir, mayClear) || (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true)) diff --git a/src/modes.js b/src/modes.js index 15d16cefcb..065a463b5b 100644 --- a/src/modes.js +++ b/src/modes.js @@ -1,7 +1,7 @@ import { copyObj, createObj } from "./util/misc" // Known modes, by name and by MIME -export var modes = {}, mimeModes = {} +export let modes = {}, mimeModes = {} // Extra arguments are stored as the mode's dependencies, which is // used by (legacy) mechanisms like loadmode.js to automatically @@ -22,7 +22,7 @@ export function resolveMode(spec) { if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) { spec = mimeModes[spec] } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) { - var found = mimeModes[spec.name] + let found = mimeModes[spec.name] if (typeof found == "string") found = {name: found} spec = createObj(found, spec) spec.name = found.name @@ -38,13 +38,13 @@ export function resolveMode(spec) { // Given a mode spec (anything that resolveMode accepts), find and // initialize an actual mode object. export function getMode(options, spec) { - var spec = resolveMode(spec) - var mfactory = modes[spec.name] + spec = resolveMode(spec) + let mfactory = modes[spec.name] if (!mfactory) return getMode(options, "text/plain") - var modeObj = mfactory(options, spec) + let modeObj = mfactory(options, spec) if (modeExtensions.hasOwnProperty(spec.name)) { - var exts = modeExtensions[spec.name] - for (var prop in exts) { + let exts = modeExtensions[spec.name] + for (let prop in exts) { if (!exts.hasOwnProperty(prop)) continue if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop] modeObj[prop] = exts[prop] @@ -52,7 +52,7 @@ export function getMode(options, spec) { } modeObj.name = spec.name if (spec.helperType) modeObj.helperType = spec.helperType - if (spec.modeProps) for (var prop in spec.modeProps) + if (spec.modeProps) for (let prop in spec.modeProps) modeObj[prop] = spec.modeProps[prop] return modeObj @@ -60,18 +60,18 @@ export function getMode(options, spec) { // This can be used to attach properties to mode objects from // outside the actual mode definition. -export var modeExtensions = {} +export let modeExtensions = {} export function extendMode(mode, properties) { - var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {}) + let exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {}) copyObj(properties, exts) } export function copyState(mode, state) { if (state === true) return state if (mode.copyState) return mode.copyState(state) - var nstate = {} - for (var n in state) { - var val = state[n] + let nstate = {} + for (let n in state) { + let val = state[n] if (val instanceof Array) val = val.concat([]) nstate[n] = val } @@ -81,8 +81,9 @@ export function copyState(mode, state) { // Given a mode and a state (for that mode), find the inner mode and // state at the position that the state refers to. export function innerMode(mode, state) { + let info while (mode.innerMode) { - var info = mode.innerMode(state) + info = mode.innerMode(state) if (!info || info.mode == mode) break state = info.state mode = info.mode diff --git a/src/util/StringStream.js b/src/util/StringStream.js index d04807426c..cf7b8244a9 100644 --- a/src/util/StringStream.js +++ b/src/util/StringStream.js @@ -5,7 +5,7 @@ import { countColumn } from "./misc" // Fed to the mode parsers, provides helper functions to make // parsers more succinct. -var StringStream = function(string, tabSize) { +let StringStream = function(string, tabSize) { this.pos = this.start = 0 this.string = string this.tabSize = tabSize || 8 @@ -22,24 +22,25 @@ StringStream.prototype = { return this.string.charAt(this.pos++) }, eat: function(match) { - var ch = this.string.charAt(this.pos) - if (typeof match == "string") var ok = ch == match - else var ok = ch && (match.test ? match.test(ch) : match(ch)) + let ch = this.string.charAt(this.pos) + let ok + if (typeof match == "string") ok = ch == match + else ok = ch && (match.test ? match.test(ch) : match(ch)) if (ok) {++this.pos; return ch} }, eatWhile: function(match) { - var start = this.pos + let start = this.pos while (this.eat(match)){} return this.pos > start }, eatSpace: function() { - var start = this.pos + let start = this.pos while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos return this.pos > start }, skipToEnd: function() {this.pos = this.string.length}, skipTo: function(ch) { - var found = this.string.indexOf(ch, this.pos) + let found = this.string.indexOf(ch, this.pos) if (found > -1) {this.pos = found; return true} }, backUp: function(n) {this.pos -= n}, @@ -56,14 +57,14 @@ StringStream.prototype = { }, match: function(pattern, consume, caseInsensitive) { if (typeof pattern == "string") { - var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str} - var substr = this.string.substr(this.pos, pattern.length) + let cased = function(str) {return caseInsensitive ? str.toLowerCase() : str} + let substr = this.string.substr(this.pos, pattern.length) if (cased(substr) == cased(pattern)) { if (consume !== false) this.pos += pattern.length return true } } else { - var match = this.string.slice(this.pos).match(pattern) + let match = this.string.slice(this.pos).match(pattern) if (match && match.index > 0) return null if (match && consume !== false) this.pos += match[0].length return match diff --git a/src/util/bidi.js b/src/util/bidi.js index f12dccf50b..4c365f4c9b 100644 --- a/src/util/bidi.js +++ b/src/util/bidi.js @@ -4,9 +4,9 @@ import { isExtendingChar, lst } from "./misc" export function iterateBidiSections(order, from, to, f) { if (!order) return f(from, to, "ltr") - var found = false - for (var i = 0; i < order.length; ++i) { - var part = order[i] + let found = false + for (let i = 0; i < order.length; ++i) { + let part = order[i] if (part.from < to && part.to > from || from == to && part.to == from) { f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr") found = true @@ -18,25 +18,26 @@ export function iterateBidiSections(order, from, to, f) { export function bidiLeft(part) { return part.level % 2 ? part.to : part.from } export function bidiRight(part) { return part.level % 2 ? part.from : part.to } -export function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0 } +export function lineLeft(line) { let order = getOrder(line); return order ? bidiLeft(order[0]) : 0 } export function lineRight(line) { - var order = getOrder(line) + let order = getOrder(line) if (!order) return line.text.length return bidiRight(lst(order)) } function compareBidiLevel(order, a, b) { - var linedir = order[0].level + let linedir = order[0].level if (a == linedir) return true if (b == linedir) return false return a < b } -export var bidiOther = null +export let bidiOther = null export function getBidiPartAt(order, pos) { + let found bidiOther = null - for (var i = 0, found; i < order.length; ++i) { - var cur = order[i] + for (let i = 0; i < order.length; ++i) { + let cur = order[i] if (cur.from < pos && cur.to > pos) return i if ((cur.from == pos || cur.to == pos)) { if (found == null) { @@ -66,10 +67,10 @@ function moveInLine(line, pos, dir, byUnit) { // LTR text touch each other. This often requires the cursor offset // to move more than one unit, in order to visually move one unit. export function moveVisually(line, start, dir, byUnit) { - var bidi = getOrder(line) + let bidi = getOrder(line) if (!bidi) return moveLogically(line, start, dir, byUnit) - var pos = getBidiPartAt(bidi, start), part = bidi[pos] - var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit) + let pos = getBidiPartAt(bidi, start), part = bidi[pos] + let target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit) for (;;) { if (target > part.from && target < part.to) return target @@ -89,7 +90,7 @@ export function moveVisually(line, start, dir, byUnit) { } export function moveLogically(line, start, dir, byUnit) { - var target = start + dir + let target = start + dir if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir return target < 0 || target > line.text.length ? null : target } @@ -117,11 +118,11 @@ export function moveLogically(line, start, dir, byUnit) { // Returns null if characters are ordered as they appear // (left-to-right), or an array of sections ({from, to, level} // objects) in the order in which they occur visually. -export var bidiOrdering = (function() { +export let bidiOrdering = (function() { // Character types for codepoints 0 to 0xff - var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN" + let lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN" // Character types for codepoints 0x600 to 0x6ff - var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm" + let arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm" function charType(code) { if (code <= 0xf7) return lowTypes.charAt(code) else if (0x590 <= code && code <= 0x5f4) return "R" @@ -132,10 +133,10 @@ export var bidiOrdering = (function() { else return "L" } - var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/ - var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/ + let bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/ + let isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/ // Browsers seem to always treat the boundaries of block elements as being L. - var outerType = "L" + let outerType = "L" function BidiSpan(level, from, to) { this.level = level @@ -144,16 +145,16 @@ export var bidiOrdering = (function() { return function(str) { if (!bidiRE.test(str)) return false - var len = str.length, types = [] - for (var i = 0, type; i < len; ++i) - types.push(type = charType(str.charCodeAt(i))) + let len = str.length, types = [] + for (let i = 0; i < len; ++i) + types.push(charType(str.charCodeAt(i))) // W1. Examine each non-spacing mark (NSM) in the level run, and // change the type of the NSM to the type of the previous // character. If the NSM is at the start of the level run, it will // get the type of sor. - for (var i = 0, prev = outerType; i < len; ++i) { - var type = types[i] + for (let i = 0, prev = outerType; i < len; ++i) { + let type = types[i] if (type == "m") types[i] = prev else prev = type } @@ -163,8 +164,8 @@ export var bidiOrdering = (function() { // AL is found, change the type of the European number to Arabic // number. // W3. Change all ALs to R. - for (var i = 0, cur = outerType; i < len; ++i) { - var type = types[i] + for (let i = 0, cur = outerType; i < len; ++i) { + let type = types[i] if (type == "1" && cur == "r") types[i] = "n" else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R" } } @@ -172,8 +173,8 @@ export var bidiOrdering = (function() { // W4. A single European separator between two European numbers // changes to a European number. A single common separator between // two numbers of the same type changes to that type. - for (var i = 1, prev = types[0]; i < len - 1; ++i) { - var type = types[i] + for (let i = 1, prev = types[0]; i < len - 1; ++i) { + let type = types[i] if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1" else if (type == "," && prev == types[i+1] && (prev == "1" || prev == "n")) types[i] = prev @@ -184,13 +185,14 @@ export var bidiOrdering = (function() { // numbers changes to all European numbers. // W6. Otherwise, separators and terminators change to Other // Neutral. - for (var i = 0; i < len; ++i) { - var type = types[i] + for (let i = 0; i < len; ++i) { + let type = types[i] if (type == ",") types[i] = "N" else if (type == "%") { - for (var end = i + 1; end < len && types[end] == "%"; ++end) {} - var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N" - for (var j = i; j < end; ++j) types[j] = replace + let end + for (end = i + 1; end < len && types[end] == "%"; ++end) {} + let replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N" + for (let j = i; j < end; ++j) types[j] = replace i = end - 1 } } @@ -198,8 +200,8 @@ export var bidiOrdering = (function() { // W7. Search backwards from each instance of a European number // until the first strong type (R, L, or sor) is found. If an L is // found, then change the type of the European number to L. - for (var i = 0, cur = outerType; i < len; ++i) { - var type = types[i] + for (let i = 0, cur = outerType; i < len; ++i) { + let type = types[i] if (cur == "L" && type == "1") types[i] = "L" else if (isStrong.test(type)) cur = type } @@ -210,13 +212,14 @@ export var bidiOrdering = (function() { // terms of their influence on neutrals. Start-of-level-run (sor) // and end-of-level-run (eor) are used at level run boundaries. // N2. Any remaining neutrals take the embedding direction. - for (var i = 0; i < len; ++i) { + for (let i = 0; i < len; ++i) { if (isNeutral.test(types[i])) { - for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {} - var before = (i ? types[i-1] : outerType) == "L" - var after = (end < len ? types[end] : outerType) == "L" - var replace = before || after ? "L" : "R" - for (var j = i; j < end; ++j) types[j] = replace + let end + for (end = i + 1; end < len && isNeutral.test(types[end]); ++end) {} + let before = (i ? types[i-1] : outerType) == "L" + let after = (end < len ? types[end] : outerType) == "L" + let replace = before || after ? "L" : "R" + for (let j = i; j < end; ++j) types[j] = replace i = end - 1 } } @@ -226,19 +229,19 @@ export var bidiOrdering = (function() { // levels (0, 1, 2) in an implementation that doesn't take // explicit embedding into account, we can build up the order on // the fly, without following the level-based algorithm. - var order = [], m - for (var i = 0; i < len;) { + let order = [], m + for (let i = 0; i < len;) { if (countsAsLeft.test(types[i])) { - var start = i + let start = i for (++i; i < len && countsAsLeft.test(types[i]); ++i) {} order.push(new BidiSpan(0, start, i)) } else { - var pos = i, at = order.length + let pos = i, at = order.length for (++i; i < len && types[i] != "L"; ++i) {} - for (var j = pos; j < i;) { + for (let j = pos; j < i;) { if (countsAsNum.test(types[j])) { if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j)) - var nstart = j + let nstart = j for (++j; j < i && countsAsNum.test(types[j]); ++j) {} order.splice(at, 0, new BidiSpan(2, nstart, j)) pos = j @@ -268,7 +271,7 @@ export var bidiOrdering = (function() { // false for lines that are fully left-to-right, and an array of // BidiSpan objects otherwise. export function getOrder(line) { - var order = line.order + let order = line.order if (order == null) order = line.order = bidiOrdering(line.text) return order } diff --git a/src/util/browser.js b/src/util/browser.js index ae48fb5c65..ce678a82a4 100644 --- a/src/util/browser.js +++ b/src/util/browser.js @@ -1,31 +1,31 @@ // Kludges for bugs and behavior differences that can't be feature // detected are enabled based on userAgent etc sniffing. -var userAgent = navigator.userAgent -var platform = navigator.platform +let userAgent = navigator.userAgent +let platform = navigator.platform -export var gecko = /gecko\/\d/i.test(userAgent) -var ie_upto10 = /MSIE \d/.test(userAgent) -var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent) -export var ie = ie_upto10 || ie_11up -export var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]) -export var webkit = /WebKit\//.test(userAgent) -var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent) -export var chrome = /Chrome\//.test(userAgent) -export var presto = /Opera\//.test(userAgent) -export var safari = /Apple Computer/.test(navigator.vendor) -export var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent) -export var phantom = /PhantomJS/.test(userAgent) +export let gecko = /gecko\/\d/i.test(userAgent) +let ie_upto10 = /MSIE \d/.test(userAgent) +let ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent) +export let ie = ie_upto10 || ie_11up +export let ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]) +export let webkit = /WebKit\//.test(userAgent) +let qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent) +export let chrome = /Chrome\//.test(userAgent) +export let presto = /Opera\//.test(userAgent) +export let safari = /Apple Computer/.test(navigator.vendor) +export let mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent) +export let phantom = /PhantomJS/.test(userAgent) -export var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent) +export let ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent) // This is woefully incomplete. Suggestions for alternative methods welcome. -export var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent) -export var mac = ios || /Mac/.test(platform) -export var chromeOS = /\bCrOS\b/.test(userAgent) -export var windows = /win/i.test(platform) +export let mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent) +export let mac = ios || /Mac/.test(platform) +export let chromeOS = /\bCrOS\b/.test(userAgent) +export let windows = /win/i.test(platform) -var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/) +let presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/) if (presto_version) presto_version = Number(presto_version[1]) if (presto_version && presto_version >= 15) { presto = false; webkit = true } // Some browsers use the wrong event properties to signal cmd/ctrl on OS X -export var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11)) -export var captureRightClick = gecko || (ie && ie_version >= 9) +export let flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11)) +export let captureRightClick = gecko || (ie && ie_version >= 9) diff --git a/src/util/dom.js b/src/util/dom.js index df2cfd0aac..465dbb5a5e 100644 --- a/src/util/dom.js +++ b/src/util/dom.js @@ -2,17 +2,17 @@ import { ie, ie_version, ios } from "./browser" export function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") } -export var rmClass = function(node, cls) { - var current = node.className - var match = classTest(cls).exec(current) +export let rmClass = function(node, cls) { + let current = node.className + let match = classTest(cls).exec(current) if (match) { - var after = current.slice(match.index + match[0].length) + let after = current.slice(match.index + match[0].length) node.className = current.slice(0, match.index) + (after ? match[1] + after : "") } } export function removeChildren(e) { - for (var count = e.childNodes.length; count > 0; --count) + for (let count = e.childNodes.length; count > 0; --count) e.removeChild(e.firstChild) return e } @@ -22,23 +22,23 @@ export function removeChildrenAndAdd(parent, e) { } export function elt(tag, content, className, style) { - var e = document.createElement(tag) + let e = document.createElement(tag) if (className) e.className = className if (style) e.style.cssText = style if (typeof content == "string") e.appendChild(document.createTextNode(content)) - else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]) + else if (content) for (let i = 0; i < content.length; ++i) e.appendChild(content[i]) return e } -export var range +export let range if (document.createRange) range = function(node, start, end, endNode) { - var r = document.createRange() + let r = document.createRange() r.setEnd(endNode || node, end) r.setStart(node, start) return r } else range = function(node, start, end) { - var r = document.body.createTextRange() + let r = document.body.createTextRange() try { r.moveToElementText(node.parentNode) } catch(e) { return r } r.collapse(true) @@ -58,8 +58,8 @@ export function contains(parent, child) { } while (child = child.parentNode) } -export var activeElt = function() { - var activeElement = document.activeElement +export let activeElt = function() { + let activeElement = document.activeElement while (activeElement && activeElement.root && activeElement.root.activeElement) activeElement = activeElement.root.activeElement return activeElement @@ -72,17 +72,17 @@ if (ie && ie_version < 11) activeElt = function() { } export function addClass(node, cls) { - var current = node.className + let current = node.className if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls } export function joinClasses(a, b) { - var as = a.split(" ") - for (var i = 0; i < as.length; i++) + let as = a.split(" ") + for (let i = 0; i < as.length; i++) if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i] return b } -export var selectInput = function(node) { node.select() } +export let selectInput = function(node) { node.select() } if (ios) // Mobile Safari apparently has a bug where select() is broken. selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length } else if (ie) // Suppress mysterious IE10 errors diff --git a/src/util/event.js b/src/util/event.js index b2137583fb..e667a9f3c0 100644 --- a/src/util/event.js +++ b/src/util/event.js @@ -6,21 +6,21 @@ import { indexOf } from "./misc" // Lightweight event framework. on/off also work on DOM nodes, // registering native DOM handlers. -export var on = function(emitter, type, f) { +export let on = function(emitter, type, f) { if (emitter.addEventListener) emitter.addEventListener(type, f, false) else if (emitter.attachEvent) emitter.attachEvent("on" + type, f) else { - var map = emitter._handlers || (emitter._handlers = {}) - var arr = map[type] || (map[type] = []) + let map = emitter._handlers || (emitter._handlers = {}) + let arr = map[type] || (map[type] = []) arr.push(f) } } -var noHandlers = [] +let noHandlers = [] export function getHandlers(emitter, type, copy) { - var arr = emitter._handlers && emitter._handlers[type] + let arr = emitter._handlers && emitter._handlers[type] if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers else return arr || noHandlers } @@ -31,17 +31,17 @@ export function off(emitter, type, f) { else if (emitter.detachEvent) emitter.detachEvent("on" + type, f) else { - var handlers = getHandlers(emitter, type, false) - for (var i = 0; i < handlers.length; ++i) + let handlers = getHandlers(emitter, type, false) + for (let i = 0; i < handlers.length; ++i) if (handlers[i] == f) { handlers.splice(i, 1); break } } } export function signal(emitter, type /*, values...*/) { - var handlers = getHandlers(emitter, type, true) + let handlers = getHandlers(emitter, type, true) if (!handlers.length) return - var args = Array.prototype.slice.call(arguments, 2) - for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args) + let args = Array.prototype.slice.call(arguments, 2) + for (let i = 0; i < handlers.length; ++i) handlers[i].apply(null, args) } // The DOM events that CodeMirror handles can be overridden by @@ -55,10 +55,10 @@ export function signalDOMEvent(cm, e, override) { } export function signalCursorActivity(cm) { - var arr = cm._handlers && cm._handlers.cursorActivity + let arr = cm._handlers && cm._handlers.cursorActivity if (!arr) return - var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []) - for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1) + let set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []) + for (let i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1) set.push(arr[i]) } @@ -91,7 +91,7 @@ export function e_stop(e) {e_preventDefault(e); e_stopPropagation(e)} export function e_target(e) {return e.target || e.srcElement} export function e_button(e) { - var b = e.which + let b = e.which if (b == null) { if (e.button & 1) b = 1 else if (e.button & 2) b = 3 diff --git a/src/util/feature_detection.js b/src/util/feature_detection.js index 1e9baf41e5..d98393af90 100644 --- a/src/util/feature_detection.js +++ b/src/util/feature_detection.js @@ -2,35 +2,35 @@ import { elt, range, removeChildren, removeChildrenAndAdd } from "./dom" import { ie, ie_version } from "./browser" // Detect drag-and-drop -export var dragAndDrop = function() { +export let dragAndDrop = function() { // There is *some* kind of drag-and-drop support in IE6-8, but I // couldn't get it to work yet. if (ie && ie_version < 9) return false - var div = elt('div') + let div = elt('div') return "draggable" in div || "dragDrop" in div }() -var zwspSupported +let zwspSupported export function zeroWidthElement(measure) { if (zwspSupported == null) { - var test = elt("span", "\u200b") + let test = elt("span", "\u200b") removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")])) if (measure.firstChild.offsetHeight != 0) zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8) } - var node = zwspSupported ? elt("span", "\u200b") : + let node = zwspSupported ? elt("span", "\u200b") : elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px") node.setAttribute("cm-text", "") return node } // Feature-detect IE's crummy client rect reporting for bidi text -var badBidiRects +let badBidiRects export function hasBadBidiRects(measure) { if (badBidiRects != null) return badBidiRects - var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA")) - var r0 = range(txt, 0, 1).getBoundingClientRect() - var r1 = range(txt, 1, 2).getBoundingClientRect() + let txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA")) + let r0 = range(txt, 0, 1).getBoundingClientRect() + let r1 = range(txt, 1, 2).getBoundingClientRect() removeChildren(measure) if (!r0 || r0.left == r0.right) return false // Safari returns null in some cases (#2780) return badBidiRects = (r1.right - r0.right < 3) @@ -38,13 +38,13 @@ export function hasBadBidiRects(measure) { // See if "".split is the broken IE version, if so, provide an // alternative way to split lines. -export var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function(string) { - var pos = 0, result = [], l = string.length +export let splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function(string) { + let pos = 0, result = [], l = string.length while (pos <= l) { - var nl = string.indexOf("\n", pos) + let nl = string.indexOf("\n", pos) if (nl == -1) nl = string.length - var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl) - var rt = line.indexOf("\r") + let line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl) + let rt = line.indexOf("\r") if (rt != -1) { result.push(line.slice(0, rt)) pos += rt + 1 @@ -56,28 +56,29 @@ export var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function(string) { return result } : function(string){return string.split(/\r\n?|\n/)} -export var hasSelection = window.getSelection ? function(te) { +export let hasSelection = window.getSelection ? function(te) { try { return te.selectionStart != te.selectionEnd } catch(e) { return false } } : function(te) { - try {var range = te.ownerDocument.selection.createRange()} + let range + try {range = te.ownerDocument.selection.createRange()} catch(e) {} if (!range || range.parentElement() != te) return false return range.compareEndPoints("StartToEnd", range) != 0 } -export var hasCopyEvent = (function() { - var e = elt("div") +export let hasCopyEvent = (function() { + let e = elt("div") if ("oncopy" in e) return true e.setAttribute("oncopy", "return;") return typeof e.oncopy == "function" })() -var badZoomedRects = null +let badZoomedRects = null export function hasBadZoomedRects(measure) { if (badZoomedRects != null) return badZoomedRects - var node = removeChildrenAndAdd(measure, elt("span", "x")) - var normal = node.getBoundingClientRect() - var fromRange = range(node, 0, 1).getBoundingClientRect() + let node = removeChildrenAndAdd(measure, elt("span", "x")) + let normal = node.getBoundingClientRect() + let fromRange = range(node, 0, 1).getBoundingClientRect() return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1 } diff --git a/src/util/misc.js b/src/util/misc.js index a6e3340db1..c94de8bd2c 100644 --- a/src/util/misc.js +++ b/src/util/misc.js @@ -1,11 +1,11 @@ export function bind(f) { - var args = Array.prototype.slice.call(arguments, 1) + let args = Array.prototype.slice.call(arguments, 1) return function(){return f.apply(null, args)} } export function copyObj(obj, target, overwrite) { if (!target) target = {} - for (var prop in obj) + for (let prop in obj) if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop))) target[prop] = obj[prop] return target @@ -18,8 +18,8 @@ export function countColumn(string, end, tabSize, startIndex, startValue) { end = string.search(/[^\s\u00a0]/) if (end == -1) end = string.length } - for (var i = startIndex || 0, n = startValue || 0;;) { - var nextTab = string.indexOf("\t", i) + for (let i = startIndex || 0, n = startValue || 0;;) { + let nextTab = string.indexOf("\t", i) if (nextTab < 0 || nextTab >= end) return n + (end - i) n += nextTab - i @@ -35,28 +35,28 @@ Delayed.prototype.set = function(ms, f) { } export function indexOf(array, elt) { - for (var i = 0; i < array.length; ++i) + for (let i = 0; i < array.length; ++i) if (array[i] == elt) return i return -1 } // Number of pixels added to scroller and sizer to hide scrollbar -export var scrollerGap = 30 +export let scrollerGap = 30 // Returned or thrown by various protocols to signal 'I'm not // handling this'. -export var Pass = {toString: function(){return "CodeMirror.Pass"}} +export let Pass = {toString: function(){return "CodeMirror.Pass"}} // Reused option objects for setSelection & friends -export var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"} +export let sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"} // The inverse of countColumn -- find the offset that corresponds to // a particular column. export function findColumn(string, goal, tabSize) { - for (var pos = 0, col = 0;;) { - var nextTab = string.indexOf("\t", pos) + for (let pos = 0, col = 0;;) { + let nextTab = string.indexOf("\t", pos) if (nextTab == -1) nextTab = string.length - var skipped = nextTab - pos + let skipped = nextTab - pos if (nextTab == string.length || col + skipped >= goal) return pos + Math.min(skipped, goal - col) col += nextTab - pos @@ -66,7 +66,7 @@ export function findColumn(string, goal, tabSize) { } } -var spaceStrs = [""] +let spaceStrs = [""] export function spaceStr(n) { while (spaceStrs.length <= n) spaceStrs.push(lst(spaceStrs) + " ") @@ -76,13 +76,13 @@ export function spaceStr(n) { export function lst(arr) { return arr[arr.length-1] } export function map(array, f) { - var out = [] - for (var i = 0; i < array.length; i++) out[i] = f(array[i], i) + let out = [] + for (let i = 0; i < array.length; i++) out[i] = f(array[i], i) return out } export function insertSorted(array, value, score) { - var pos = 0, priority = score(value) + let pos = 0, priority = score(value) while (pos < array.length && score(array[pos]) <= priority) pos++ array.splice(pos, 0, value) } @@ -90,7 +90,7 @@ export function insertSorted(array, value, score) { export function nothing() {} export function createObj(base, props) { - var inst + let inst if (Object.create) { inst = Object.create(base) } else { @@ -101,7 +101,7 @@ export function createObj(base, props) { return inst } -var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/ +let nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/ export function isWordCharBasic(ch) { return /\w/.test(ch) || ch > "\x80" && (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch)) @@ -113,7 +113,7 @@ export function isWordChar(ch, helper) { } export function isEmpty(obj) { - for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false + for (let n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false return true } @@ -122,5 +122,5 @@ export function isEmpty(obj) { // as editing and measuring is concerned. This is not fully correct, // since some scripts/fonts/browsers also treat other configurations // of code points as a group. -var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/ +let extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/ export function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) } diff --git a/src/util/operation_group.js b/src/util/operation_group.js index d48f6eb32a..d743f994e5 100644 --- a/src/util/operation_group.js +++ b/src/util/operation_group.js @@ -1,6 +1,6 @@ import { getHandlers } from "./event" -var operationGroup = null +let operationGroup = null export function pushOperation(op) { if (operationGroup) { @@ -16,12 +16,12 @@ export function pushOperation(op) { function fireCallbacksForOps(group) { // Calls delayed callbacks and cursorActivity handlers until no // new ones appear - var callbacks = group.delayedCallbacks, i = 0 + let callbacks = group.delayedCallbacks, i = 0 do { for (; i < callbacks.length; i++) callbacks[i].call(null) - for (var j = 0; j < group.ops.length; j++) { - var op = group.ops[j] + for (let j = 0; j < group.ops.length; j++) { + let op = group.ops[j] if (op.cursorActivityHandlers) while (op.cursorActivityCalled < op.cursorActivityHandlers.length) op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm) @@ -30,7 +30,7 @@ function fireCallbacksForOps(group) { } export function finishOperation(op, endCb) { - var group = op.ownsGroup + let group = op.ownsGroup if (!group) return try { fireCallbacksForOps(group) } @@ -40,7 +40,7 @@ export function finishOperation(op, endCb) { } } -var orphanDelayedCallbacks = null +let orphanDelayedCallbacks = null // Often, we want to signal events at a point where we are in the // middle of some work, but don't want the handler to start calling @@ -50,9 +50,9 @@ var orphanDelayedCallbacks = null // them to be executed when the last operation ends, or, if no // operation is active, when a timeout fires. export function signalLater(emitter, type /*, values...*/) { - var arr = getHandlers(emitter, type, false) + let arr = getHandlers(emitter, type, false) if (!arr.length) return - var args = Array.prototype.slice.call(arguments, 2), list + let args = Array.prototype.slice.call(arguments, 2), list if (operationGroup) { list = operationGroup.delayedCallbacks } else if (orphanDelayedCallbacks) { @@ -62,12 +62,12 @@ export function signalLater(emitter, type /*, values...*/) { setTimeout(fireOrphanDelayed, 0) } function bnd(f) {return function(){f.apply(null, args)}} - for (var i = 0; i < arr.length; ++i) + for (let i = 0; i < arr.length; ++i) list.push(bnd(arr[i])) } function fireOrphanDelayed() { - var delayed = orphanDelayedCallbacks + let delayed = orphanDelayedCallbacks orphanDelayedCallbacks = null - for (var i = 0; i < delayed.length; ++i) delayed[i]() + for (let i = 0; i < delayed.length; ++i) delayed[i]() }