tweak python folding and add tests

lib/ace/mode/folding/fold_mode.js

@@ -62,12 +62,12 @@ var FoldMode = exports.FoldMode = function() {};
         return null;
     };
 
-    this.indentationBlock = function(session, row) {
+    this.indentationBlock = function(session, row, column) {
         var re = /^\s*/;
         var startRow = row;
         var endRow = row;
         var line = session.getLine(row);
-        var startColumn = line.length - 1;
+        var startColumn = column || line.length;
         var startLevel = line.match(re)[0].length;
         var maxRow = session.getLength()
         

lib/ace/mode/folding/pythonic.js

@@ -54,7 +54,7 @@ oop.inherits(FoldMode, BaseFoldMode);
             if (match[1])
                 return this.openingBracketBlock(session, match[1], row, match.index);
 
-            return this.indentationBlock(session, row)
+            return this.indentationBlock(session, row, match.index + 1);
         }
     }
 

lib/ace/mode/folding/pythonic_test.js

@@ -0,0 +1,99 @@
+/* ***** 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 PythonMode = require("../python").Mode;
+var EditSession = require("../../edit_session").EditSession;
+var assert = require("../../test/assertions");
+
+module.exports = {
+
+    "test: bracket folding": function() {
+        var session = new EditSession([
+            '[  #-',
+            'stuff',
+            ']',
+            '[ '
+        ]);
+
+        var mode = new PythonMode();
+        session.setFoldStyle("markbeginend");
+        session.setMode(mode);
+
+        assert.equal(session.getFoldWidget(0), "start");
+        assert.equal(session.getFoldWidget(1), "");
+        assert.equal(session.getFoldWidget(2), "");
+        assert.equal(session.getFoldWidget(3), "start");
+
+        assert.range(session.getFoldWidgetRange(0), 0, 1, 2, 0);
+        assert.equal(session.getFoldWidgetRange(3), null);
+    },
+
+    "test: indentation folding": function() {
+        var session = new EditSession([
+            'def a: #',
+            '',
+            ' b:',
+            '  c',
+            ' ',
+            '  c',
+            '',
+            ' ',
+            ''
+        ]);
+
+        var mode = new PythonMode();
+        session.setFoldStyle("markbeginend");
+        session.setMode(mode);
+
+        assert.equal(session.getFoldWidget(0), "start");
+        assert.equal(session.getFoldWidget(1), "");
+        assert.equal(session.getFoldWidget(2), "start");
+
+        assert.range(session.getFoldWidgetRange(0), 0, 6, 5, 3);
+        assert.range(session.getFoldWidgetRange(2), 2, 3, 5, 3);
+    }
+};
+
+});
+
+if (typeof module !== "undefined" && module === require.main)
+    require("asyncjs").test.testcase(module.exports).exec();

lib/ace/test/all_browser.js

@@ -37,6 +37,10 @@ var tests = [
      require("ace/mode/text_test"),
      require("ace/mode/xml_test"),
      require("ace/mode/xml_tokenizer_test"),
+     require("ace/mode/folding/cstyle_test"),
+     require("ace/mode/folding/html_test"),
+     require("ace/mode/folding/pythonic_test"),
+     require("ace/mode/folding/xml_test"),
      require("ace/range_test"),
      require("ace/search_test"),
      require("ace/selection_test"),