Merge branch 'master' into ipad

.gitignore

@@ -7,6 +7,7 @@
 .project
 .settings/
 .settings.xml
+.c9settings.xml
 .settings.xml.old
 .*.gz
 

Makefile.dryice.js

@@ -54,6 +54,12 @@ copy({
 });
 
 var ace = copy.createDataObject();
+copy({
+    source: [
+        'build_support/mini_require.js'
+    ],
+    dest: ace
+});
 copy({
     source: [
         copy.source.commonjs({
@@ -96,7 +102,6 @@ copy({
 });
 copy({
     source: [
-        'build_support/mini_require.js',
         'build_support/boot.js'    
     ],
     dest: ace
@@ -164,7 +169,7 @@ copy({
 // create modes
 project.assmeAllFilesLoaded();
 
-["css", "html", "javascript", "php", "python", "xml"].forEach(function(mode) {
+["css", "html", "javascript", "php", "python", "xml", "ruby", "java"].forEach(function(mode) {
     copy({
         source: [
             copy.source.commonjs({

build_support/editor.html

@@ -27,7 +27,7 @@
     }
 }</pre>
     
-<script src="src/ace-uncompressed.js" type="text/javascript" charset="utf-8"></script>
+<script src="src/ace.js" type="text/javascript" charset="utf-8"></script>
 <script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script>
 <script src="src/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
 <script>

build_support/mini_require.js

@@ -40,10 +40,17 @@
  * @param module a name for the payload
  * @param payload a function to call with (require, exports, module) params
  */
-function define(module, payload) {
+ 
+(function() {
+    
+var _define = function(module, payload) {
     if (typeof module !== 'string') {
-        console.error('dropping module because define wasn\'t a string.');
-        console.trace();
+        if (_define.original)
+            _define.original.apply(window, arguments);
+        else {
+            console.error('dropping module because define wasn\'t a string.');
+            console.trace();
+        }
         return;
     }
 
@@ -51,16 +58,24 @@ function define(module, payload) {
         define.modules = {};
         
     define.modules[module] = payload;
-}
+};
+if (window.define)
+    _define.original = window.define;
+    
+window.define = _define;
+
 
 /**
  * Get at functionality define()ed using the function above
  */
-function require(module, callback) {
+var _require = function(module, callback) {
     if (Object.prototype.toString.call(module) === "[object Array]") {
         var params = [];
         for (var i = 0, l = module.length; i < l; ++i) {
-            params.push(define.lookup(module[i]));
+            var dep = lookup(module[i]);
+            if (!dep && _require.original)
+                return _require.original.apply(window, arguments);
+            params.push(dep);
         };
         if (callback) {
             callback.apply(null, params);
@@ -68,7 +83,10 @@ function require(module, callback) {
     }
 
     if (typeof module === 'string') {
-        var payload = define.lookup(module);
+        var payload = lookup(module);
+        if (!payload && _require.original)
+            return _require.original.apply(window, arguments);
+        
         if (callback) {
             callback();
         }
@@ -77,13 +95,17 @@ function require(module, callback) {
     };
 }
 
+if (window.require)
+    _require.original = window.require;
+    
+window.require = _require;
 require.packaged = true;
 
 /**
  * Internal function to lookup moduleNames and resolve them by calling the
  * definition function if needed.
  */
-define.lookup = function(moduleName) {
+var lookup = function(moduleName) {
     var module = define.modules[moduleName];
     if (module == null) {
         console.error('Missing module: ' + moduleName);
@@ -100,3 +122,5 @@ define.lookup = function(moduleName) {
 
     return module;
 };
+
+})();

demo/demo.js

@@ -52,6 +52,8 @@ exports.launch = function(env) {
     var XmlMode = require("ace/mode/xml").Mode;
     var PythonMode = require("ace/mode/python").Mode;
     var PhpMode = require("ace/mode/php").Mode;
+    var JavaMode = require("ace/mode/java").Mode;
+    var RubyMode = require("ace/mode/ruby").Mode;
     var TextMode = require("ace/mode/text").Mode;
     var UndoManager = require("ace/undomanager").UndoManager;
 
@@ -101,6 +103,14 @@ exports.launch = function(env) {
     docs.php = new EditSession(document.getElementById("phptext").innerHTML);
     docs.php.setMode(new PhpMode());
     docs.php.setUndoManager(new UndoManager());
+    
+    docs.java = new EditSession(document.getElementById("javatext").innerHTML);
+    docs.java.setMode(new JavaMode());
+    docs.java.setUndoManager(new UndoManager());
+
+    docs.ruby = new EditSession(document.getElementById("rubytext").innerHTML);
+    docs.ruby.setMode(new RubyMode());
+    docs.ruby.setUndoManager(new UndoManager());
 
 
     var container = document.getElementById("editor");
@@ -113,7 +123,9 @@ exports.launch = function(env) {
         css: new CssMode(),
         javascript: new JavaScriptMode(),
         python: new PythonMode(),
-        php: new PhpMode()
+        php: new PhpMode(),
+        java: new JavaMode(),
+        ruby: new RubyMode()
     };
 
     function getMode() {
@@ -146,6 +158,12 @@ exports.launch = function(env) {
         else if (mode instanceof PhpMode) {
             modeEl.value = "php";
         }
+        else if (mode instanceof JavaMode) {
+            modeEl.value = "java";
+        }
+        else if (mode instanceof RubyMode) {
+            modeEl.value = "ruby";
+        }
         else {
             modeEl.value = "text";
         }
@@ -271,6 +289,10 @@ exports.launch = function(env) {
                     mode = "python";
                 } else if (/^.*\.php$/i.test(file.name)) {
                     mode = "php";
+                } else if (/^.*\.java$/i.test(file.name)) {
+                    mode = "java";
+                } else if (/^.*\.rb$/i.test(file.name)) {
+                    mode = "ruby";
                 }
 
                 env.editor.onTextInput(reader.result);

editor.html

@@ -19,6 +19,8 @@
           <option value="css">CSS Document</option>
           <option value="python">Python Document</option>
           <option value="php">PHP Document</option>
+          <option value="java">Java Document</option>
+          <option value="ruby">Ruby Document</option>
           <option value="plain">Text Document</option>
         </select>
       </td>
@@ -72,6 +74,8 @@
           <option value="css">CSS</option>
           <option value="python">Python</option>
           <option value="php">PHP</option>
+          <option value="java">Java</option>
+          <option value="ruby">Ruby</option>
         </select>
       </td>
       <td align="right">
@@ -136,6 +140,22 @@
 </body>
 </html></script>
 
+    <script type="text/editor" id="javatext">public class InfiniteLoop {
+        
+    /*
+     * This will cause the program to hang...
+     * 
+     * Taken from:
+     * http://www.exploringbinary.com/java-hangs-when-converting-2-2250738585072012e-308/
+     */
+    public static void main(String[] args) {
+        double d = Double.parseDouble("2.2250738585072012e-308");
+          
+        // unreachable code
+        System.out.println("Value: " + d);
+    }
+}</script>
+
     <script type="text/editor" id="pythontext">#!/usr/local/bin/python
 
 import string, sys
@@ -176,7 +196,7 @@ echo $output;
 
 ?></script>
 
-    <script type="text/editor" id="plaintext">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+  <script type="text/editor" id="plaintext">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
 
 Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
 
@@ -188,9 +208,24 @@ Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie co
 
 At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur
 </script>
+
+    <script type="text/editor" id="rubytext">#!/usr/bin/ruby
+    
+# Program to find the factorial of a number
+def fact(n)
+    if n == 0
+        1
+    else
+        n * fact(n-1)
+    end
+end
+
+puts fact(ARGV[0].to_i)
+</script>
+
   <input id="cockpitInput" type="text"/>
 
   <script src="demo/require.js" type="text/javascript" charset="utf-8"></script>
-  <script src="demo/boot.js" type="text/javascript"></script>  
+  <script src="demo/boot.js" type="text/javascript"></script>
 </body>
 </html>

lib/ace/edit_session.js

@@ -214,7 +214,7 @@ var EditSession = function(text, mode) {
      *  }
      */
     this.setAnnotations = function(annotations) {
-        this.$annotations = [];
+        this.$annotations = {};
         for (var i=0; i<annotations.length; i++) {
             var annotation = annotations[i];
             var row = annotation.row;
@@ -231,7 +231,7 @@ var EditSession = function(text, mode) {
     };
 
     this.clearAnnotations = function() {
-        this.$annotations = [];
+        this.$annotations = {};
         this._dispatchEvent("changeAnnotation", {});
     };
 

lib/ace/layer/gutter.js

@@ -72,12 +72,15 @@ var Gutter = function(parentEl) {
 
     this.setAnnotations = function(annotations) {
         // iterate over sparse array
-        this.$annotations = [];
+        this.$annotations = [];        
         for (var row in annotations) {
+            var rowAnnotations = annotations[row];
+            if (!rowAnnotations)
+                continue;
+                
             var rowInfo = this.$annotations[row] = {
                 text: []
             };
-            var rowAnnotations = annotations[row];
             for (var i=0; i<rowAnnotations.length; i++) {
                 var annotation = rowAnnotations[i];
                 rowInfo.text.push(annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&rsquo;").replace(/</, "&lt;"));

lib/ace/mode/java.js

@@ -0,0 +1,24 @@
+define(function(require, exports, module) {
+
+var oop = require("pilot/oop");
+var JavaScriptMode = require("ace/mode/javascript").Mode;
+var Tokenizer = require("ace/tokenizer").Tokenizer;
+var JavaHighlightRules = require("ace/mode/java_highlight_rules").JavaHighlightRules;
+var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new JavaHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+};
+oop.inherits(Mode, JavaScriptMode);
+
+(function() {
+    
+    this.createWorker = function(session) {
+        return null;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});

lib/ace/mode/java_highlight_rules.js

@@ -0,0 +1,134 @@
+define(function(require, exports, module) {
+
+var oop = require("pilot/oop");
+var lang = require("pilot/lang");
+var DocCommentHighlightRules = require("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
+
+JavaHighlightRules = function() {
+
+    var docComment = new DocCommentHighlightRules();
+
+    // taken from http://download.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
+    var keywords = lang.arrayToMap(
+	("abstract|continue|for|new|switch|" +
+	"assert|default|goto|package|synchronized" +
+	"boolean|do|if|private|this" +
+	"break|double|implements|protected|throw" +
+	"byte|else|import|public|throws" +
+	"case|enum|instanceof|return|transient" +
+	"catch|extends|int|short|try" +
+	"char|final|interface|static|void" +
+	"class|finally|long|strictfp|volatile|" +
+	"const|float|native|super|while").split("|")
+    );
+    
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+	        {
+	            token : "comment",
+	            regex : "\\/\\/.*$"
+	        },
+	        docComment.getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+	            token : "comment", // multi line comment
+	            regex : "\\/\\*\\*",
+	            next : "comment"
+	        }, {
+	            token : "string.regexp",
+	            regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+	        }, {
+	            token : "string", // single line
+	            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+	        }, {
+	            token : "string", // single line
+	            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+	        }, {
+	            token : "constant.numeric", // hex
+	            regex : "0[xX][0-9a-fA-F]+\\b"
+	        }, {
+	            token : "constant.numeric", // float
+	            regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+	        }, {
+	            token : "constant.language.boolean",
+	            regex : "(?:true|false)\\b"
+	        }, {
+	            token : function(value) {
+	                if (value == "this")
+	                    return "variable.language";
+	                else if (keywords[value])
+	                    return "keyword";
+	                else if (buildinConstants[value])
+	                    return "constant.language";
+	                else
+	                    return "identifier";
+	            },
+	            // TODO: Unicode escape sequences
+	            // TODO: Unicode identifiers
+	            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+	        }, {
+	            token : "keyword.operator",
+	            regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+	        }, {
+	            token : "lparen",
+	            regex : "[[({]"
+	        }, {
+	            token : "rparen",
+	            regex : "[\\])}]"
+	        }, {
+	            token : "text",
+	            regex : "\\s+"
+	        }
+        ],
+        "comment" : [
+	        {
+	            token : "comment", // closing comment
+	            regex : ".*?\\*\\/",
+	            next : "start"
+	        }, {
+	            token : "comment", // comment spanning whole line
+	            regex : ".+"
+	        }
+        ],
+        "qqstring" : [
+            {
+	            token : "string",
+	            regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+	            next : "start"
+	        }, {
+	            token : "string",
+	            regex : '.+'
+	        }
+        ],
+        "qstring" : [
+	        {
+	            token : "string",
+	            regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+	            next : "start"
+	        }, {
+	            token : "string",
+	            regex : '.+'
+	        }
+        ]
+    };
+
+    this.addRules(docComment.getRules(), "doc-");
+    this.$rules["doc-start"][0].next = "start";
+};
+
+oop.inherits(JavaHighlightRules, TextHighlightRules);
+
+exports.JavaHighlightRules = JavaHighlightRules;
+});

lib/ace/mode/javascript_worker.js

@@ -16,6 +16,7 @@ oop.inherits(JavaScriptWorker, Mirror);
     
     this.onUpdate = function() {
         var value = this.doc.getValue();
+        value = value.replace(/^#!.*\n/, "\n");
         
 //        var start = new Date();
         var parser = require("ace/narcissus/jsparse");

lib/ace/mode/ruby.js

@@ -0,0 +1,118 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define(function(require, exports, module) {
+
+var oop = require("pilot/oop");
+var TextMode = require("ace/mode/text").Mode;
+var Tokenizer = require("ace/tokenizer").Tokenizer;
+var RubyHighlightRules = require("ace/mode/ruby_highlight_rules").RubyHighlightRules;
+var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("ace/range").Range;
+var WorkerClient = require("ace/worker/worker_client").WorkerClient;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new RubyHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var outentedRows = [];
+        var re = /^(\s*)#/;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i).replace(re, "$1");
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = line.length + 2;
+                doc.replace(deleteRange, line);
+            }
+            return -2;
+        }
+        else {
+            return doc.indentRows(startRow, endRow, "#");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[]\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        return this.$outdent.autoOutdent(doc, row);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});

lib/ace/mode/ruby_highlight_rules.js

@@ -0,0 +1,148 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define(function(require, exports, module) {
+
+var oop = require("pilot/oop");
+var lang = require("pilot/lang");
+var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
+
+RubyHighlightRules = function() {
+
+    var builtinFunctions = lang.arrayToMap(
+        ("abort|Array|at_exit|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|eval|exec|exit|exit!" +
+        "fail|Float|fork|format|gets|global_variables|gsub|gsub!|Integer|lambda|load|local_variables|loop|open|p|print|" +
+        "printf|proc|putc|puts|raise|rand|readline|readlines|require|scan|select|set_trace_func|sleep|split|sprintf|srand|" +
+        "String|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|" +
+        "atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan").split("|")
+    );
+
+    var keywords = lang.arrayToMap(
+        ("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|" +
+        "if|in|__LINE__|module|next|not|or|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield").split("|")
+    );
+    
+    var buildinConstants = lang.arrayToMap(
+        ("true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING").split("|")
+    );
+
+    var builtinVariables = lang.arrayToMap(
+        ("\$DEBUG|\$defout|\$FILENAME|\$LOAD_PATH|\$SAFE|\$stdin|\$stdout|\$stderr|\$VERBOSE").split("|")
+    );
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+	        {
+	            token : "comment",
+	            regex : "#.*$"
+	        }, {
+                token : "comment", // multi line comment
+                regex : "^\=begin$",
+                next : "comment"
+            }, {
+	            token : "string.regexp",
+	            regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+	        }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+	        }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+	        }, {
+	            token : "constant.numeric", // hex
+	            regex : "0[xX][0-9a-fA-F]+\\b"
+	        }, {
+	            token : "constant.numeric", // float
+	            regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+	        }, {
+	            token : "constant.language.boolean",
+	            regex : "(?:true|false)\\b"
+	        }, {
+	            token : function(value) {
+	                if (value == "self")
+	                    return "variable.language";
+	                else if (keywords[value])
+	                    return "keyword";
+	                else if (buildinConstants[value])
+	                    return "constant.language";
+                    else if (builtinVariables[value])
+                        return "variable.language";
+                    else if (builtinFunctions[value])
+                        return "support.function";
+	                else if (value == "debugger")
+	                    return "invalid.deprecated";
+	                else
+	                    return "identifier";
+	            },
+	            // TODO: Unicode escape sequences
+	            // TODO: Unicode identifiers
+	            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+	        }, {
+	            token : "keyword.operator",
+	            regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+	        }, {
+	            token : "lparen",
+	            regex : "[[({]"
+	        }, {
+	            token : "rparen",
+	            regex : "[\\])}]"
+	        }, {
+	            token : "text",
+	            regex : "\\s+"
+	        }
+        ],
+        "comment" : [
+	        {
+                token : "comment", // closing comment
+                regex : "^\=end$",
+                next : "start"
+            }, {
+	            token : "comment", // comment spanning whole line
+	            regex : ".+"
+	        }
+        ]
+    };
+};
+
+oop.inherits(RubyHighlightRules, TextHighlightRules);
+
+exports.RubyHighlightRules = RubyHighlightRules;
+});

lib/ace/worker/worker.js

@@ -19,23 +19,24 @@ var require = function(id) {
     
     var chunks = id.split("/");
     chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    path = require.baseUrl + "/" + chunks.join("/") + ".js"
+    path = /*require.baseUrl + "/" +*/ chunks.join("/") + ".js";
     
     require.id = id;
+//    console.log("require " +  path + " " + id)
     importScripts(path);
     return require(id);    
 };
 
 require.modules = {};
 require.tlns = {};
-require.baseUrl;
+require.baseUrl = "";
 
 var define = function(id, factory) {
     if (!factory) {
         factory = id;
         id = require.id;
     }
-    if (id.indexOf("text!") == 0) 
+    if (id.indexOf("text!") === 0) 
         return;
     
     require.modules[id] = {
@@ -73,7 +74,7 @@ function initSender() {
                 id: callbackId,
                 data: data
             });
-        },
+        };
     
         this.emit = function(name, data) {
             postMessage({
@@ -81,7 +82,8 @@ function initSender() {
                 name: name,
                 data: data
             });
-        }
+        };
+        
     }).call(Sender.prototype);
     
     return new Sender();
@@ -92,15 +94,17 @@ var sender;
 
 onmessage = function(e) {
     var msg = e.data;
-    if (msg.command)
+    if (msg.command) {
         main[msg.command].apply(main, msg.args);
+    }
     else if (msg.init) {        
         initBaseUrls(msg.base, msg.tlns);
         require("pilot/fixoldbrowsers");
         sender = initSender();
         var clazz = require(msg.module)[msg.classname];
         main = new clazz(sender);
-    } else if (msg.event) {
+    } 
+    else if (msg.event) {
         sender._dispatchEvent(msg.event, msg.data);
     }
 };

lib/ace/worker/worker_client.js

@@ -42,6 +42,7 @@ var WorkerClient = function(baseUrl, topLevelNamespaces, packagedJs, module, cla
 
     var _self = this;
     this.$worker.onerror = function(e) {
+        console.log(e);
         throw e;
     };
     this.$worker.onmessage = function(e) {

support/pilot

@@ -1 +1 @@
-Subproject commit 67a380309e5b139a9603334ad9d9f917659f04bc
+Subproject commit c0cab19cbb5d44df98bae0060c782a6f30464afe