From a430563a47baa59ed8bd5f15333a49e076617abe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 13:14:25 +0100
Subject: [PATCH] Remove unneccesary local functions in moveOnce
---
src/edit/methods.js | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 18412d31b..2883909e8 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -475,17 +475,21 @@ function findPosH(doc, pos, dir, unit, visually) {
return lineObj = getLine(doc, l)
}
function moveOnce(boundToLine) {
- let myMoveVisually = (line, start, dir) => moveVisually(doc.cm, line, start, dir)
- let myMoveLogically = (line, start, dir) => {
- let ch = moveLogically(line, start, dir)
- return ch == null ? null : new Pos(pos.line, ch, dir < 0 ? "after" : "before")
+ let next
+ if (visually) {
+ next = moveVisually(doc.cm, lineObj, pos, dir)
+ } else {
+ let ch = moveLogically(lineObj, pos, dir)
+ next = ch == null ? null : new Pos(pos.line, ch, dir < 0 ? "after" : "before")
}
- let next = (visually ? myMoveVisually : myMoveLogically)(lineObj, pos, dir)
if (next == null) {
- if (!boundToLine && findNextLine()) {
+ if (!boundToLine && findNextLine())
pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir)
- } else return false
- } else pos = next
+ else
+ return false
+ } else {
+ pos = next
+ }
return true
}
--
GitLab