more work on range_list

lib/ace/range_list.js

@@ -38,11 +38,16 @@
 define(function(require, exports, module) {
 "use strict";
 
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+
 var RangeList = function(startRow, startColumn, endRow, endColumn) {
     this.ranges = [];
 };
 
 (function() {
+    oop.implement(this, EventEmitter);
+
     this.comparePoints = function(p1, p2) {
         return p1.row - p2.row || p1.column - p2.column
     };
@@ -57,9 +62,9 @@ var RangeList = function(startRow, startColumn, endRow, endColumn) {
             if (cmp > 0)
                 continue;
             if (cmp == 0)
-                return -i-2;
+                return i;
             cmp = this.comparePoints(pos, range.start);
-            if (cmp > 0)
+            if (cmp >= 0)
                 return i;
 
             return -i-1;
@@ -79,7 +84,8 @@ var RangeList = function(startRow, startColumn, endRow, endColumn) {
         else
             endIndex++;
 
-        this.ranges.splice(startIndex, endIndex - startIndex, range);
+        var removed = this.ranges.splice(startIndex, endIndex - startIndex, range);
+        this._emit("remove", {ranges: removed});
         return startIndex;
     };
 
@@ -87,34 +93,68 @@ var RangeList = function(startRow, startColumn, endRow, endColumn) {
         list.forEach(this.add, this);
     };
 
-    this.substractRange = function(range) {
-        var i = this.pointIndex(range.start);
-        if (i > 0)
-            this.splice(i, 1);
-
-        i = this.pointIndex(range.end);
-        if (i > 0)
-            this.splice(i, 1);
-    };
-
     this.substractPoint = function(pos) {
         var i = this.pointIndex(pos);
-        if (i > 0)
-            this.splice(i, 1);
+        if (i > 0){
+            var removed = this.splice(i, 1);
+            this._emit("remove", {ranges: removed});
+        }
+    };
+
+    // merge overlapping ranges
+    this.merge = function() {
+        var removed = [];
+        var list = this.ranges;
+        var next = list[0], range;
+        for (var i = 1; i < list.length; i++) {
+            range = next;
+            next = list[i];
+            if (this.comparePoints(range.end, next.start) > 0) {
+                if (this.comparePoints(range.end, next.end) < 0) {
+                    range.end.row = next.end.row;
+                    range.end.column = next.end.column;
+                }
+
+                list.splice(i, 1);
+                removed.push(next);
+                next = range;
+                i--;
+            }
+        }
+
+        if (removed.length)
+            this._emit("remove", {ranges: removed});
     };
 
     this.contains = function(row, column) {
-		return this.pointIndex({row: row, column: column}) >= 0;
-    };
-
-    this.containsRange = function(row, column) {
-		//todo
+        return this.pointIndex({row: row, column: column}) >= 0;
     };
 
     this.containsPoint = function(pos) {
-		return this.pointIndex(pos) >= 0;
+        return this.pointIndex(pos) >= 0;
     };
 
+
+    this.clipRows = function(startRow, endRow) {
+        var list = this.ranges;
+        if (list[0].start.row > endRow || list[list.length - 1].start.row < startRow)
+            return [];
+
+        var startIndex = this.pointIndex({row: startRow, column: 0});
+        if (startIndex < 0)
+            startIndex = -startIndex - 1;
+        var endIndex = this.pointIndex({row: endRow, column: 0}, startIndex);
+        if (endIndex < 0)
+            endIndex = -endIndex - 1;
+
+        var clipped = [];
+        for (var i = startIndex; i < endIndex; i++) {
+            clipped.push(list[i]);
+        }
+        return clipped;
+    };
+
+
     this.attach = function(session) {
         if (this.session)
             this.dettach();

lib/ace/range_list_test.js

@@ -60,9 +60,9 @@ module.exports = {
         ];
         
         assert.equal(rangeList.pointIndex({row: 0, column: 1}), -1);
-        assert.equal(rangeList.pointIndex({row: 1, column: 2}), -1);
+        assert.equal(rangeList.pointIndex({row: 1, column: 2}), 0);
         assert.equal(rangeList.pointIndex({row: 1, column: 3}), 0);
-        assert.equal(rangeList.pointIndex({row: 3, column: 4}), -2);
+        assert.equal(rangeList.pointIndex({row: 3, column: 4}), 0);
         assert.equal(rangeList.pointIndex({row: 4, column: 1}), -2);
         assert.equal(rangeList.pointIndex({row: 5, column: 1}), 1);
         assert.equal(rangeList.pointIndex({row: 8, column: 9}), 2);
@@ -86,7 +86,35 @@ module.exports = {
         assert.equal(rangeList.ranges.length, 5);
         
         rangeList.add(new Range(7,7,7,7));
-        assert.range(rangeList.ranges[4], 7,7,7,7);
+        assert.range(rangeList.ranges[3], 7,7,7,7);
+        rangeList.add(new Range(7,8,7,8));
+        assert.range(rangeList.ranges[4], 7,8,7,8);
+    },
+    
+    "test: rangeList merge": function() {
+        var rangeList = new RangeList();
+        rangeList.addList([
+            new Range(1,2,3,4),
+            new Range(4,2,5,4),
+            new Range(6,6,7,7),
+            new Range(8,8,9,9)
+        ]);
+        var removed = [];
+        rangeList.on('remove', function(e) {removed = e.ranges});
+        
+        assert.equal(rangeList.ranges.length, 4);
+        
+        rangeList.ranges[1].end.row = 7;
+        rangeList.merge();
+        assert.equal(removed.length, 1);
+        assert.range(rangeList.ranges[1], 4,2,7,7);
+        assert.equal(rangeList.ranges.length, 3);
+        
+        rangeList.ranges[0].end.row = 10;
+        rangeList.merge();
+        assert.range(rangeList.ranges[0], 1,2,10,4);        
+        assert.equal(removed.length, 2);
+        assert.equal(rangeList.ranges.length, 1);
     }
     
 };