fix bracket pairing for multiple selections

lib/ace/mode/behaviour/behaviour_test.js

@@ -0,0 +1,133 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+if (typeof process !== "undefined") {
+    require("amd-loader");
+}
+
+define(function(require, exports, module) {
+"use strict";
+
+require("../../multi_select");
+var assert = require("../../test/assertions");
+var Range = require("../../range").Range;
+var Editor = require("../../editor").Editor;
+var EditSession = require("../../edit_session").EditSession;
+var MockRenderer = require("../../test/mockrenderer").MockRenderer;
+var JavaScriptMode = require("../javascript").Mode;
+var editor;
+var exec = function(name, times, args) {
+    do {
+        editor.commands.exec(name, editor, args);
+    } while(times --> 1);
+};
+var testRanges = function(str) {
+    assert.equal(editor.selection.getAllRanges() + "", str + "");
+};
+
+module.exports = {
+
+    name: "ACE multi_select.js",
+
+    "test: cstyle": function() {
+        function testValue(line) {
+            assert.equal(editor.getValue(), Array(4).join(line + "\n"));
+        }
+        function testSelection(line, col, inc) {
+            editor.selection.rangeList.ranges.forEach(function(r) {
+                assert.range(r, line, col, line, col);
+                line += (inc || 1);
+            });
+        }
+        var doc = new EditSession([
+            "",
+            "",
+            "",
+            ""
+        ], new JavaScriptMode());
+        editor = new Editor(new MockRenderer(), doc);
+        editor.setOption("behavioursEnabled", true);
+
+        editor.navigateFileStart();
+        exec("addCursorBelow", 2);
+
+        exec("insertstring", 1, "if ");
+        
+        // pairing ( 
+        exec("insertstring", 1, "(");
+        testValue("if ()");
+        testSelection(0, 4);
+        exec("insertstring", 1, ")");
+        testValue("if ()");
+        testSelection(0, 5);
+        
+        // pairing [ 
+        exec("gotoleft", 1);
+        exec("insertstring", 1, "[");
+        testValue("if ([])");
+        testSelection(0, 5);
+        
+        exec("insertstring", 1, "]");
+        testValue("if ([])");
+        testSelection(0, 6);
+        
+        // test deletion
+        exec("gotoleft", 1);
+        exec("backspace", 1);
+        testValue("if ()");
+        testSelection(0, 4);
+
+        exec("gotolineend", 1);
+        exec("insertstring", 1, "{");
+        testValue("if (){}");
+        testSelection(0, 6);
+        
+        exec("insertstring", 1, "}");
+        testValue("if (){}");
+        testSelection(0, 7);
+        
+        exec("gotolinestart", 1);
+        exec("insertstring", 1, "(");
+        testValue("(if (){}");
+        exec("backspace", 1);
+        
+        editor.setValue("");
+        exec("insertstring", 1, "{");
+        assert.equal(editor.getValue(), "{")
+        exec("insertstring", 1, "\n");
+        assert.equal(editor.getValue(), "{\n    \n}")
+    }
+};
+
+});
+
+if (typeof module !== "undefined" && module === require.main) {
+    require("asyncjs").test.testcase(module.exports).exec();
+}

lib/ace/mode/behaviour/cstyle.js

@@ -42,11 +42,11 @@ var SAFE_INSERT_BEFORE_TOKENS =
     ["text", "paren.rparen", "punctuation.operator", "comment"];
 
 var context;
-var contextCache = {}
+var contextCache = {};
 var initContext = function(editor) {
     var id = -1;
     if (editor.multiSelect) {
-        id = editor.selection.id;
+        id = editor.selection.index;
         if (contextCache.rangeCount != editor.multiSelect.rangeCount)
             contextCache = {rangeCount: editor.multiSelect.rangeCount};
     }

lib/ace/multi_select_test.js

@@ -35,22 +35,22 @@ if (typeof process !== "undefined") {
 define(function(require, exports, module) {
 "use strict";
 
-var EditSession = require("./edit_session").EditSession;
+require("./multi_select");
-var Editor = require("./editor").Editor;
-var MockRenderer = require("./test/mockrenderer").MockRenderer;
-var Range = require("./range").Range;
 var assert = require("./test/assertions");
-var MultiSelect = require("./multi_select").MultiSelect;
+var Range = require("./range").Range;
+var Editor = require("./editor").Editor;
+var EditSession = require("./edit_session").EditSession;
+var MockRenderer = require("./test/mockrenderer").MockRenderer;
 
 var editor;
 var exec = function(name, times, args) {
     do {
         editor.commands.exec(name, editor, args);
-    } while(times --> 1)
+    } while(times --> 1);
 };
 var testRanges = function(str) {
     assert.equal(editor.selection.getAllRanges() + "", str + "");
-}
+};
 
 module.exports = {
 
@@ -63,7 +63,6 @@ module.exports = {
             "    wtt.w"
         ]);
         editor = new Editor(new MockRenderer(), doc);
-        MultiSelect(editor);
 
         editor.navigateFileEnd();
         exec("selectMoreBefore", 3);
@@ -90,7 +89,6 @@ module.exports = {
             "    wtt.we"
         ]);
         editor = new Editor(new MockRenderer(), doc);
-        MultiSelect(editor);
 
         editor.selectMoreLines(1);
         testRanges("Range: [0/0] -> [0/0],Range: [1/0] -> [1/0]");
@@ -113,9 +111,8 @@ module.exports = {
             "    wtt.w"
         ]);
         editor = new Editor(new MockRenderer(), doc);
-        MultiSelect(editor);
 
-        editor.selectMoreLines(1)
+        editor.selectMoreLines(1);
         testRanges("Range: [0/0] -> [0/0],Range: [1/0] -> [1/0]");
         assert.ok(editor.inMultiSelectMode);
 
@@ -134,7 +131,6 @@ module.exports = {
             "    wtt.w"
         ]);
         editor = new Editor(new MockRenderer(), doc);
-        MultiSelect(editor);
         var selection = editor.selection;
 
         var range1 = new Range(0, 2, 0, 4);
@@ -158,7 +154,6 @@ module.exports = {
     "test: onPaste in command with multiselect": function() {
         var doc = new EditSession(["l1", "l2"]);
         editor = new Editor(new MockRenderer(), doc);
-        MultiSelect(editor);
         editor.commands.addCommand({
             name: 'insertfoo',
             exec: function(ed) { ed.onPaste('foo'); },
@@ -167,7 +162,7 @@ module.exports = {
         var selection = editor.selection;
         var range1 = new Range(0,2,0,2);
         var range2 = new Range(1,2,1,2);
-        selection.fromOrientedRange(range1)
+        selection.fromOrientedRange(range1);
         selection.addRange(range2);
         editor.execCommand('insertfoo');
         assert.equal('l1foo\nl2foo', editor.getValue());
@@ -176,14 +171,13 @@ module.exports = {
     "test multiselect fromJSON/toJSON": function() {
         var doc = new EditSession(["l1", "l2"]);
         editor = new Editor(new MockRenderer(), doc);
-        MultiSelect(editor);
         var selection = editor.selection;
         
         var before = selection.toJSON();
         
         var range1 = new Range(0,2,0,2);
         var range2 = new Range(1,2,1,2);
-        selection.fromOrientedRange(range1)
+        selection.fromOrientedRange(range1);
         selection.addRange(range2);
         
         var after = selection.toJSON();
@@ -201,5 +195,5 @@ module.exports = {
 });
 
 if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec()
+    require("asyncjs").test.testcase(module.exports).exec();
 }

lib/ace/test/all_browser.js

@@ -43,6 +43,7 @@ var testNames = [
     "ace/mode/folding/pythonic_test",
     "ace/mode/folding/xml_test",
     "ace/mode/folding/coffee_test",
+    "ace/mode/behaviour/behaviour_test",
     "ace/multi_select_test",
     "ace/mouse/mouse_handler_test",
     "ace/occur_test",