add behaviours to demo and fix exceptions in cstyle behaviours

demo/demo.js

@@ -245,6 +245,7 @@ exports.launch = function(env) {
     var highlightSelectedWordE = document.getElementById("highlight_selected_word");
     var showHScrollEl = document.getElementById("show_hscroll");
     var softTabEl = document.getElementById("soft_tab");
+    var behavioursEl = document.getElementById("enable_behaviours");
 
     bindDropdown("doc", function(value) {
         var doc = docs[value];
@@ -342,6 +343,7 @@ exports.launch = function(env) {
         highlightSelectedWordE.checked = editor.getHighlightSelectedWord();
         showHScrollEl.checked = editor.renderer.getHScrollBarAlwaysVisible();
         softTabEl.checked = session.getUseSoftTabs();
+        behavioursEl.checked = editor.getBehavioursEnabled()
     }
 
     bindDropdown("mode", function(value) {
@@ -418,6 +420,10 @@ exports.launch = function(env) {
         env.editor.getSession().setUseSoftTabs(checked);
     });
 
+    bindCheckbox("enable_behaviours", function(checked) {
+        env.editor.setBehavioursEnabled(checked);
+    });
+
     var secondSession = null;
     bindDropdown("split", function(value) {
         var sp = env.split;

index.html

@@ -196,10 +196,19 @@
     <tr>
       <td >
         <label for="highlight_selected_word">Highlight selected word</label>
-      </td><td>
+      </td>
+      <td>
         <input type="checkbox" id="highlight_selected_word" checked>
       </td>
-      </tr>
+    </tr>
+    <tr>
+      <td >
+        <label for="enable_behaviours">Enable Behaviours</label>
+      </td>
+      <td>
+        <input type="checkbox" id="enable_behaviours">
+      </td>
+    </tr>
     </table>
 
     <div id="editor">

lib/ace/mode/behaviour/cstyle.js

@@ -76,7 +76,9 @@ var CstyleBehaviour = function () {
             var line = session.doc.getLine(cursor.row);
             var rightChar = line.substring(cursor.column, cursor.column + 1);
             if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column});
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return false;
 
                 var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
                 var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
@@ -96,8 +98,8 @@ var CstyleBehaviour = function () {
             var line = session.doc.getLine(range.start.row);
             var rightChar = line.substring(range.end.column, range.end.column + 1);
             if (rightChar == '}') {
-                return new Range(range.start.row, range.start.column,
+                range.end.column++;
-                                 range.start.row, range.end.column + 1);
+                return range;
             }
         }
         return false;
@@ -141,8 +143,8 @@ var CstyleBehaviour = function () {
             var line = session.doc.getLine(range.start.row);
             var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
             if (rightChar == ')') {
-                return new Range(range.start.row, range.start.column,
+                range.end.column++;
-                                 range.start.row, range.end.column + 1);
+                return range;
             }
         }
         return false;
@@ -212,8 +214,8 @@ var CstyleBehaviour = function () {
             var line = session.doc.getLine(range.start.row);
             var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
             if (rightChar == '"') {
-                return new Range(range.start.row, range.start.column,
+                range.end.column++;
-                                 range.start.row, range.end.column + 1);
+                return range;
             }
         }
         return false;