Fixed bug with new CSA. Preparing for final merge into master.

Author: jabbany

Gruntfile.coffee

@@ -115,5 +115,5 @@ module.exports = (grunt) ->
   grunt.registerTask 'build-scripting', ['clean:scripting','concat:scripting', 'copy:scripting', 'typescript']
   grunt.registerTask 'build-core', ['concat:core_only', 'autoprefixer', 'cssmin', 'uglify:core_only']
   grunt.registerTask 'build', ['concat:all', 'autoprefixer', 'cssmin', 'uglify:all']
-  grunt.registerTask 'default', ['clean', 'build', 'watch']
+  grunt.registerTask 'default', ['clean', 'build', 'build-scripting', 'watch']
 

build/CommentCoreLibrary.js

@@ -111,21 +111,11 @@ var CommentSpaceAllocator = (function () {
         }
         var pool = this._pools[cindex];
         if (pool.length === 0) {
-            pool.push(comment);
             comment.cindex = cindex;
             return 0;
         } else if (this.pathCheck(0, comment, pool)) {
             // Has a path in the current pool
             comment.cindex = cindex;
-            pool.binsert(comment, function (a, b) {
-                if (a.bottom < b.bottom) {
-                    return -1;
-                } else if (a.bottom === b.bottom) {
-                    return 0;
-                } else {
-                    return 1;
-                }
-            });
             return 0;
         }
         var y = 0;
@@ -137,15 +127,6 @@ var CommentSpaceAllocator = (function () {
             if (this.pathCheck(y, comment, pool)) {
                 // Has a path in the current pool
                 comment.cindex = cindex;
-                pool.binsert(comment, function (a, b) {
-                    if (a.bottom < b.bottom) {
-                        return -1;
-                    } else if (a.bottom === b.bottom) {
-                        return 0;
-                    } else {
-                        return 1;
-                    }
-                });
                 return y;
             }
         }
@@ -166,6 +147,15 @@ var CommentSpaceAllocator = (function () {
             comment.y = 0;
         } else {
             comment.y = this.assign(comment, 0);
+            this._pools[comment.cindex].binsert(comment, function (a, b) {
+                if (a.bottom < b.bottom) {
+                    return -1;
+                } else if (a.bottom > b.bottom) {
+                    return 1;
+                } else {
+                    return 0;
+                }
+            });
         }
     };
 
@@ -178,6 +168,9 @@ var CommentSpaceAllocator = (function () {
         if (comment.cindex < 0) {
             return;
         }
+        if (comment.cindex >= this._pools.length) {
+            throw new Error("cindex out of bounds");
+        }
         var index = this._pools[comment.cindex].indexOf(comment);
         if (index < 0)
             return;