fix folding of comments

lib/ace/edit_session/folding.js

@@ -611,7 +611,7 @@ function Folding() {
             token = iterator.stepBackward();
 
             range.end.row = iterator.getCurrentTokenRow();
-            range.end.column = iterator.getCurrentTokenColumn() + token.value.length - 1;
+            range.end.column = iterator.getCurrentTokenColumn() + token.value.length;
             return range;
         }
     };

lib/ace/mode/folding/cstyle.js

@@ -55,8 +55,11 @@ oop.inherits(FoldMode, BaseFoldMode);
         if (match) {
             var i = match.index;
 
-            if (match[2])
+            if (match[2]) {
-                return session.getCommentFoldRange(row, i + match[0].length);
+                var range = session.getCommentFoldRange(row, i + match[0].length);
+                range.end.column -= 2;
+                return range;
+            }
 
             var start = {row: row, column: i+1};
             var end = session.$findClosingBracket(match[1], start);
@@ -81,8 +84,11 @@ oop.inherits(FoldMode, BaseFoldMode);
         if (match) {
             var i = match.index + match[0].length;
 
-            if (match[2])
+            if (match[2]) {
-                return session.getCommentFoldRange(row, i);
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
 
             var end = {row: row, column: i};
             var start = session.$findOpeningBracket(match[1], end);

lib/ace/mode/folding/cstyle_test.js

@@ -0,0 +1,91 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+if (typeof process !== "undefined")
+    require("amd-loader");
+
+define(function(require, exports, module) {
+
+var JavaScriptMode = require("../javascript").Mode;
+var EditSession = require("../../edit_session").EditSession;
+var assert = require("../../test/assertions");
+
+module.exports = {
+
+    "test: fold comments": function() {
+        var session = new EditSession([
+            '/*',
+            'stuff',
+            '*/'
+        ]);
+        
+        var mode = new JavaScriptMode();
+        session.setFoldStyle("markbeginend");
+        session.setMode(mode);
+        
+        assert.equal(session.getFoldWidget(0), "start");
+        assert.equal(session.getFoldWidget(1), "");
+        assert.equal(session.getFoldWidget(2), "end");
+        
+        assert.range(session.getFoldWidgetRange(0), 0, 2, 2, 0);
+        assert.range(session.getFoldWidgetRange(2), 0, 2, 2, 0);
+    },
+    
+    "test: fold doc style comments": function() {
+        var session = new EditSession([
+            '/**',
+            ' * stuff',
+            ' * *** */'
+        ]);
+        
+        var mode = new JavaScriptMode();
+        session.setFoldStyle("markbeginend");
+        session.setMode(mode);
+        
+        assert.equal(session.getFoldWidget(0), "start");
+        assert.equal(session.getFoldWidget(1), "");
+        assert.equal(session.getFoldWidget(2), "end");
+        
+        assert.range(session.getFoldWidgetRange(0), 0, 2, 2, 7);
+        assert.range(session.getFoldWidgetRange(2), 0, 2, 2, 7);
+    }
+};
+
+});
+
+if (typeof module !== "undefined" && module === require.main)
+    require("asyncjs").test.testcase(module.exports).exec();

lib/ace/token_iterator.js

@@ -54,8 +54,10 @@ var TokenIterator = function(session, initialRow, initialColumn) {
         
         while (this.$tokenIndex < 0) {
             this.$row -= 1;
-            if (this.$row < 0)
+            if (this.$row < 0) {
+                this.$row = 0;
                 return null;
+            }
                 
             this.$rowTokens = this.$session.getTokens(this.$row, this.$row)[0].tokens;
             this.$tokenIndex = this.$rowTokens.length - 1;
@@ -70,8 +72,10 @@ var TokenIterator = function(session, initialRow, initialColumn) {
         
         while (this.$tokenIndex >= this.$rowTokens.length) {
             this.$row += 1;
-            if (this.$row >= rowCount)
+            if (this.$row >= rowCount) {
+                this.$row = rowCount - 1;
                 return null;
+            }
 
             this.$rowTokens = this.$session.getTokens(this.$row, this.$row)[0].tokens;
             this.$tokenIndex = 0;