ace-rails-ap 4.3 → 4.4

data/vendor/assets/javascripts/ace/mode-smarty.js

@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-snippets.js

@@ -192,6 +192,7 @@ oop.inherits(Mode, TextMode);
     this.$indentWithTabs = true;
     this.lineCommentStart = "#";
     this.$id = "ace/mode/snippets";
+    this.snippetFileId = "ace/snippets/snippets";
 }).call(Mode.prototype);
 exports.Mode = Mode;
 

data/vendor/assets/javascripts/ace/mode-soy_template.js

@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-sql.js

@@ -96,6 +96,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = "--";
 
     this.$id = "ace/mode/sql";
+    this.snippetFileId = "ace/snippets/sql";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-sqlserver.js

@@ -429,7 +429,8 @@ oop.inherits(Mode, TextMode);
         return session.$mode.$highlightRules.completions;
     };
     
-    this.$id = "ace/mode/sql";
+    this.$id = "ace/mode/sqlserver";
+    this.snippetFileId = "ace/snippets/sqlserver";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-svg.js

@@ -1454,6 +1454,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-swift.js

@@ -165,6 +165,12 @@ var SwiftHighlightRules = function() {
 
     this.$rules = {
         start: [
+            string('"""', {
+                escape: /\\(?:[0\\tnr"']|u{[a-fA-F1-9]{0,8}})/,
+                interpolation: {lead: "\\", open: "(", close: ")"},
+                error: /\\./,
+                multiline: true
+            }),
             string('"', {
                 escape: /\\(?:[0\\tnr"']|u{[a-fA-F1-9]{0,8}})/,
                 interpolation: {lead: "\\", open: "(", close: ")"},

data/vendor/assets/javascripts/ace/mode-tcl.js

@@ -373,6 +373,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/tcl";
+    this.snippetFileId = "ace/snippets/tcl";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-terraform.js

@@ -40,11 +40,15 @@ var TerraformHighlightRules = function () {
 
             {
                 token: "singleline.comment.terraform",
-                regex: '#(.)*$'
+                regex: '#.*$'
+            },
+            {
+                token: "singleline.comment.terraform",
+                regex: '//.*$'
             },
             {
                 token: "multiline.comment.begin.terraform",
-                regex: '^\\s*\\/\\*',
+                regex: /\/\*/,
                 push: "blockComment"
             },
             {
@@ -66,11 +70,7 @@ var TerraformHighlightRules = function () {
             {include: "variables"}
         ],
         blockComment: [{
-            regex: "^\\s*\\/\\*",
-            token: "multiline.comment.begin.terraform",
-            push: "blockComment"
-        }, {
-            regex: "\\*\\/\\s*$",
+            regex: /\*\//,
             token: "multiline.comment.end.terraform",
             next: "pop"
         }, {
@@ -383,6 +383,9 @@ oop.inherits(Mode, TextMode);
 
 
 (function () {
+    this.lineCommentStart = ["#", "//"];
+    this.blockComment = {start: "/*", end: "*/"};
+    
     this.$id = "ace/mode/terraform";
 }).call(Mode.prototype);
 

data/vendor/assets/javascripts/ace/mode-tex.js

@@ -146,6 +146,7 @@ oop.inherits(Mode, TextMode);
       return false;
    };
     this.$id = "ace/mode/tex";
+    this.snippetFileId = "ace/snippets/tex";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-textile.js

@@ -135,6 +135,7 @@ oop.inherits(Mode, TextMode);
     };
     
     this.$id = "ace/mode/textile";
+    this.snippetFileId = "ace/snippets/textile";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-tsx.js

@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-twig.js

@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-typescript.js

@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-vala.js

@@ -663,6 +663,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
     this.$id = "ace/mode/vala";
+    this.snippetFileId = "ace/snippets/vala";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/vendor/assets/javascripts/ace/mode-vbscript.js

@@ -8,11 +8,13 @@ var VBScriptHighlightRules = function() {
 
     var keywordMapper = this.createKeywordMapper({
         "keyword.control.asp":  "If|Then|Else|ElseIf|End|While|Wend|For|To|Each|Case|Select|Return"
-            + "|Continue|Do|Until|Loop|Next|With|Exit|Function|Property|Type|Enum|Sub|IIf",
-        "storage.type.asp": "Dim|Call|Class|Const|Dim|Redim|Set|Let|Get|New|Randomize|Option|Explicit",
+            + "|Continue|Do|Until|Loop|Next|With|Exit|Function|Property|Type|Enum|Sub|IIf|Class",
+        "storage.type.asp": "Dim|Call|Const|Redim|Set|Let|Get|New|Randomize|Option|Explicit|Preserve|Erase|Execute|ExecuteGlobal",
         "storage.modifier.asp": "Private|Public|Default",
-        "keyword.operator.asp": "Mod|And|Not|Or|Xor|as",
+        "keyword.operator.asp": "Mod|And|Not|Or|Xor|As|Eqv|Imp|Is",
         "constant.language.asp": "Empty|False|Nothing|Null|True",
+        "variable.language.vb.asp": "Me",
+        "support.class.vb.asp": "RegExp",
         "support.class.asp": "Application|ObjectContext|Request|Response|Server|Session",
         "support.class.collection.asp": "Contents|StaticObjects|ClientCertificate|Cookies|Form|QueryString|ServerVariables",
         "support.constant.asp": "TotalBytes|Buffer|CacheControl|Charset|ContentType|Expires|ExpiresAbsolute"
@@ -30,13 +32,17 @@ var VBScriptHighlightRules = function() {
             + "|Trim|Maths|Mid|Minute|Month|MonthName|MsgBox|Now|Oct|Remove|RemoveAll|Replace"
             + "|RGB|Right|Rnd|Round|ScriptEngine|ScriptEngineBuildVersion|ScriptEngineMajorVersion"
             + "|ScriptEngineMinorVersion|Second|SetLocale|Sgn|Sin|Space|Split|Sqr|StrComp|String|StrReverse"
-            + "|Tan|Time|Timer|TimeSerial|TimeValue|TypeName|UBound|UCase|Unescape|VarType|Weekday|WeekdayName|Year",
-        "support.type.vb.asp": "vbtrue|vbfalse|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|"
-            + "int32|vbtab|vbverticaltab|vbbinarycompare|vbtextcomparevbsunday|vbmonday|vbtuesday|vbwednesday"
-            + "|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek"
-            + "|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbEmpty|vbNull|vbInteger"
+            + "|Tan|Time|Timer|TimeSerial|TimeValue|TypeName|UBound|UCase|Unescape|VarType|Weekday|WeekdayName|Year"
+            + "|AscB|AscW|ChrB|ChrW|InStrB|LeftB|LenB|MidB|RightB|Abs|GetUILanguage",
+        "support.type.vb.asp": "vbTrue|vbFalse|vbCr|vbCrLf|vbFormFeed|vbLf|vbNewLine|vbNullChar|vbNullString"
+            + "|vbTab|vbVerticalTab|vbBinaryCompare|vbTextCompare|vbSunday|vbMonday|vbTuesday|vbWednesday"
+            + "|vbThursday|vbFriday|vbSaturday|vbUseSystemDayOfWeek|vbFirstJan1|vbFirstFourDays|vbFirstFullWeek"
+            + "|vbGeneralDate|vbLongDate|vbShortDate|vbLongTime|vbShortTime|vbObjectError|vbEmpty|vbNull|vbInteger"
             + "|vbLong|vbSingle|vbDouble|vbCurrency|vbDate|vbString|vbObject|vbError|vbBoolean|vbVariant"
-            + "|vbDataObject|vbDecimal|vbByte|vbArray"
+            + "|vbDataObject|vbDecimal|vbByte|vbArray|vbOKOnly|vbOKCancel|vbAbortRetryIgnore|vbYesNoCancel|vbYesNo"
+            + "|vbRetryCancel|vbCritical|vbQuestion|vbExclamation|vbInformation|vbDefaultButton1|vbDefaultButton2"
+            + "|vbDefaultButton3|vbDefaultButton4|vbApplicationModal|vbSystemModal|vbOK|vbCancel|vbAbort|vbRetry|vbIgnore|vbYes|vbNo"
+            + "|vbUseDefault"
     }, "identifier", true);
 
     this.$rules = {
@@ -78,7 +84,7 @@ var VBScriptHighlightRules = function() {
         },
         {
             token: "storage.type.asp",
-            regex: "On Error Resume Next|On Error GoTo",
+            regex: "On\\s+Error\\s+(?:Resume\\s+Next|GoTo)\\b",
             caseInsensitive: true
         },
         {
@@ -106,7 +112,7 @@ var VBScriptHighlightRules = function() {
         },
         {
             token: ["keyword.operator.asp"],
-            regex: "\\-|\\+|\\*\\/|\\>|\\<|\\=|\\&"
+            regex: "\\-|\\+|\\*|\\/|\\>|\\<|\\=|\\&|\\\\|\\^"
         }
     ],
     "state_3": [
@@ -145,7 +151,7 @@ var VBScriptHighlightRules = function() {
     "comment": [
         {
             token: "comment.line.apostrophe.asp",
-            regex: "$|(?=(?:%>))",
+            regex: "$",
             next: "start"
         },
         {
@@ -175,23 +181,446 @@ oop.inherits(VBScriptHighlightRules, TextHighlightRules);
 exports.VBScriptHighlightRules = VBScriptHighlightRules;
 });
 
-define("ace/mode/vbscript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/vbscript_highlight_rules"], function(require, exports, module) {
+define("ace/mode/folding/vbscript",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range","ace/token_iterator"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var BaseFoldMode = require("./fold_mode").FoldMode;
+var Range = require("../../range").Range;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+
+var FoldMode = exports.FoldMode = function() {};
+
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    this.indentKeywords = {
+        "class": 1,
+        "function": 1,
+        "sub": 1,
+        "if": 1,
+        "select": 1,
+        "do": 1,
+        "for": 1,
+        "while": 1,
+        "with": 1,
+        "property": 1,
+        "else": 1,
+        "elseif": 1,
+        "end": -1,
+        "loop": -1,
+        "next": -1,
+        "wend": -1
+    };
+
+    this.foldingStartMarker = /(?:\s|^)(class|function|sub|if|select|do|for|while|with|property|else|elseif)\b/i;
+    this.foldingStopMarker = /\b(end|loop|next|wend)\b/i;
+
+    this.getFoldWidgetRange = function (session, foldStyle, row) {
+        var line = session.getLine(row);
+        var isStart = this.foldingStartMarker.test(line);
+        var isEnd = this.foldingStopMarker.test(line);
+        if (isStart || isEnd) {
+            var match = (isEnd) ? this.foldingStopMarker.exec(line) : this.foldingStartMarker.exec(line);
+            var keyword = match && match[1].toLowerCase();
+            if (keyword) {
+                var type = session.getTokenAt(row, match.index + 2).type;
+                if (type === "keyword.control.asp" || type === "storage.type.function.asp")
+                    return this.vbsBlock(session, row, match.index + 2);
+            }
+        }
+    };
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var isStart = this.foldingStartMarker.test(line);
+        var isEnd = this.foldingStopMarker.test(line);
+        if (isStart && !isEnd) {
+            var match = this.foldingStartMarker.exec(line);
+            var keyword = match && match[1].toLowerCase();
+            if (keyword) {
+                var type = session.getTokenAt(row, match.index + 2).type;
+                if (type == "keyword.control.asp" || type == "storage.type.function.asp") {
+                    if (keyword == "if" && !/then\s*('|$)/i.test(line))
+                        return "";
+                    return "start";
+                }
+            }
+        }
+        return "";
+    };
+
+    this.vbsBlock = function(session, row, column, tokenRange) {
+        var stream = new TokenIterator(session, row, column);
+
+        var endOpenings = {
+            "class": 1,
+            "function": 1,
+            "sub": 1,
+            "if": 1,
+            "select": 1,
+            "with": 1,
+            "property": 1,
+            "else": 1,
+            "elseif": 1
+        };
+
+        var token = stream.getCurrentToken();
+        if (!token || (token.type != "keyword.control.asp" && token.type != "storage.type.function.asp"))
+            return;
+
+        var startTokenValue = token.value.toLowerCase();
+        var val = token.value.toLowerCase();
+
+        var stack = [val];
+        var dir = this.indentKeywords[val];
+
+        if (!dir)
+            return;
+
+        var firstRange = stream.getCurrentTokenRange();
+        switch (val) {
+            case "property":
+            case "sub":
+            case "function":
+            case "if":
+            case "select":
+            case "do":
+            case "for":
+            case "class":
+            case "while":
+            case "with":
+                var line = session.getLine(row);
+                var singleLineCondition = /^\s*If\s+.*\s+Then(?!')\s+(?!')\S/i.test(line);
+                if (singleLineCondition)
+                    return;
+                var checkToken = new RegExp("(?:^|\\s)" + val, "i");
+                var endTest = /^\s*End\s(If|Sub|Select|Function|Class|With|Property)\s*/i.test(line);
+                if (!checkToken.test(line) && !endTest) {
+                    return;
+                }
+                if (endTest) {
+                    var tokenRange = stream.getCurrentTokenRange();
+                    stream.step = stream.stepBackward;
+                    stream.step();
+                    stream.step();
+                    token = stream.getCurrentToken();
+                    if (token) {
+                        val = token.value.toLowerCase();
+                        if (val == "end") {
+                            firstRange = stream.getCurrentTokenRange();
+                            firstRange = new Range(firstRange.start.row, firstRange.start.column, tokenRange.start.row, tokenRange.end.column);
+                        }
+                    }
+                    dir = -1;
+                }
+                break;
+            case "end":
+                var tokenPos = stream.getCurrentTokenPosition();
+                firstRange = stream.getCurrentTokenRange();
+                stream.step = stream.stepForward;
+                stream.step();
+                stream.step();
+                token = stream.getCurrentToken();
+                if (token) {
+                    val = token.value.toLowerCase();
+                    if (val in endOpenings) {
+                        startTokenValue = val;
+                        var nextTokenPos = stream.getCurrentTokenPosition();
+                        var endColumn = nextTokenPos.column + val.length;
+                        firstRange = new Range(tokenPos.row, tokenPos.column, nextTokenPos.row, endColumn);
+                    }
+                }
+                stream.step = stream.stepBackward;
+                stream.step();
+                stream.step();
+                break;
+        }
+        var startColumn = dir === -1 ? session.getLine(row - 1).length : session.getLine(row).length;
+        var startRow = row;
+        var ranges = [];
+        ranges.push(firstRange);
+
+        stream.step = dir === -1 ? stream.stepBackward : stream.stepForward;
+        while(token = stream.step()) {
+            var outputRange = null;
+            var ignore = false;
+            if (token.type != "keyword.control.asp" && token.type != "storage.type.function.asp")
+                continue;
+            val = token.value.toLowerCase();
+            var level = dir * this.indentKeywords[val];
+
+            switch (val) {
+                case "property":
+                case "sub":
+                case "function":
+                case "if":
+                case "select":
+                case "do":
+                case "for":
+                case "class":
+                case "while":
+                case "with":
+                    var line = session.getLine(stream.getCurrentTokenRow());
+                    var singleLineCondition = /^\s*If\s+.*\s+Then(?!')\s+(?!')\S/i.test(line);
+                    if (singleLineCondition) {
+                        level = 0;
+                        ignore = true;
+                    }
+                    var checkToken = new RegExp("^\\s* end\\s+" + val, "i");
+                    if (checkToken.test(line)) {
+                        level = 0;
+                        ignore = true;
+                    }
+                    break;
+                case "elseif":
+                case "else":
+                    level = 0;
+                    if (startTokenValue != "elseif") {
+                        ignore = true;
+                    }
+                    break;
+            }
+
+            if (level > 0) {
+                stack.unshift(val);
+            } else if (level <= 0 && ignore === false) {
+                stack.shift();
+                if (!stack.length) {
+                        switch (val) {
+                            case "end":
+                                var tokenPos = stream.getCurrentTokenPosition();
+                                outputRange = stream.getCurrentTokenRange();
+                                stream.step();
+                                stream.step();
+                                token = stream.getCurrentToken();
+                                if (token) {
+                                    val = token.value.toLowerCase();
+                                    if (val in endOpenings) {
+                                        if ((startTokenValue == "else" || startTokenValue == "elseif")) {
+                                            if (val !== "if") {
+                                                ranges.shift();
+                                            }
+                                        } else {
+                                            if (val != startTokenValue)
+                                                ranges.shift();
+                                        }
+                                        var nextTokenPos = stream.getCurrentTokenPosition();
+                                        var endColumn = nextTokenPos.column + val.length;
+                                        outputRange = new Range(tokenPos.row, tokenPos.column, nextTokenPos.row, endColumn);
+                                    } else {
+                                        ranges.shift();
+                                    }
+                                } else {
+                                    ranges.shift();
+                                }
+                                stream.step = stream.stepBackward;
+                                stream.step();
+                                stream.step();
+                                token = stream.getCurrentToken();
+                                val = token.value.toLowerCase();
+                                break;
+                            case "select":
+                            case "sub":
+                            case "if":
+                            case "function":
+                            case "class":
+                            case "with":
+                            case "property":
+                                if (val != startTokenValue)
+                                    ranges.shift();
+                                break;
+                            case "do":
+                                if (startTokenValue != "loop")
+                                    ranges.shift();
+                                break;
+                            case "loop":
+                                if (startTokenValue != "do")
+                                    ranges.shift();
+                                break;
+                            case "for":
+                                if (startTokenValue != "next")
+                                    ranges.shift();
+                                break;
+                            case "next":
+                                if (startTokenValue != "for")
+                                    ranges.shift();
+                                break;
+                            case "while":
+                                if (startTokenValue != "wend")
+                                    ranges.shift();
+                                break;
+                            case "wend":
+                                if (startTokenValue != "while")
+                                    ranges.shift();
+                                break;
+                        }
+                        break;
+                }
+
+                if (level === 0){
+                    stack.unshift(val);
+                }
+            }
+        }
+
+        if (!token)
+            return null;
+
+        if (tokenRange) {
+            if (!outputRange) {
+                ranges.push(stream.getCurrentTokenRange());
+            } else {
+                ranges.push(outputRange);
+            }
+            return ranges;
+        }
+
+        var row = stream.getCurrentTokenRow();
+        if (dir === -1) {
+            var endColumn = session.getLine(row).length;
+            return new Range(row, endColumn, startRow - 1, startColumn);
+        } else
+            return new Range(startRow, startColumn, row - 1, session.getLine(row - 1).length);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/vbscript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/vbscript_highlight_rules","ace/mode/folding/vbscript","ace/range"], function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var VBScriptHighlightRules = require("./vbscript_highlight_rules").VBScriptHighlightRules;
+var FoldMode = require("./folding/vbscript").FoldMode;
+var Range = require("../range").Range;
 
 var Mode = function() {
     this.HighlightRules = VBScriptHighlightRules;
+    this.foldingRules = new FoldMode();
     this.$behaviour = this.$defaultBehaviour;
+    this.indentKeywords = this.foldingRules.indentKeywords;
 };
 oop.inherits(Mode, TextMode);
 
 (function() {
-       
+
     this.lineCommentStart = ["'", "REM"];
-    
+
+    var outdentKeywords = [
+        "else",
+        "elseif",
+        "end",
+        "loop",
+        "next",
+        "wend"
+    ];
+
+    function getNetIndentLevel(tokens, line, indentKeywords) {
+        var level = 0;
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            if (token.type == "keyword.control.asp" || token.type == "storage.type.function.asp") {
+                var val = token.value.toLowerCase();
+                if (val in indentKeywords) {
+                    switch (val) {
+                        case "property":
+                        case "sub":
+                        case "function":
+                        case "select":
+                        case "do":
+                        case "for":
+                        case "class":
+                        case "while":
+                        case "with":
+                        case "if":
+                            var checkToken = new RegExp("^\\s* end\\s+" + val, "i");
+                            var singleLineCondition = /^\s*If\s+.*\s+Then(?!')\s+(?!')\S/i.test(line);
+                            if (!singleLineCondition && !checkToken.test(line))
+                                level += indentKeywords[val];
+                            break;
+                        default:
+                            level += indentKeywords[val];
+                            break;
+                    }
+                }
+            }
+        }
+        if (level < 0) {
+            return -1;
+        } else if (level > 0) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+        var level = 0;
+
+        var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+
+        if (state == "start") {
+            level = getNetIndentLevel(tokens, line, this.indentKeywords);
+        }
+        if (level > 0) {
+            return indent + tab;
+        } else if (level < 0 && indent.substr(indent.length - tab.length) == tab) {
+            if (!this.checkOutdent(state, line, "\n")) {
+                return indent.substr(0, indent.length - tab.length);
+            }
+        }
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        if (input != "\n" && input != "\r" && input != "\r\n")
+            return false;
+
+        var tokens = this.getTokenizer().getLineTokens(line.trim(), state).tokens;
+
+        if (!tokens || !tokens.length)
+            return false;
+        var val = tokens[0].value.toLowerCase();
+        return ((tokens[0].type == "keyword.control.asp" || tokens[0].type == "storage.type.function.asp") && outdentKeywords.indexOf(val) != -1);
+    };
+
+    this.getMatching = function(session, row, column, tokenRange) {
+        if (row == undefined) {
+            var pos = session.selection.lead;
+            column = pos.column;
+            row = pos.row;
+        }
+        if (tokenRange == undefined)
+            tokenRange = true;
+
+        var startToken = session.getTokenAt(row, column);
+        if (startToken) {
+            var val = startToken.value.toLowerCase();
+            if (val in this.indentKeywords)
+                return this.foldingRules.vbsBlock(session, row, column, tokenRange);
+        }
+    };
+
+    this.autoOutdent = function(state, session, row) {
+        var line = session.getLine(row);
+        var column = line.match(/^\s*/)[0].length;
+        if (!column || !row) return;
+
+        var startRange = this.getMatching(session, row, column + 1, false);
+        if (!startRange || startRange.start.row == row)
+            return;
+        var indent = this.$getIndent(session.getLine(startRange.start.row));
+        if (indent.length != column) {
+            session.replace(new Range(row, 0, row, column), indent);
+            session.outdentRows(new Range(row + 1, 0, row + 1, 0));
+        }
+    };
+
     this.$id = "ace/mode/vbscript";
 }).call(Mode.prototype);