fix: Enhance bracket indentation handling for square brackets

src/mode/behaviour/behaviour_test.js

@@ -6,7 +6,7 @@
 
 require("../../multi_select");
 var assert = require("../../test/assertions");
 var Range = require("../../range").Range;
 var Editor = require("../../editor").Editor;
 var UndoManager = require("../../undomanager").UndoManager;
 var EditSession = require("../../edit_session").EditSession;
@@ -24,7 +24,7 @@
         editor.commands.exec(name, editor, args);
     } while(times --> 1);
 };
 var testRanges = function(str) {
     assert.equal(editor.selection.getAllRanges() + "", str + "");
 };
 
@@ -96,7 +96,15 @@
         assert.equal(editor.getValue(), "{");
         exec("insertstring", 1, "\n");
         assert.equal(editor.getValue(), "{\n    \n}");
-
+
+        //test bracket indentation
+        editor.setValue("");
+        exec("insertstring", 1, "    ");
+        exec("insertstring", 1, "[");
+        assert.equal(editor.getValue(), "    []");
+        exec("insertstring", 1, "\n");
+        assert.equal(editor.getValue(), "    [\n        \n    ]");
+
         editor.setValue("");
         exec("insertstring", 1, "(");
         exec("insertstring", 1, '"');

src/mode/behaviour/cstyle.js

@@ -196,6 +196,8 @@ CstyleBehaviour = function(options) {
     });
 
     this.add("brackets", "insertion", function(state, action, editor, session, text) {
+        var cursor = editor.getCursorPosition();
+        var line = session.doc.getLine(cursor.row);
         if (text == '[') {
             initContext(editor);
             var selection = editor.getSelectionRange();
@@ -211,8 +213,6 @@ CstyleBehaviour = function(options) {
             }
         } else if (text == ']') {
             initContext(editor);
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
             var rightChar = line.substring(cursor.column, cursor.column + 1);
             if (rightChar == ']') {
                 var matching = session.$findOpeningBracket(']', {column: cursor.column + 1, row: cursor.row});
@@ -224,6 +224,23 @@ CstyleBehaviour = function(options) {
                     };
                 }
             }
+        } else if (text == "\n" || text == "\r\n") {
+            initContext(editor);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar === ']') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1}, ']');
+                if (!openBracePos)
+                    return null;
+                var next_indent = this.$getIndent(session.getLine(openBracePos.row));
+            } else {
+                return;
+            }
+            var indent = next_indent + session.getTabString();
+
+            return {
+                text: '\n' + indent + '\n' + next_indent,
+                selection: [1, indent.length, 1, indent.length]
+            };
         }
     });