From aa5b3ee2d0f04d7d3efdce3f54dd4325243a38bc Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 15 May 2012 11:17:38 +0200 Subject: [PATCH 1/2] Use mathematic convention of avoiding > for readability of inRange() --- lib/treehugger/tree.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/treehugger/tree.js b/lib/treehugger/tree.js index 78192f7..e81657e 100644 --- a/lib/treehugger/tree.js +++ b/lib/treehugger/tree.js @@ -1,15 +1,15 @@ define(function(require, exports, module) { function inRange(p, pos) { - if(p && p.sl <= pos.line && p.el >= pos.line) { - if(p.sl < pos.line && p.el > pos.line) + if(p && p.sl <= pos.line && pos.line <= p.el) { + if(p.sl < pos.line && pos.line < p.el) return true; - else if(p.sl == pos.line && p.el > pos.line) + else if(p.sl == pos.line && pos.line < p.el) return p.sc <= pos.col; else if(p.sl == pos.line && p.el === pos.line) - return p.sc <= pos.col && p.ec >= pos.col; + return p.sc <= pos.col && pos.col <= p.ec; else if(p.sl < pos.line && p.el === pos.line) - return p.ec >= pos.col; + return pos.col <= p.ec; } } From 46dea1d1cb92345b7a967fc12910ba0290949e78 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 15 May 2012 11:17:57 +0200 Subject: [PATCH 2/2] Fix findNode (ajaxorg/cloud9infra#1170) --- lib/treehugger/tree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/treehugger/tree.js b/lib/treehugger/tree.js index e81657e..a4188b5 100644 --- a/lib/treehugger/tree.js +++ b/lib/treehugger/tree.js @@ -202,7 +202,7 @@ ConsNode.prototype.findNode = function(pos) { var node = this[i].findNode(pos); if(node) return node instanceof StringNode ? this : node; - else + else if(p2.sl == p2.el) return this[i]; } }