From 03bd4489ed3477789ad01935b6a148408839441f Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Tue, 4 Nov 2014 21:59:51 +0100 Subject: [PATCH] Improve TokenUtils performance through caching --- src/utils/TokenUtils.js | 67 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/src/utils/TokenUtils.js b/src/utils/TokenUtils.js index 825dd23db81..f4243d1ff9d 100644 --- a/src/utils/TokenUtils.js +++ b/src/utils/TokenUtils.js @@ -33,20 +33,73 @@ define(function (require, exports, module) { "use strict"; - var CodeMirror = require("thirdparty/CodeMirror2/lib/codemirror"); + var _ = require("thirdparty/lodash"), + CodeMirror = require("thirdparty/CodeMirror2/lib/codemirror"); + + var cache; + + + function _clearCache(cm) { + cache = null; + if (cm) { // event handler + cm.off("changes", _clearCache); + } + } + + /* + * Caches the tokens for the given editor/line if needed + * @param {!CodeMirror} cm + * @param {!number} line + * @return {Array.} (Cached) array of tokens + */ + function _manageCache(cm, line) { + if (!cache || !cache.tokens || cache.line !== line || cache.cm !== cm) { + // Cache is no longer matching -> Update + var tokens = cm.getLineTokens(line, false); + // Add empty beginning-of-line token for backwards compatibility + tokens.unshift(cm.getTokenAt({line: line, ch: 0}, false)); + cache = { + cm: cm, + line: line, + timeStamp: Date.now(), + tokens: tokens, + }; + cm.off("changes", _clearCache); + cm.on("changes", _clearCache); + } + return cache.tokens; + } + + /* + * Like cm.getTokenAt, but with caching + * @param {!CodeMirror} cm + * @param {!{ch:number, line:number}} pos + * @param {boolean} precise If given, results in more current results. Suppresses caching. + * @return {Object} Token for position + */ + function _getToken(cm, pos, precise) { + if (precise) { + _clearCache(); // reset cache + return cm.getTokenAt(pos, precise); + } + var cachedTokens = _manageCache(cm, pos.line), + tokenIndex = _.sortedIndex(cachedTokens, {end: pos.ch}, "end"), // binary search is faster for long arrays + token = cachedTokens[tokenIndex]; + return token || cm.getTokenAt(pos, precise); // fall back to CMs getTokenAt, for example in an empty line + } /** * Creates a context object for the given editor and position, suitable for passing to the * move functions. - * @param {!CodeMirror} editor + * @param {!CodeMirror} cm * @param {!{ch:number, line:number}} pos * @return {!{editor:!CodeMirror, pos:!{ch:number, line:number}, token:Object}} */ - function getInitialContext(editor, pos) { + function getInitialContext(cm, pos) { return { - "editor": editor, + "editor": cm, "pos": pos, - "token": editor.getTokenAt(pos, true) + "token": cm.getTokenAt(pos, true) }; } @@ -72,7 +125,7 @@ define(function (require, exports, module) { } else { ctx.pos.ch = ctx.token.start; } - ctx.token = ctx.editor.getTokenAt(ctx.pos, precise); + ctx.token = _getToken(ctx.editor, ctx.pos, precise); return true; } @@ -107,7 +160,7 @@ define(function (require, exports, module) { } else { ctx.pos.ch = ctx.token.end + 1; } - ctx.token = ctx.editor.getTokenAt(ctx.pos, precise); + ctx.token = _getToken(ctx.editor, ctx.pos, precise); return true; }