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

ChangeLog.txt

@@ -1,4 +1,4 @@
-2011.02.xx, Version 0.1.4
+2011.02.08, Version 0.1.5
 
 * Add Coffeescript Mode (Satoshi Murakami)
 * Fix word wrap bug (Julian Viereck)

Makefile.dryice.js

@@ -121,7 +121,7 @@ copy({
 
 console.log('# cockpit ---------');
 
-project.assmeAllFilesLoaded();
+project.assumeAllFilesLoaded();
 project.addRoot(aceHome + '/support/cockpit/lib');
 
 var cockpit = copy.createDataObject();
@@ -167,17 +167,17 @@ copy({
 
 
 // create modes
-project.assmeAllFilesLoaded();
-
-["css", "html", "javascript", "php", "python", "xml", "ruby", "java", "c_cpp"].forEach(function(mode) {
+project.assumeAllFilesLoaded();
+["css", "html", "javascript", "php", "python", "xml", "ruby", "java", "c_cpp", "coffee"].forEach(function(mode) {
+    console.log("mode " + mode);
     copy({
         source: [
             copy.source.commonjs({
-                project: project,
+                project: project.clone(),
                 require: [ 'ace/mode/' + mode ]
             })
         ],
-        filter: [ copy.filter.moduleDefines, copy.filter.uglifyjs ],
+        filter: [ copy.filter.debug, copy.filter.moduleDefines, copy.filter.uglifyjs ],
         dest: "build/src/mode-" + mode + ".js"
     });
 });
@@ -253,12 +253,12 @@ copy({
 });
 
 // copy key bindings
+project.assumeAllFilesLoaded();
 ["vim", "emacs"].forEach(function(keybinding) {
-    project.assmeAllFilesLoaded();
     copy({
         source: [
             copy.source.commonjs({
-                project: project,
+                project: project.clone(),
                 require: [ 'ace/keyboard/keybinding/' + keybinding ]
             })
         ],

build/ChangeLog.md

@@ -1,19 +0,0 @@
-2011.02.xx, Version 0.1.4
-
-* Fix packaged version of the Eclipse mode
-* Loading of workers is more robust
-* Fix "click selection"
-
-2011.02.04, Version 0.1.4
-
-* Add C/C++ mode contributed by Gastón Kleiman
-* Fix word wrap bug
-* Fix exception in key input
-
-2011.02.04, Version 0.1.3
-
-* Let the packaged version play nice with requireJS
-* Add Ruby mode contributed by Shlomo Zalman Heigh
-* Add Java mode contributed by Tom Tasche
-* Fix annotation bug
-* Changing a document added a new empty line at the end

build/ChangeLog.txt

@@ -1,13 +1,16 @@
-2011.02.xx, Version 0.1.4
+2011.02.08, Version 0.1.5
 
+* Add Coffeescript Mode (Satoshi Murakami)
+* Fix word wrap bug (Julian Viereck)
 * Fix packaged version of the Eclipse mode
 * Loading of workers is more robust
 * Fix "click selection"
+* Allow tokizing empty lines (Daniel Krech)
+* Make PageUp/Down behavior more consistent with native OS (Joe Cheng)
 
 2011.02.04, Version 0.1.4
 
 * Add C/C++ mode contributed by Gastón Kleiman
-* Fix word wrap bug
 * Fix exception in key input
 
 2011.02.04, Version 0.1.3

build/src/ace-uncompressed.js

@@ -6123,12 +6123,14 @@ exports.bindings = {
     "gotoright": "Right",
     "selectpagedown": "Shift-PageDown",
     "pagedown": "PageDown",
+    "gotopagedown": "Option-PageDown",
     "selectpageup": "Shift-PageUp",
     "pageup": "PageUp",
+    "gotopageup": "Option-PageUp",
     "selectlinestart": "Shift-Home",
     "selectlineend": "Shift-End",
     "del": "Delete",
-    "backspace": "Ctrl-Backspace|Command-Backspace|Option-Backspace|Backspace",
+    "backspace": "Ctrl-Backspace|Command-Backspace|Option-Backspace|Shift-Backspace|Backspace",
     "outdent": "Shift-Tab",
     "indent": "Tab"
 };
@@ -6209,13 +6211,13 @@ exports.bindings = {
     "selectright": "Shift-Right",
     "gotoright": "Right",
     "selectpagedown": "Shift-PageDown",
-    "pagedown": "PageDown",
+    "gotopagedown": "PageDown",
     "selectpageup": "Shift-PageUp",
-    "pageup": "PageUp",
+    "gotopageup": "PageUp",
     "selectlinestart": "Shift-Home",
     "selectlineend": "Shift-End",
     "del": "Delete",
-    "backspace": "Backspace",
+    "backspace": "Ctrl-Backspace|Command-Backspace|Option-Backspace|Shift-Backspace|Backspace",
     "outdent": "Shift-Tab",
     "indent": "Tab"
 };
@@ -6779,7 +6781,7 @@ var EditSession = function(text, mode) {
 
         if (window.Worker)
             this.$worker = mode.createWorker(this);
-        else 
+        else
             this.$worker = null;
 
         this.$mode = mode;
@@ -7130,8 +7132,18 @@ var EditSession = function(text, mode) {
     this.setUseWrapMode = function(useWrapMode) {
         if (useWrapMode != this.$useWrapMode) {
             this.$useWrapMode = useWrapMode;
-            this.$updateWrapData(0, this.getLength() - 1);
             this.$modified = true;
+
+            // If wrapMode is activaed, the wrapData array has to be initialized.
+            if (useWrapMode) {
+                var len = this.getLength();
+                this.$wrapMode = [];
+                for (i = 0; i < len; i++) {
+                    this.$wrapData.push([]);
+                }
+                this.$updateWrapData(0, len - 1);
+            }
+
             this._dispatchEvent("changeWrapMode");
         }
     };
@@ -7143,7 +7155,9 @@ var EditSession = function(text, mode) {
     this.setWrapLimit = function(wrapLimit) {
         if (wrapLimit != this.$wrapLimit) {
             this.$wrapLimit = wrapLimit;
-            this.$updateWrapData(0, this.getLength() - 1);
+            if (this.$useWrapMode) {
+                this.$updateWrapData(0, this.getLength() - 1);
+            }
             this._dispatchEvent("changeWrapMode");
         }
     };
@@ -7157,20 +7171,23 @@ var EditSession = function(text, mode) {
             return;
         }
 
+        var len;
         var action = e.data.action;
         var firstRow = e.data.range.start.row,
             lastRow = e.data.range.end.row;
 
         if (action.indexOf("Lines") != -1) {
             if (action == "insertLines") {
-                lastRow = firstRow + e.data.lines.length;
+                lastRow = firstRow + (e.data.lines.length);
             } else {
-                firstRow = lastRow - e.data.lines.length;
+                lastRow = firstRow;
             }
+            len = e.data.lines.length;
+        } else {
+            len = lastRow - firstRow;
         }
 
-        if (firstRow != lastRow) {
-            var len = lastRow - firstRow;
+        if (len != 0) {
             if (action.indexOf("remove") != -1) {
                 this.$wrapData.splice(firstRow, len);
                 lastRow = firstRow;
@@ -7181,6 +7198,10 @@ var EditSession = function(text, mode) {
             }
         }
 
+        if (this.$wrapData.length != this.doc.$lines.length) {
+            console.error("The length of doc.$lines and $wrapData have to be the same!");
+        }
+
         this.$updateWrapData(firstRow, lastRow);
     };
 
@@ -7190,9 +7211,6 @@ var EditSession = function(text, mode) {
         var wrapData = this.$wrapData;
         var wrapLimit = this.$wrapLimit;
 
-        // Remove lines that are no longer there.
-        wrapData.splice(lines.length, wrapData.length - lines.length);
-
         for (var row = firstRow; row <= lastRow; row++) {
             wrapData[row] =
                 this.$computeWrapSplits(lines[row], wrapLimit, tabSize);
@@ -7539,7 +7557,7 @@ var EditSession = function(text, mode) {
         if (docRow > wrapData.length - 1) {
             return [
                 this.getScreenLength(),
-                wrapData[wrapData.length - 1].length - 1
+                wrapData.length == 0 ? 0 : (wrapData[wrapData.length - 1].length - 1)
             ];
         }
 
@@ -8418,11 +8436,12 @@ var Tokenizer = function(rules) {
             var type = "text";
             var value = match[0];
 
-            if (re.lastIndex == lastIndex) { throw new Error("tokenizer error"); }
-            lastIndex = re.lastIndex;
+            if (re.lastIndex == lastIndex) {
+                throw new Error("tokenizer error before line: '" + line + "'");
+            }
 
             for ( var i = 0; i < state.length; i++) {
-                if (match[i + 1]) {
+                if (match[i + 1] !== undefined) {
                     if (typeof state[i].token == "function") {
                         type = state[i].token(match[0]);
                     }
@@ -8454,6 +8473,12 @@ var Tokenizer = function(rules) {
             } else {
                 token.value += value;
             }
+            
+            if (lastIndex == line.length) {
+		        break;
+	        }
+            
+	        lastIndex = re.lastIndex;
         };
 
         if (token.type) {
@@ -8595,6 +8620,11 @@ var Document = function(text) {
 
     if (Array.isArray(text)) {
         this.insertLines(0, text);
+    }
+    // There has to be one line at least in the document. If you pass an empty
+    // string to the insert function, nothing will happen. Workaround.
+    else if (text.length == 0) {
+        this.$lines = [""];
     } else {
         this.insert({row: 0, column:0}, text);
     }
@@ -8606,7 +8636,7 @@ var Document = function(text) {
 
     this.setValue = function(text) {
         var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));        
+        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
         this.insert({row: 0, column:0}, text);
     };
   	
@@ -8811,16 +8841,16 @@ var Document = function(text) {
         var firstRow = range.start.row;
         var lastRow = range.end.row;
 
-        if (range.isMultiLine()) {            
+        if (range.isMultiLine()) {
             var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
             var lastFullRow = lastRow - 1;
-            
+
             if (range.end.column > 0)
                 this.removeInLine(lastRow, 0, range.end.column);
-                
+
             if (lastFullRow >= firstFullRow)
                 this.removeLines(firstFullRow, lastFullRow);
-                
+
             if (firstFullRow != firstRow) {
                 this.removeInLine(firstRow, range.start.column, this.$lines[firstRow].length);
                 this.removeNewLine(range.start.row);

build/src/keybinding-emacs.js

@@ -1 +1 @@
-define("ace/keyboard/keybinding/emacs",function(a,b,c){var d=a("ace/keyboard/state_handler").StateHandler,e=a("ace/keyboard/state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]*))*","(down|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(right|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(up|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(left|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]*))","([^0-9]+)*"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9]*)*","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)})
+define("ace/keyboard/keybinding/emacs",function(a,b,c){var d=a("ace/keyboard/state_handler").StateHandler,e=a("ace/keyboard/state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]*))*","(down|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(right|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(up|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(left|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]*))","([^0-9]+)*"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9]*)*","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)}),define("ace/keyboard/state_handler",function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(state in a)this.$buildBindingsRegex(a[state]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?(a.key=new RegExp("^"+a.regex[1]+"$"),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var d=[];b&1&&d.push("ctrl"),b&8&&d.push("command"),b&2&&d.push("option"),b&4&&d.push("shift"),c&&d.push(c);var e=d.join("-"),f=a.buffer+e;b!=2&&(a.buffer=f);return{bufferToUse:f,symbolicName:e}},$find:function(a,b,c,e,f){var g={};this.keymapping[a.state].some(function(h){var i;if(h.key&&!h.key.test(c))return!1;if(h.regex&&!(i=h.regex.exec(b)))return!1;if(h.match&&!h.match(b,e,f,c))return!1;if(h.disallowMatches)for(var j=0;j<h.disallowMatches.length;j++)if(!!i[h.disallowMatches[j]])return!1;if(h.exec){g.command=h.exec;if(h.params){var k;g.args={},h.params.forEach(function(a){a.match!=null&&i!=null?k=i[a.match]||a.defaultValue:k=a.defaultValue,a.type==="number"&&(k=parseInt(k)),g.args[a.name]=k})}a.buffer=""}h.then&&(a.state=h.then,a.buffer=""),g.command==null&&(g.command="null"),d&&console.log("KeyboardStateMapper#find",h);return!0});if(g.command)return g;a.buffer="";return!1},handleKeyboard:function(a,b,c){if(b!=0&&(c==""||c==String.fromCharCode(0)))return null;var e=this.$composeBuffer(a,b,c),f=e.bufferToUse,g=e.symbolicName;e=this.$find(a,f,g,b,c),d&&console.log("KeyboardStateMapper#match",f,g,e);return e}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})

build/src/mode-coffee.js

@@ -0,0 +1 @@
+define("ace/mode/coffee",function(a,b,c){function h(){this.$tokenizer=new d((new e).getRules()),this.$outdent=new f}var d=a("ace/tokenizer").Tokenizer,e=a("ace/mode/coffee_highlight_rules").CoffeeHighlightRules,f=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,g=a("ace/range").Range;a("pilot/oop").inherits(h,a("ace/mode/text").Mode);var i=h.prototype,j=/(?:[({[=:]|[-=]>|\b(?:else|switch|try|catch(?:\s*[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)?|finally))\s*$/,k=/^(\s*)#/,l=/^\s*###(?!#)/,m=/^\s*/;i.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;(!e.length||e[e.length-1].type!=="comment")&&a==="start"&&j.test(b)&&(d+=c);return d},i.toggleCommentLines=function(a,b,c,d){var e,f=new g(0,0,0,0);for(var h=c;h<=d;++h){var i=b.getLine(h);if(l.test(i))continue;i=(e=k.test(i))?i.replace(k,"$1"):i.replace(m,"$&#"),f.end.row=f.start.row=h,f.end.column=i.length+1,b.replace(f,i)}return 1-e*2},i.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},i.autoOutdent=function(a,b,c){return this.$outdent.autoOutdent(b,c)},b.Mode=h}),define("ace/mode/coffee_highlight_rules",function(a,b,c){function d(){var a="[$A-Za-z_\\x7f-\\uffff][$\\w\\x7f-\\uffff]*",b="(?![$\\w]|\\s*:)",c={token:"string",regex:".+"};this.$rules={start:[{token:"identifier",regex:"(?:@|(?:\\.|::)\\s*)"+a},{token:"keyword",regex:"(?:t(?:h(?:is|row|en)|ry|ypeof)|s(?:uper|witch)|return|b(?:reak|y)|c(?:ontinue|atch|lass)|i(?:n(?:stanceof)?|s(?:nt)?|f)|e(?:lse|xtends)|f(?:or (?:own)?|inally|unction)|wh(?:ile|en)|n(?:ew|ot?)|d(?:e(?:lete|bugger)|o)|loop|o(?:ff?|[rn])|un(?:less|til)|and|yes)"+b},{token:"constant.language",regex:"(?:true|false|null|undefined)"+b},{token:"invalid.illegal",regex:"(?:c(?:ase|onst)|default|function|v(?:ar|oid)|with|e(?:num|xport)|i(?:mplements|nterface)|let|p(?:ackage|r(?:ivate|otected)|ublic)|static|yield|__(?:hasProp|extends|slice|bind|indexOf))"+b},{token:"language.support.class",regex:"(?:Array|Boolean|Date|Function|Number|Object|R(?:e(?:gExp|ferenceError)|angeError)|S(?:tring|yntaxError)|E(?:rror|valError)|TypeError|URIError)"+b},{token:"language.support.function",regex:"(?:Math|JSON|is(?:NaN|Finite)|parse(?:Int|Float)|encodeURI(?:Component)?|decodeURI(?:Component)?)"+b},{token:"identifier",regex:a},{token:"constant.numeric",regex:"(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)"},{token:"string",regex:"'''",next:"qdoc"},{token:"string",regex:'"""',next:"qqdoc"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"string",regex:"`",next:"js"},{token:"string.regex",regex:"///",next:"heregex"},{token:"string.regex",regex:"/(?!\\s)[^[/\\n\\\\]*(?: (?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[/\\n\\\\]*)*/[imgy]{0,4}(?!\\w)"},{token:"comment",regex:"###(?!#)",next:"comment"},{token:"comment",regex:"#.*"},{token:"lparen",regex:"[({[]"},{token:"rparen",regex:"[\\]})]"},{token:"keyword.operator",regex:"\\S+"},{token:"text",regex:"\\s+"}],qdoc:[{token:"string",regex:".*?'''",next:"start"},c],qqdoc:[{token:"string",regex:'.*?"""',next:"start"},c],qstring:[{token:"string",regex:"[^\\\\']*(?:\\\\.[^\\\\']*)*'",next:"start"},c],qqstring:[{token:"string",regex:'[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',next:"start"},c],js:[{token:"string",regex:"[^\\\\`]*(?:\\\\.[^\\\\`]*)*`",next:"start"},c],heregex:[{token:"string.regex",regex:".*?///[imgy]{0,4}",next:"start"},{token:"comment.regex",regex:"\\s+(?:#.*)?"},{token:"string.regex",regex:"\\S+"}],comment:[{token:"comment",regex:".*?###",next:"start"},{token:"comment",regex:".+"}]}}a("pilot/oop").inherits(d,a("ace/mode/text_highlight_rules").TextHighlightRules),b.CoffeeHighlightRules=d})

editor.html

@@ -245,26 +245,25 @@ int main ()
 <script type="text/editor" id="coffeetext">#!/usr/bin/env coffee
 
 try
-  throw URIError decodeURI(0xC0ffee * 123456.7e-8 / .9)
+    throw URIError decodeURI(0xC0ffee * 123456.7e-8 / .9)
 catch e
-  console.log 'qstring' + "qqstring" + '''
-    qdoc
-  ''' + """
-    qqdoc
-  """
+    console.log 'qstring' + "qqstring" + '''
+        qdoc
+    ''' + """
+        qqdoc
+    """
 
 do ->
-  ###
-  herecomment
-  ###
-  re = /regex/imgy.test ///
-    heregex  # comment
-  ///imgy
-  this isnt: `just JavaScript`
-  undefined
+    ###
+    herecomment
+    ###
+    re = /regex/imgy.test ///
+        heregex  # comment
+    ///imgy
+    this isnt: `just JavaScript`
+    undefined
 
-var illegal
-</script>
+var illegal</script>
 
   <input id="cockpitInput" type="text"/>
 

lib/ace/mode/python.js

@@ -20,6 +20,7 @@
 *
 * Contributor(s):
 *      Fabian Jakobs <fabian AT ajax DOT org>
+*      Colin Gourlay <colin DOT j DOT gourlay 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

lib/ace/mode/python_highlight_rules.js

@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Colin Gourlay <colin DOT j DOT gourlay 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

package.json

@@ -1,7 +1,7 @@
 {
     "name": "ace",
     "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "homepage" : "http://github.com/ajaxorg/ace",
     "engines": {"node": ">= 0.2.0"},
     "author": "Fabian Jakobs <fabian@ajax.org>",
@@ -28,7 +28,7 @@
         "asyncjs": ">=0.0.2",
         "jsdom": ">=0.1.23",
         "htmlparser": ">=1.7.2",
-        "dryice": ">=0.2.1"
+        "dryice": ">=0.2.2"
     },
     "licenses": [{
         "type": "MPL",

support/pilot

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