Merge branch 'master' of github.com:ajaxorg/ace

build

@@ -1 +1 @@
-Subproject commit c2f3abb2ecd3287f90225d804132f0fd26cfb639
+Subproject commit 6149ca6b148e878d4c1341d4675ca3597d78dbdd

lib/ace/css/editor.css

@@ -242,6 +242,8 @@
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
     cursor: default;
+    white-space: pre-line;
+    word-wrap: break-word;
 }
 
 .ace_folding-enabled > .ace_gutter-cell {

lib/ace/edit_session/folding.js

@@ -683,6 +683,7 @@ function Folding() {
     };
 
     this.onFoldWidgetClick = function(row, e) {
+        e = e.domEvent;
         var type = this.getFoldWidget(row);
         var line = this.getLine(row);
         var onlySubfolds = e.shiftKey;

lib/ace/keyboard/vim/commands.js

@@ -304,76 +304,76 @@ var inputBuffer = exports.inputBuffer = {
 
     lastInsertCommands: [],
 
-    push: function(editor, char, keyId) {
+    push: function(editor, ch, keyId) {
         this.idle = false;
         var wObj = this.waitingForParam;
         if (wObj) {
-            this.exec(editor, wObj, char);
+            this.exec(editor, wObj, ch);
         }
         // If input is a number (that doesn't start with 0)
-        else if (!(char === "0" && !this.currentCount.length) &&
+        else if (!(ch === "0" && !this.currentCount.length) &&
-            (char.match(/^\d+$/) && this.isAccepting(NUMBER))) {
+            (ch.match(/^\d+$/) && this.isAccepting(NUMBER))) {
-            // Assuming that char is always of type String, and not Number
+            // Assuming that ch is always of type String, and not Number
-            this.currentCount += char;
+            this.currentCount += ch;
             this.currentCmd = NUMBER;
             this.accepting = [NUMBER, OPERATOR, MOTION, ACTION];
         }
-        else if (!this.operator && this.isAccepting(OPERATOR) && operators[char]) {
+        else if (!this.operator && this.isAccepting(OPERATOR) && operators[ch]) {
             this.operator = {
-                char: char,
+                ch: ch,
                 count: this.getCount()
             };
             this.currentCmd = OPERATOR;
             this.accepting = [NUMBER, MOTION, ACTION];
             this.exec(editor, { operator: this.operator });
         }
-        else if (motions[char] && this.isAccepting(MOTION)) {
+        else if (motions[ch] && this.isAccepting(MOTION)) {
             this.currentCmd = MOTION;
 
             var ctx = {
                 operator: this.operator,
                 motion: {
-                    char: char,
+                    ch: ch,
                     count: this.getCount()
                 }
             };
 
-            if (motions[char].param)
+            if (motions[ch].param)
                 this.waitForParam(ctx);
             else
                 this.exec(editor, ctx);
         }
-        else if (alias[char] && this.isAccepting(MOTION)) {
+        else if (alias[ch] && this.isAccepting(MOTION)) {
-            alias[char].operator.count = this.getCount();
+            alias[ch].operator.count = this.getCount();
-            this.exec(editor, alias[char]);
+            this.exec(editor, alias[ch]);
         }
-        else if (actions[char] && this.isAccepting(ACTION)) {
+        else if (actions[ch] && this.isAccepting(ACTION)) {
             var actionObj = {
                 action: {
-                    fn: actions[char].fn,
+                    fn: actions[ch].fn,
                     count: this.getCount()
                 }
             };
 
-            if (actions[char].param) {
+            if (actions[ch].param) {
                 this.waitForParam(actionObj);
             }
             else {
                 this.exec(editor, actionObj);
             }
 
-            if (actions[char].acceptsMotion)
+            if (actions[ch].acceptsMotion)
                 this.idle = false;
         }
         else if (this.operator) {
-            this.exec(editor, { operator: this.operator }, char);
+            this.exec(editor, { operator: this.operator }, ch);
         }
         else {
             this.reset();
         }
         
         if (this.waitingForParam || this.motion || this.operator) {
-            this.status += char;
+            this.status += ch;
         } else if (this.currentCount) {
             this.status = this.currentCount;
         } else if (this.status) {
@@ -410,18 +410,18 @@ var inputBuffer = exports.inputBuffer = {
         }
 
         if (o && !editor.selection.isEmpty()) {
-            if (operators[o.char].selFn) {
+            if (operators[o.ch].selFn) {
-                operators[o.char].selFn(editor, editor.getSelectionRange(), o.count, param);
+                operators[o.ch].selFn(editor, editor.getSelectionRange(), o.count, param);
                 this.reset();
             }
             return;
         }
 
         // There is an operator, but no motion or action. We try to pass the
-        // current char to the operator to see if it responds to it (an example
+        // current ch to the operator to see if it responds to it (an example
         // of this is the 'dd' operator).
         else if (!m && !a && o && param) {
-            operators[o.char].fn(editor, null, o.count, param);
+            operators[o.ch].fn(editor, null, o.count, param);
             this.reset();
         }
         else if (m) {
@@ -434,7 +434,7 @@ var inputBuffer = exports.inputBuffer = {
                 }
             };
 
-            var motionObj = motions[m.char];
+            var motionObj = motions[m.ch];
             var selectable = motionObj.sel;
 
             if (!o) {
@@ -446,7 +446,7 @@ var inputBuffer = exports.inputBuffer = {
             else if (selectable) {
                 repeat(function() {
                     run(motionObj.sel);
-                    operators[o.char].fn(editor, editor.getSelectionRange(), o.count, param);
+                    operators[o.ch].fn(editor, editor.getSelectionRange(), o.count, param);
                 }, o.count || 1);
             }
             this.reset();

lib/ace/keyboard/vim/maps/aliases.js

@@ -34,57 +34,57 @@ define(function(require, exports, module) {
 module.exports = {
     "x": {
         operator: {
-            char: "d",
+            ch: "d",
             count: 1
         },
         motion: {
-            char: "l",
+            ch: "l",
             count: 1
         }
     },
     "X": {
         operator: {
-            char: "d",
+            ch: "d",
             count: 1
         },
         motion: {
-            char: "h",
+            ch: "h",
             count: 1
         }
     },
     "D": {
         operator: {
-            char: "d",
+            ch: "d",
             count: 1
         },
         motion: {
-            char: "$",
+            ch: "$",
             count: 1
         }
     },
     "C": {
         operator: {
-            char: "c",
+            ch: "c",
             count: 1
         },
         motion: {
-            char: "$",
+            ch: "$",
             count: 1
         }
     },
     "s": {
         operator: {
-            char: "c",
+            ch: "c",
             count: 1
         },
         motion: {
-            char: "l",
+            ch: "l",
             count: 1
         }
     },
     "S": {
         operator: {
-            char: "c",
+            ch: "c",
             count: 1
         },
         param: "c"

lib/ace/keyboard/vim/maps/motions.js

@@ -580,7 +580,7 @@ module.exports = {
         sel: function(editor, range, count, param) {
             keepScrollPosition(editor, editor.selectPageUp);
         }
-    },
+    }
 };
 
 module.exports.backspace = module.exports.left = module.exports.h;

lib/ace/keyboard/vim/maps/util.js

@@ -99,24 +99,24 @@ module.exports = {
             this.onVisualLineMode = false;
         }
     },
-    getRightNthChar: function(editor, cursor, char, n) {
+    getRightNthChar: function(editor, cursor, ch, n) {
         var line = editor.getSession().getLine(cursor.row);
-        var matches = line.substr(cursor.column + 1).split(char);
+        var matches = line.substr(cursor.column + 1).split(ch);
 
-        return n < matches.length ? matches.slice(0, n).join(char).length : null;
+        return n < matches.length ? matches.slice(0, n).join(ch).length : null;
     },
-    getLeftNthChar: function(editor, cursor, char, n) {
+    getLeftNthChar: function(editor, cursor, ch, n) {
         var line = editor.getSession().getLine(cursor.row);
-        var matches = line.substr(0, cursor.column).split(char);
+        var matches = line.substr(0, cursor.column).split(ch);
 
-        return n < matches.length ? matches.slice(-1 * n).join(char).length : null;
+        return n < matches.length ? matches.slice(-1 * n).join(ch).length : null;
     },
-    toRealChar: function(char) {
+    toRealChar: function(ch) {
-        if (char.length === 1)
+        if (ch.length === 1)
-            return char;
+            return ch;
 
-        if (/^shift-./.test(char))
+        if (/^shift-./.test(ch))
-            return char[char.length - 1].toUpperCase();
+            return ch[ch.length - 1].toUpperCase();
         else
             return "";
     },

lib/ace/layer/gutter.js

@@ -33,6 +33,7 @@ define(function(require, exports, module) {
 
 var dom = require("../lib/dom");
 var oop = require("../lib/oop");
+var lang = require("../lib/lang");
 var EventEmitter = require("../lib/event_emitter").EventEmitter;
 
 var Gutter = function(parentEl) {
@@ -78,12 +79,15 @@ var Gutter = function(parentEl) {
             var annotation = annotations[i];
             var row = annotation.row;
             var rowInfo = this.$annotations[row];
-            if (!rowInfo) {
+            if (!rowInfo)
                 rowInfo = this.$annotations[row] = {text: []};
-            }
+           
-            var annoText = annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</g, "&lt;");
+            var annoText = annotation.text;
+            annoText = annoText ? lang.escapeHTML(annoText) : annotation.html || "";
+
             if (rowInfo.text.indexOf(annoText) === -1)
                 rowInfo.text.push(annoText);
+
             var type = annotation.type;
             if (type == "error")
                 rowInfo.className = " ace_error";

lib/ace/lib/lang.js

@@ -117,6 +117,10 @@ exports.escapeRegExp = function(str) {
     return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
 };
 
+exports.escapeHTML = function(str) {
+    return str.replace(/&/g, "&#38;").replace(/"/g, "&#34;").replace(/'/g, "&#39;").replace(/</g, "&#60;");
+};
+
 exports.getMatchOffsets = function(string, regExp) {
     var matches = [];
 

lib/ace/mode/coldfusion_highlight_rules.js

@@ -58,11 +58,11 @@ var ColdfusionHighlightRules = function() {
             next : "comment"
         }, {
             token : "meta.tag",
-            regex : "<(?=\s*script)",
+            regex : "<(?=script)",
             next : "script"
         }, {
             token : "meta.tag",
-            regex : "<(?=\s*style)",
+            regex : "<(?=style)",
             next : "style"
         }, {
             token : "meta.tag", // opening tag

lib/ace/mode/diff_highlight_rules.js

@@ -74,14 +74,14 @@ var DiffHighlightRules = function() {
                     "support.constant",
                     "text",
                     "invalid"
-                ],
+                ]
             }, { // removed
                 "regex": "^([<\\-])(.*?)(\\s*)$",
                 "token": [
                     "support.function",
                     "string",
                     "invalid"
-                ],
+                ]
             }, {
                 "regex": "^(diff)(\\s+--\\w+)?(.+?)( .+)?$",
                 "token": ["variable", "variable", "keyword", "variable"]

lib/ace/mode/folding/pythonic_test.js

@@ -47,7 +47,7 @@ module.exports = {
             ']',
             '[ ',
             '{ ',
-            '[  #-',
+            '[  #-'
         ]);
 
         var mode = new PythonMode();

lib/ace/mode/html_highlight_rules.js

@@ -80,11 +80,11 @@ var HtmlHighlightRules = function() {
             regex : "<\\!.*?>"
         }, {
             token : "meta.tag",
-            regex : "<(?=\s*script\\b)",
+            regex : "<(?=script\\b)",
             next : "script"
         }, {
             token : "meta.tag",
-            regex : "<(?=\s*style\\b)",
+            regex : "<(?=style\\b)",
             next : "style"
         }, {
             token : "meta.tag", // opening tag

lib/ace/mode/jade_highlight_rules.js

@@ -82,7 +82,7 @@ var JadeHighlightRules = function() {
         },
         {
             "token" : "punctuation.section.comment",
-            "regex" : "^\\s*\/\/(?:\\s*[^-\\s]|\\s+\\S)(?:.*$)",
+            "regex" : "^\\s*\/\/(?:\\s*[^-\\s]|\\s+\\S)(?:.*$)"
         },
         {
             "token" : function(space, text) {

lib/ace/mode/java_highlight_rules.js

@@ -55,8 +55,7 @@ var JavaHighlightRules = function() {
         "variable.language": "this",
         "keyword": keywords,
         "constant.language": buildinConstants,
-        "support.function": langClasses,
+        "support.function": langClasses
-
     }, "identifier");
 
     // regexp must not have capturing parentheses. Use (?:) instead.

lib/ace/mode/javascript_highlight_rules.js

@@ -52,7 +52,7 @@ var JavaScriptHighlightRules = function() {
         "invalid.deprecated":
             "__parent__|__count__|escape|unescape|with|__proto__",
         "keyword":
-            "const|yield|import|get|set" +
+            "const|yield|import|get|set|" +
             "break|case|catch|continue|default|delete|do|else|finally|for|function|" +
             "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger",
         "storage.type":
@@ -286,7 +286,7 @@ var JavaScriptHighlightRules = function() {
                 merge: true
             }, {
                 token: "constant.language.escape",
-                regex: "-",
+                regex: "-"
             }, {
                 token: "string.regexp.charachterclass",
                 regex: /[^\]\-\\]+/,

lib/ace/mode/javascript_worker.js

@@ -143,6 +143,8 @@ oop.inherits(JavaScriptWorker, Mirror);
                 if (maxErrorLevel == "error" && str && /[\w\d{(['"]/.test(str)) {
                     error.reason = 'Missing ";" before statement';
                     type = "error";
+                } else {
+                    type = "info";
                 }
             }
             else if (disabledWarningsRe.test(raw)) {

lib/ace/mode/latex_highlight_rules.js

@@ -9,7 +9,7 @@ var LatexHighlightRules = function() {
         "start" : [{
             // A tex command e.g. \foo
             token : "keyword",
-            regex : "\\\\(?:[^a-zA-Z]|[a-zA-Z]+)",
+            regex : "\\\\(?:[^a-zA-Z]|[a-zA-Z]+)"
         }, {
             // Curly and square braces
             token : "lparen",

lib/ace/mode/lua.js

@@ -51,7 +51,7 @@ oop.inherits(Mode, TextMode);
         "elseif": 1,
         "repeat": 1,
         "end": -1,
-        "until": -1,
+        "until": -1
     };
     var outdentKeywords = [
         "else",

lib/ace/mode/pgsql_highlight_rules.js

@@ -404,7 +404,7 @@ var PgsqlHighlightRules = function() {
 
     var keywordMapper = this.createKeywordMapper({
         "support.function": builtinFunctions,
-        "keyword": keywords,
+        "keyword": keywords
     }, "identifier", true);
 
 

lib/ace/mode/php.js

@@ -39,6 +39,7 @@ var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutd
 var Range = require("../range").Range;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+var unicode = require("../unicode");
 
 var Mode = function() {
     this.$tokenizer = new Tokenizer(new PhpHighlightRules().getRules());
@@ -50,6 +51,20 @@ oop.inherits(Mode, TextMode);
 
 (function() {
 
+    this.tokenRe = new RegExp("^["
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\_]+", "g"
+    );
+    
+    this.nonTokenRe = new RegExp("^(?:[^"
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\_]|\s])+", "g"
+    );
+
     this.toggleCommentLines = function(state, doc, startRow, endRow) {
         var outdent = true;
         var re = /^(\s*)#/;

lib/ace/mode/ruby_highlight_rules.js

@@ -122,11 +122,11 @@ var RubyHighlightRules = function() {
                 token : "text", // namespaces aren't symbols
                 regex : "::"
             }, {
-                token : "variable.instancce", // instance variable
+                token : "variable.instance", // instance variable
-                regex : "@{1,2}(?:[a-zA-Z_]|\d)+"
+                regex : "@{1,2}[a-zA-Z_\\d]+"
             }, {
                 token : "variable.class", // class name
-                regex : "[A-Z](?:[a-zA-Z_]|\d)+"
+                regex : "[A-Z][a-zA-Z_\\d]+"
             }, {
                 token : "string", // symbol
                 regex : "[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"

lib/ace/mode/scad_highlight_rules.js

@@ -40,7 +40,7 @@ var scadHighlightRules = function() {
     var keywordMapper = this.createKeywordMapper({
         "variable.language": "this",
         "keyword": "module|if|else|for",
-        "constant.language": "NULL",
+        "constant.language": "NULL"
     }, "identifier");
 
     // regexp must not have capturing parentheses. Use (?:) instead.

lib/ace/mode/scala_highlight_rules.js

@@ -126,7 +126,7 @@ var ScalaHighlightRules = function() {
         "string" : [
             {
                 token : "escape",
-                regex : '\\\\"',
+                regex : '\\\\"'
             }, {
                 token : "string",
                 merge : true,

lib/ace/mode/sh_highlight_rules.js

@@ -92,7 +92,7 @@ var ShHighlightRules = function() {
             regex : variable
         }, {
             token : "support.function",
-            regex : func,
+            regex : func
         }, {
             token : "support.function",
             regex : fileDescriptor

lib/ace/mode/svg_highlight_rules.js

@@ -41,7 +41,7 @@ var SvgHighlightRules = function() {
 
     this.$rules.start.splice(3, 0, {
         token : "meta.tag",
-        regex : "<(?=\s*script)",
+        regex : "<(?=script)",
         next : "script"
     });
     

lib/ace/mode/tcl_highlight_rules.js

@@ -150,16 +150,16 @@ var TclHighlightRules = function() {
             }],
         "variable" : [ 
             {
-                token : "variable.instancce", // variable xotcl with braces
+                token : "variable.instance", // variable xotcl with braces
-                regex : "(?:[:][:])?(?:[a-zA-Z_]|\d)+(?:(?:[:][:])?(?:[a-zA-Z_]|\d)+)?(?:[(](?:[a-zA-Z_]|\d)+[)])?",
+                regex : "(?:[:][:])?[a-zA-Z_\\d]+(?:(?:[:][:])?[a-zA-Z_\\d]+)?(?:[(][a-zA-Z_\\d]+[)])?",
                 next : "start"
             }, {
-                token : "variable.instancce", // variable tcl
+                token : "variable.instance", // variable tcl
-                regex : "(?:[a-zA-Z_]|\d)+(?:[(](?:[a-zA-Z_]|\d)+[)])?",
+                regex : "[a-zA-Z_\\d]+(?:[(][a-zA-Z_\\d]+[)])?",
                 next  : "start"
             }, {
-                token : "variable.instancce", // variable tcl with braces
+                token : "variable.instance", // variable tcl with braces
-                regex : "{?(?:[a-zA-Z_]|\d)+}?",
+                regex : "{?[a-zA-Z_\\d]+}?",
                 next  : "start"
             }],  
         "qqstring" : [ {

lib/ace/search_test.js

@@ -43,7 +43,7 @@ module.exports = {
     "test: configure the search object" : function() {
         var search = new Search();
         search.set({
-            needle: "juhu",
+            needle: "juhu"
         });
     },
 
@@ -397,7 +397,7 @@ module.exports = {
         var search = new Search().set({
             needle: "[ ]+$",
             regExp: true,
-            wrap: true,
+            wrap: true
         });
 
         session.getSelection().moveCursorTo(1, 2);
@@ -414,7 +414,7 @@ module.exports = {
         var search = new Search().set({
             needle: "foo",
             wrap: true,
-            wholeWord: true,
+            wholeWord: true
         });
 
         session.getSelection().moveCursorTo(0, 4);
@@ -437,7 +437,7 @@ module.exports = {
             needle: "foo",
             wrap: true,
             wholeWord: true,
-            backwards: true,
+            backwards: true
         });
 
         session.getSelection().moveCursorTo(0, 13);

lib/ace/token_iterator_test.js

@@ -202,7 +202,7 @@ module.exports = {
         assert.equal(iterator.getCurrentToken().value, "for");
         assert.equal(iterator.getCurrentTokenRow(), 1);
         assert.equal(iterator.getCurrentTokenColumn(), 4);
-    },
+    }
 };
 
 });

lib/ace/tokenizer_dev.js

@@ -103,7 +103,7 @@ var Tokenizer = function(rules, flag) {
         var token = {
             type: null,
             value: "",
-            state: currentState,
+            state: currentState
         };
         initState();
         

lib/ace/worker/worker.js

@@ -1,8 +1,13 @@
 "no use strict";
 
 var console = {
-    log: function(msgs) {
+    log: function() {
-        postMessage({type: "log", data: arguments.join(" ")});
+        var msgs = Array.prototype.slice.call(arguments, 0);
+        postMessage({type: "log", data: msgs});
+    },
+    error: function() {
+        var msgs = Array.prototype.slice.call(arguments, 0);
+        postMessage({type: "log", data: msgs});
     }
 };
 var window = {

lib/ace/worker/worker_client.js

@@ -84,7 +84,7 @@ var WorkerClient = function(topLevelNamespaces, mod, classname) {
         var msg = e.data;
         switch(msg.type) {
             case "log":
-                window.console && console.log && console.log(msg.data);
+                window.console && console.log && console.log.apply(console, msg.data);
                 break;
 
             case "event":