Convert anonymous to arrow functions

Author: adrianheine

src/display/focus.js

@@ -9,12 +9,10 @@ export function ensureFocus(cm) {
 
 export function delayBlurEvent(cm) {
   cm.state.delayingBlurEvent = true
-  setTimeout(function() {
-    if (cm.state.delayingBlurEvent) {
-      cm.state.delayingBlurEvent = false
-      onBlur(cm)
-    }
-  }, 100)
+  setTimeout(() => { if (cm.state.delayingBlurEvent) {
+    cm.state.delayingBlurEvent = false
+    onBlur(cm)
+  } }, 100)
 }
 
 export function onFocus(cm, e) {
@@ -30,7 +28,7 @@ export function onFocus(cm, e) {
     // select-all detection hack)
     if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
       cm.display.input.reset()
-      if (webkit) setTimeout(function() { cm.display.input.reset(true) }, 20) // Issue #1730
+      if (webkit) setTimeout(() => cm.display.input.reset(true), 20) // Issue #1730
     }
     cm.display.input.receivedFocus()
   }
@@ -45,5 +43,5 @@ export function onBlur(cm, e) {
     rmClass(cm.display.wrapper, "CodeMirror-focused")
   }
   clearInterval(cm.display.blinker)
-  setTimeout(function() {if (!cm.state.focused) cm.display.shift = false}, 150)
+  setTimeout(() => { if (!cm.state.focused) cm.display.shift = false }, 150)
 }

src/display/highlight_worker.js

@@ -20,7 +20,7 @@ function highlightWorker(cm) {
   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) {
+  doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), line => {
     if (doc.frontier >= cm.display.viewFrom) { // Visible
       let oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength
       let highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true)
@@ -44,7 +44,7 @@ function highlightWorker(cm) {
       return true
     }
   })
-  if (changedLines.length) runInOp(cm, function() {
+  if (changedLines.length) runInOp(cm, () => {
     for (let i = 0; i < changedLines.length; i++)
       regLineChange(cm, changedLines[i], "text")
   })

src/display/mode_state.js

@@ -11,7 +11,7 @@ export function loadMode(cm) {
 }
 
 export function resetModeState(cm) {
-  cm.doc.iter(function(line) {
+  cm.doc.iter(line => {
     if (line.stateAfter) line.stateAfter = null
     if (line.styles) line.styles = null
   })

src/display/operations.js

@@ -46,7 +46,7 @@ export function startOperation(cm) {
 // Finish an operation, updating the display and signalling delayed events
 export function endOperation(cm) {
   let op = cm.curOp
-  finishOperation(op, function(group) {
+  finishOperation(op, group => {
     for (let i = 0; i < group.ops.length; i++)
       group.ops[i].cm.curOp = null
     endOperations(group)

src/display/scroll_events.js

@@ -48,7 +48,7 @@ else if (gecko) wheelPixelsPerUnit = 15
 else if (chrome) wheelPixelsPerUnit = -.7
 else if (safari) wheelPixelsPerUnit = -1/3
 
-let wheelEventDelta = function(e) {
+function wheelEventDelta(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
@@ -120,7 +120,7 @@ export function onScrollWheel(cm, e) {
     if (display.wheelStartX == null) {
       display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop
       display.wheelDX = dx; display.wheelDY = dy
-      setTimeout(function() {
+      setTimeout(() => {
         if (display.wheelStartX == null) return
         let movedX = scroll.scrollLeft - display.wheelStartX
         let movedY = scroll.scrollTop - display.wheelStartY

src/display/scrollbars.js

@@ -33,10 +33,10 @@ function NativeScrollbars(place, scroll, cm) {
   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() {
+  on(vert, "scroll", () => {
     if (vert.clientHeight) scroll(vert.scrollTop, "vertical")
   })
-  on(horiz, "scroll", function() {
+  on(horiz, "scroll", () => {
     if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal")
   })
 
@@ -172,14 +172,14 @@ export function initScrollbars(cm) {
       rmClass(cm.display.wrapper, cm.display.scrollbars.addClass)
   }
 
-  cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function(node) {
+  cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](node => {
     cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller)
     // Prevent clicks in the scrollbars from killing focus
-    on(node, "mousedown", function() {
-      if (cm.state.focused) setTimeout(function() { cm.display.input.focus() }, 0)
+    on(node, "mousedown", () => {
+      if (cm.state.focused) setTimeout(() => cm.display.input.focus(), 0)
     })
     node.setAttribute("cm-not-content", "true")
-  }, function(pos, axis) {
+  }, (pos, axis) => {
     if (axis == "horizontal") setScrollLeft(cm, pos)
     else setScrollTop(cm, pos)
   }, cm)

src/display/selection.js

@@ -70,7 +70,7 @@ function drawSelectionRange(cm, range, output) {
       return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
     }
 
-    iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
+    iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir) => {
       let leftPos = coords(from, "left"), rightPos, left, right
       if (from == to) {
         rightPos = leftPos
@@ -129,9 +129,8 @@ export function restartBlink(cm) {
   let on = true
   display.cursorDiv.style.visibility = ""
   if (cm.options.cursorBlinkRate > 0)
-    display.blinker = setInterval(function() {
-      display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"
-    }, cm.options.cursorBlinkRate)
+    display.blinker = setInterval(() => display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden",
+      cm.options.cursorBlinkRate)
   else if (cm.options.cursorBlinkRate < 0)
     display.cursorDiv.style.visibility = "hidden"
 }

src/edit/CodeMirror.js

@@ -68,7 +68,7 @@ export function CodeMirror(place, options) {
 
   // Override magic textarea content restore that IE sometimes does
   // on our hidden textarea on reload
-  if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true) }, 20)
+  if (ie && ie_version < 11) setTimeout(() => cm.display.input.reset(true), 20)
 
   registerEventHandlers(this)
   ensureGlobalHandlers()
@@ -108,7 +108,7 @@ function registerEventHandlers(cm) {
   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) {
+    on(d.scroller, "dblclick", operation(cm, e => {
       if (signalDOMEvent(cm, e)) return
       let pos = posFromMouse(cm, e)
       if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return
@@ -117,17 +117,17 @@ function registerEventHandlers(cm) {
       extendSelection(cm.doc, word.anchor, word.head)
     }))
   else
-    on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e) })
+    on(d.scroller, "dblclick", e => signalDOMEvent(cm, e) || e_preventDefault(e))
   // Some browsers fire contextmenu *after* opening the menu, at
   // which point we can't mess with it anymore. Context menu is
   // handled in onMouseDown for these browsers.
-  if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e)})
+  if (!captureRightClick) on(d.scroller, "contextmenu", e => onContextMenu(cm, e))
 
   // Used to suppress mouse event handling when a touch happens
   let touchFinished, prevTouch = {end: 0}
   function finishTouch() {
     if (d.activeTouch) {
-      touchFinished = setTimeout(function() {d.activeTouch = null}, 1000)
+      touchFinished = setTimeout(() => d.activeTouch = null, 1000)
       prevTouch = d.activeTouch
       prevTouch.end = +new Date
     }
@@ -142,7 +142,7 @@ function registerEventHandlers(cm) {
     let dx = other.left - touch.left, dy = other.top - touch.top
     return dx * dx + dy * dy > 20 * 20
   }
-  on(d.scroller, "touchstart", function(e) {
+  on(d.scroller, "touchstart", e => {
     if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
       clearTimeout(touchFinished)
       let now = +new Date
@@ -154,10 +154,10 @@ function registerEventHandlers(cm) {
       }
     }
   })
-  on(d.scroller, "touchmove", function() {
+  on(d.scroller, "touchmove", () => {
     if (d.activeTouch) d.activeTouch.moved = true
   })
-  on(d.scroller, "touchend", function(e) {
+  on(d.scroller, "touchend", e => {
     let touch = d.activeTouch
     if (touch && !eventInWidget(d, e) && touch.left != null &&
         !touch.moved && new Date - touch.start < 300) {
@@ -178,7 +178,7 @@ function registerEventHandlers(cm) {
 
   // Sync scrolling between fake scrollbars and real scrollable
   // area, ensure viewport is updated when scrolling.
-  on(d.scroller, "scroll", function() {
+  on(d.scroller, "scroll", () => {
     if (d.scroller.clientHeight) {
       setScrollTop(cm, d.scroller.scrollTop)
       setScrollLeft(cm, d.scroller.scrollLeft, true)
@@ -187,27 +187,27 @@ function registerEventHandlers(cm) {
   })
 
   // Listen to wheel events in order to try and update the viewport on time.
-  on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e)})
-  on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e)})
+  on(d.scroller, "mousewheel", e => onScrollWheel(cm, e))
+  on(d.scroller, "DOMMouseScroll", e => onScrollWheel(cm, e))
 
   // Prevent wrapper from ever scrolling
-  on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0 })
+  on(d.wrapper, "scroll", () => d.wrapper.scrollTop = d.wrapper.scrollLeft = 0)
 
   d.dragFunctions = {
-    enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e)},
-    over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e) }},
-    start: function(e){onDragStart(cm, e)},
+    enter: e => {if (!signalDOMEvent(cm, e)) e_stop(e)},
+    over: e => {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e) }},
+    start: e => onDragStart(cm, e),
     drop: operation(cm, onDrop),
-    leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm) }}
+    leave: e => {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm) }}
   }
 
   let inp = d.input.getField()
-  on(inp, "keyup", function(e) { onKeyUp.call(cm, e) })
+  on(inp, "keyup", e => onKeyUp.call(cm, e))
   on(inp, "keydown", operation(cm, onKeyDown))
   on(inp, "keypress", operation(cm, onKeyPress))
-  on(inp, "focus", function(e) { onFocus(cm, e) })
-  on(inp, "blur", function (e) { onBlur(cm, e) })
+  on(inp, "focus", e => onFocus(cm, e))
+  on(inp, "blur", e => onBlur(cm, e))
 }
 
 let initHooks = []
-CodeMirror.defineInitHook = function(f) {initHooks.push(f)}
+CodeMirror.defineInitHook = f => initHooks.push(f)