[sieve mode] Better indentation

Author: thsmi

mode/sieve/sieve.js

@@ -31,19 +31,37 @@ CodeMirror.defineMode("sieve", function(config) {
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
     }
-
-    if (ch === "{")
-    {
-      state._indent++;
+    
+    if (ch == "(") {
+      state._indent.push("(");
+      // add virtual angel wings so that editor behaves...
+      // ...more sane incase of broken brackets
+      state._indent.push("{");
       return null;
     }
 
-    if (ch === "}")
-    {
-      state._indent--;
+    if (ch === "{") {
+      state._indent.push("{");
       return null;
     }
+    
+    if (ch == ")")  {
+      state._indent.pop();
+      state._indent.pop();    
+    }
 
+    if (ch === "}") {
+      state._indent.pop();
+      return null;
+    }
+    
+    if (ch == ",")
+      return null;
+      
+    if (ch == ";")
+      return null;
+      
+    
     if (/[{}\(\),;]/.test(ch))
       return null;
 
@@ -62,7 +80,7 @@ CodeMirror.defineMode("sieve", function(config) {
       return "operator";
     }
 
-    stream.eatWhile(/[\w\$_]/);
+    stream.eatWhile(/\w/);
     var cur = stream.current();
 
     // "text:" *(SP / HTAB) (hash-comment / CRLF)
@@ -79,6 +97,8 @@ CodeMirror.defineMode("sieve", function(config) {
 
     if (atoms.propertyIsEnumerable(cur))
       return "atom";
+      
+    return null;
   }
 
   function tokenMultiLineString(stream, state)
@@ -135,7 +155,7 @@ CodeMirror.defineMode("sieve", function(config) {
     startState: function(base) {
       return {tokenize: tokenBase,
               baseIndent: base || 0,
-              _indent: 0};
+              _indent: []};
     },
 
     token: function(stream, state) {
@@ -146,7 +166,14 @@ CodeMirror.defineMode("sieve", function(config) {
     },
 
     indent: function(state, textAfter) {
-      return state.baseIndent + state._indent * indentUnit;
+      var length = state._indent.length;
+      if (textAfter && (textAfter[0] == "}"))
+        length--;
+      
+      if (length <0)
+        length = 0;
+      
+      return length * indentUnit;
     },
 
     electricChars: "}"