gollum 2.4.4 → 2.4.5

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/mode/coffee/parser_test.js

@@ -1,37 +1,30 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ * Distributed under the BSD license:
  *
- * 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>
- *
- * 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.
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/mode/coffee/rewriter.js

@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 2011 Jeremy Ashkenas
+/**
+ * Copyright (c) 2009-2012 Jeremy Ashkenas
  * 
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -24,7 +24,7 @@
  */
 
 define(function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
+// Generated by CoffeeScript 1.3.3
 
   var BALANCED_PAIRS, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, IMPLICIT_BLOCK, IMPLICIT_CALL, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INVERSES, LINEBREAKS, SINGLE_CLOSERS, SINGLE_LINERS, left, rite, _i, _len, _ref,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
@@ -32,8 +32,6 @@ define(function(require, exports, module) {
 
   exports.Rewriter = (function() {
 
-    Rewriter.name = 'Rewriter';
-
     function Rewriter() {}
 
     Rewriter.prototype.rewrite = function(tokens) {
@@ -67,7 +65,9 @@ define(function(require, exports, module) {
         if (levels === 0 && condition.call(this, token, i)) {
           return action.call(this, token, i);
         }
-        if (!token || levels < 0) return action.call(this, token, i - 1);
+        if (!token || levels < 0) {
+          return action.call(this, token, i - 1);
+        }
         if (_ref = token[0], __indexOf.call(EXPRESSION_START, _ref) >= 0) {
           levels += 1;
         } else if (_ref1 = token[0], __indexOf.call(EXPRESSION_END, _ref1) >= 0) {
@@ -83,9 +83,13 @@ define(function(require, exports, module) {
       _ref = this.tokens;
       for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) {
         tag = _ref[i][0];
-        if (tag !== 'TERMINATOR') break;
+        if (tag !== 'TERMINATOR') {
+          break;
+        }
+      }
+      if (i) {
+        return this.tokens.splice(0, i);
       }
-      if (i) return this.tokens.splice(0, i);
     };
 
     Rewriter.prototype.removeMidExpressionNewlines = function() {
@@ -109,7 +113,9 @@ define(function(require, exports, module) {
         return this.tokens[token[0] === 'OUTDENT' ? i - 1 : i][0] = 'CALL_END';
       };
       return this.scanTokens(function(token, i) {
-        if (token[0] === 'CALL_START') this.detectEnd(i + 1, condition, action);
+        if (token[0] === 'CALL_START') {
+          this.detectEnd(i + 1, condition, action);
+        }
         return 1;
       });
     };
@@ -124,25 +130,32 @@ define(function(require, exports, module) {
         return token[0] = 'INDEX_END';
       };
       return this.scanTokens(function(token, i) {
-        if (token[0] === 'INDEX_START') this.detectEnd(i + 1, condition, action);
+        if (token[0] === 'INDEX_START') {
+          this.detectEnd(i + 1, condition, action);
+        }
         return 1;
       });
     };
 
     Rewriter.prototype.addImplicitBraces = function() {
-      var action, condition, sameLine, stack, start, startIndent, startsLine;
+      var action, condition, sameLine, stack, start, startIndent, startIndex, startsLine;
       stack = [];
       start = null;
       startsLine = null;
       sameLine = true;
       startIndent = 0;
+      startIndex = 0;
       condition = function(token, i) {
         var one, tag, three, two, _ref, _ref1;
-        _ref = this.tokens.slice(i + 1, (i + 3) + 1 || 9e9), one = _ref[0], two = _ref[1], three = _ref[2];
-        if ('HERECOMMENT' === (one != null ? one[0] : void 0)) return false;
+        _ref = this.tokens.slice(i + 1, +(i + 3) + 1 || 9e9), one = _ref[0], two = _ref[1], three = _ref[2];
+        if ('HERECOMMENT' === (one != null ? one[0] : void 0)) {
+          return false;
+        }
         tag = token[0];
-        if (__indexOf.call(LINEBREAKS, tag) >= 0) sameLine = false;
-        return (((tag === 'TERMINATOR' || tag === 'OUTDENT') || (__indexOf.call(IMPLICIT_END, tag) >= 0 && sameLine)) && ((!startsLine && this.tag(i - 1) !== ',') || !((two != null ? two[0] : void 0) === ':' || (one != null ? one[0] : void 0) === '@' && (three != null ? three[0] : void 0) === ':'))) || (tag === ',' && one && ((_ref1 = one[0]) !== 'IDENTIFIER' && _ref1 !== 'NUMBER' && _ref1 !== 'STRING' && _ref1 !== '@' && _ref1 !== 'TERMINATOR' && _ref1 !== 'OUTDENT'));
+        if (__indexOf.call(LINEBREAKS, tag) >= 0) {
+          sameLine = false;
+        }
+        return (((tag === 'TERMINATOR' || tag === 'OUTDENT') || (__indexOf.call(IMPLICIT_END, tag) >= 0 && sameLine && !(i - startIndex === 1))) && ((!startsLine && this.tag(i - 1) !== ',') || !((two != null ? two[0] : void 0) === ':' || (one != null ? one[0] : void 0) === '@' && (three != null ? three[0] : void 0) === ':'))) || (tag === ',' && one && ((_ref1 = one[0]) !== 'IDENTIFIER' && _ref1 !== 'NUMBER' && _ref1 !== 'STRING' && _ref1 !== '@' && _ref1 !== 'TERMINATOR' && _ref1 !== 'OUTDENT'));
       };
       action = function(token, i) {
         var tok;
@@ -163,6 +176,7 @@ define(function(require, exports, module) {
           return 1;
         }
         sameLine = true;
+        startIndex = i + 1;
         stack.push(['{']);
         idx = ago === '@' ? i - 2 : i - 1;
         while (this.tag(idx - 2) === 'HERECOMMENT') {
@@ -185,7 +199,9 @@ define(function(require, exports, module) {
       condition = function(token, i) {
         var post, tag, _ref, _ref1;
         tag = token[0];
-        if (!seenSingle && token.fromThen) return true;
+        if (!seenSingle && token.fromThen) {
+          return true;
+        }
         if (tag === 'IF' || tag === 'ELSE' || tag === 'CATCH' || tag === '->' || tag === '=>' || tag === 'CLASS') {
           seenSingle = true;
         }
@@ -206,19 +222,27 @@ define(function(require, exports, module) {
         if (tag === 'CLASS' || tag === 'IF' || tag === 'FOR' || tag === 'WHILE') {
           noCall = true;
         }
-        _ref = tokens.slice(i - 1, (i + 1) + 1 || 9e9), prev = _ref[0], current = _ref[1], next = _ref[2];
+        _ref = tokens.slice(i - 1, +(i + 1) + 1 || 9e9), prev = _ref[0], current = _ref[1], next = _ref[2];
         callObject = !noCall && tag === 'INDENT' && next && next.generated && next[0] === '{' && prev && (_ref1 = prev[0], __indexOf.call(IMPLICIT_FUNC, _ref1) >= 0);
         seenSingle = false;
         seenControl = false;
-        if (__indexOf.call(LINEBREAKS, tag) >= 0) noCall = false;
-        if (prev && !prev.spaced && tag === '?') token.call = true;
-        if (token.fromThen) return 1;
+        if (__indexOf.call(LINEBREAKS, tag) >= 0) {
+          noCall = false;
+        }
+        if (prev && !prev.spaced && tag === '?') {
+          token.call = true;
+        }
+        if (token.fromThen) {
+          return 1;
+        }
         if (!(callObject || (prev != null ? prev.spaced : void 0) && (prev.call || (_ref2 = prev[0], __indexOf.call(IMPLICIT_FUNC, _ref2) >= 0)) && (__indexOf.call(IMPLICIT_CALL, tag) >= 0 || !(token.spaced || token.newLine) && __indexOf.call(IMPLICIT_UNSPACED_CALL, tag) >= 0))) {
           return 1;
         }
         tokens.splice(i, 0, this.generate('CALL_START', '(', token[2]));
         this.detectEnd(i + 1, condition, action);
-        if (prev[0] === '?') prev[0] = 'FUNC_EXIST';
+        if (prev[0] === '?') {
+          prev[0] = 'FUNC_EXIST';
+        }
         return 2;
       });
     };
@@ -251,10 +275,14 @@ define(function(require, exports, module) {
         if (__indexOf.call(SINGLE_LINERS, tag) >= 0 && this.tag(i + 1) !== 'INDENT' && !(tag === 'ELSE' && this.tag(i + 1) === 'IF')) {
           starter = tag;
           _ref1 = this.indentation(token, true), indent = _ref1[0], outdent = _ref1[1];
-          if (starter === 'THEN') indent.fromThen = true;
+          if (starter === 'THEN') {
+            indent.fromThen = true;
+          }
           tokens.splice(i + 1, 0, indent);
           this.detectEnd(i + 2, condition, action);
-          if (tag === 'THEN') tokens.splice(i, 1);
+          if (tag === 'THEN') {
+            tokens.splice(i, 1);
+          }
           return 1;
         }
         return 1;
@@ -274,7 +302,9 @@ define(function(require, exports, module) {
         }
       };
       return this.scanTokens(function(token, i) {
-        if (token[0] !== 'IF') return 1;
+        if (token[0] !== 'IF') {
+          return 1;
+        }
         original = token;
         this.detectEnd(i + 1, condition, action);
         return 1;
@@ -283,10 +313,14 @@ define(function(require, exports, module) {
 
     Rewriter.prototype.indentation = function(token, implicit) {
       var indent, outdent;
-      if (implicit == null) implicit = false;
+      if (implicit == null) {
+        implicit = false;
+      }
       indent = ['INDENT', 2, token[2]];
       outdent = ['OUTDENT', 2, token[2]];
-      if (implicit) indent.generated = outdent.generated = true;
+      if (implicit) {
+        indent.generated = outdent.generated = true;
+      }
       return [indent, outdent];
     };
 
@@ -324,7 +358,7 @@ define(function(require, exports, module) {
 
   IMPLICIT_FUNC = ['IDENTIFIER', 'SUPER', ')', 'CALL_END', ']', 'INDEX_END', '@', 'THIS'];
 
-  IMPLICIT_CALL = ['IDENTIFIER', 'NUMBER', 'STRING', 'JS', 'REGEX', 'NEW', 'PARAM_START', 'CLASS', 'IF', 'TRY', 'SWITCH', 'THIS', 'BOOL', 'UNARY', 'SUPER', '@', '->', '=>', '[', '(', '{', '--', '++'];
+  IMPLICIT_CALL = ['IDENTIFIER', 'NUMBER', 'STRING', 'JS', 'REGEX', 'NEW', 'PARAM_START', 'CLASS', 'IF', 'TRY', 'SWITCH', 'THIS', 'BOOL', 'NULL', 'UNDEFINED', 'UNARY', 'SUPER', '@', '->', '=>', '[', '(', '{', '--', '++'];
 
   IMPLICIT_UNSPACED_CALL = ['+', '-'];
 
@@ -339,4 +373,4 @@ define(function(require, exports, module) {
   LINEBREAKS = ['TERMINATOR', 'INDENT', 'OUTDENT'];
 
 
-});
+});

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/mode/coffee/scope.js

@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 2011 Jeremy Ashkenas
+/**
+ * Copyright (c) 2009-2012 Jeremy Ashkenas
  * 
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -24,7 +24,7 @@
  */
 
 define(function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
+// Generated by CoffeeScript 1.3.3
 
   var Scope, extend, last, _ref;
 
@@ -32,8 +32,6 @@ define(function(require, exports, module) {
 
   exports.Scope = Scope = (function() {
 
-    Scope.name = 'Scope';
-
     Scope.root = null;
 
     function Scope(parent, expressions, method) {
@@ -47,11 +45,15 @@ define(function(require, exports, module) {
         }
       ];
       this.positions = {};
-      if (!this.parent) Scope.root = this;
+      if (!this.parent) {
+        Scope.root = this;
+      }
     }
 
     Scope.prototype.add = function(name, type, immediate) {
-      if (this.shared && !immediate) return this.parent.add(name, type, immediate);
+      if (this.shared && !immediate) {
+        return this.parent.add(name, type, immediate);
+      }
       if (Object.prototype.hasOwnProperty.call(this.positions, name)) {
         return this.variables[this.positions[name]].type = type;
       } else {
@@ -62,22 +64,31 @@ define(function(require, exports, module) {
       }
     };
 
-    Scope.prototype.find = function(name, options) {
-      if (this.check(name, options)) return true;
+    Scope.prototype.namedMethod = function() {
+      if (this.method.name || !this.parent) {
+        return this.method;
+      }
+      return this.parent.namedMethod();
+    };
+
+    Scope.prototype.find = function(name) {
+      if (this.check(name)) {
+        return true;
+      }
       this.add(name, 'var');
       return false;
     };
 
     Scope.prototype.parameter = function(name) {
-      if (this.shared && this.parent.check(name, true)) return;
+      if (this.shared && this.parent.check(name, true)) {
+        return;
+      }
       return this.add(name, 'param');
     };
 
-    Scope.prototype.check = function(name, immediate) {
-      var found, _ref1;
-      found = !!this.type(name);
-      if (found || immediate) return found;
-      return !!((_ref1 = this.parent) != null ? _ref1.check(name) : void 0);
+    Scope.prototype.check = function(name) {
+      var _ref1;
+      return !!(this.type(name) || ((_ref1 = this.parent) != null ? _ref1.check(name) : void 0));
     };
 
     Scope.prototype.temporary = function(name, index) {
@@ -93,19 +104,25 @@ define(function(require, exports, module) {
       _ref1 = this.variables;
       for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
         v = _ref1[_i];
-        if (v.name === name) return v.type;
+        if (v.name === name) {
+          return v.type;
+        }
       }
       return null;
     };
 
     Scope.prototype.freeVariable = function(name, reserve) {
       var index, temp;
-      if (reserve == null) reserve = true;
+      if (reserve == null) {
+        reserve = true;
+      }
       index = 0;
       while (this.check((temp = this.temporary(name, index)))) {
         index++;
       }
-      if (reserve) this.add(temp, 'var', true);
+      if (reserve) {
+        this.add(temp, 'var', true);
+      }
       return temp;
     };
 
@@ -141,7 +158,9 @@ define(function(require, exports, module) {
       _results = [];
       for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
         v = _ref1[_i];
-        if (v.type.assigned) _results.push("" + v.name + " = " + v.type.value);
+        if (v.type.assigned) {
+          _results.push("" + v.name + " = " + v.type.value);
+        }
       }
       return _results;
     };
@@ -151,4 +170,4 @@ define(function(require, exports, module) {
   })();
 
 
-});
+});

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/mode/coffee_highlight_rules.js

@@ -1,47 +1,39 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ * Distributed under the BSD license:
  *
- * 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):
- *      Satoshi Murakami <murky.satyr 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.
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
 define(function(require, exports, module) {
 "use strict";
 
-    var lang = require("../lib/lang");
     var oop = require("../lib/oop");
     var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-    
+
     oop.inherits(CoffeeHighlightRules, TextHighlightRules);
 
     function CoffeeHighlightRules() {
@@ -52,59 +44,71 @@ define(function(require, exports, module) {
             regex : ".+"
         };
 
-        var keywords = lang.arrayToMap((
-            "this|throw|then|try|typeof|super|switch|return|break|by)|continue|" +
+        var keywords = (
+            "this|throw|then|try|typeof|super|switch|return|break|by|continue|" +
             "catch|class|in|instanceof|is|isnt|if|else|extends|for|forown|" +
             "finally|function|while|when|new|no|not|delete|debugger|do|loop|of|off|" +
-            "or|on|unless|until|and|yes").split("|")
+            "or|on|unless|until|and|yes"
         );
-        
-        var langConstant = lang.arrayToMap((
-            "true|false|null|undefined").split("|")
+
+        var langConstant = (
+            "true|false|null|undefined|NaN|Infinity"
         );
-        
-        var illegal = lang.arrayToMap((
+
+        var illegal = (
             "case|const|default|function|var|void|with|enum|export|implements|" +
             "interface|let|package|private|protected|public|static|yield|" +
-            "__hasProp|extends|slice|bind|indexOf").split("|")
+            "__hasProp|slice|bind|indexOf"
         );
-        
-        var supportClass = lang.arrayToMap((
-            "Array|Boolean|Date|Function|Number|Object|RegExp|ReferenceError|" +
-            "RangeError|String|SyntaxError|Error|EvalError|TypeError|URIError").split("|")
+
+        var supportClass = (
+            "Array|Boolean|Date|Function|Number|Object|RegExp|ReferenceError|String|" +
+            "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
+            "SyntaxError|TypeError|URIError|"  +
+            "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
+            "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray"
         );
-        
-        var supportFunction = lang.arrayToMap((
+
+        var supportFunction = (
             "Math|JSON|isNaN|isFinite|parseInt|parseFloat|encodeURI|" +
-            "encodeURIComponent|decodeURI|decodeURIComponent|RangeError|String|" +
-            "SyntaxError|Error|EvalError|TypeError|URIError").split("|")
+            "encodeURIComponent|decodeURI|decodeURIComponent|String|"
         );
 
+        var variableLanguage = (
+            "window|arguments|prototype|document"
+        );
+
+        var keywordMapper = this.createKeywordMapper({
+            "keyword": keywords,
+            "constant.language": langConstant,
+            "invalid.illegal": illegal,
+            "language.support.class": supportClass,
+            "language.support.function": supportFunction,
+            "variable.language": variableLanguage
+        }, "identifier");
+
+        var functionRules = {
+            "({args})->": {
+                token: ["paren.lparen", "text", "paren.lparen", "text", "variable.parameter", "text", "paren.rparen", "text", "paren.rparen", "text", "storage.type"],
+                regex: "(\\()(\\s*)(\\{)(\\s*)([$@A-Za-z_\\x7f-\\uffff][$@\\w\\s,\\x7f-\\uffff]*)(\\s*)(\\})(\\s*)(\\))(\\s*)([\\-=]>)"
+            },
+            "({})->": {
+                token: ["paren.lparen", "text", "paren.lparen", "text", "paren.rparen", "text", "paren.rparen", "text", "storage.type"],
+                regex: "(\\()(\\s*)(\\{)(\\s*)(\\})(\\s*)(\\))(\\s*)([\\-=]>)"
+            },
+            "(args)->": {
+                token: ["paren.lparen", "text", "variable.parameter", "text", "paren.rparen", "text", "storage.type"],
+                regex: "(\\()(\\s*)([$@A-Za-z_\\x7f-\\uffff][\\s\\x21-\\uffff]*)(\\s*)(\\))(\\s*)([\\-=]>)"
+            },
+            "()->": {
+                token: ["paren.lparen", "text", "paren.rparen", "text", "storage.type"],
+                regex: "(\\()(\\s*)(\\))(\\s*)([\\-=]>)"
+            }
+        };
+
         this.$rules = {
             start : [
                 {
-                    token : "identifier",
-                    regex : "(?:(?:\\.|::)\\s*)" + identifier
-                }, {
-                    token : "variable",
-                    regex : "@(?:" + identifier + ")?"
-                }, {
-                    token: function(value) {
-                        if (keywords.hasOwnProperty(value))
-                            return "keyword";
-                        else if (langConstant.hasOwnProperty(value))
-                            return "constant.language";
-                        else if (illegal.hasOwnProperty(value))
-                            return "invalid.illegal";
-                        else if (supportClass.hasOwnProperty(value))
-                            return "language.support.class";
-                        else if (supportFunction.hasOwnProperty(value))
-                            return "language.support.function";
-                        else
-                            return "identifier";
-                    },
-                    regex : identifier
-                }, {
                     token : "constant.numeric",
                     regex : "(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)"
                 }, {
@@ -139,7 +143,7 @@ define(function(require, exports, module) {
                     next : "heregex"
                 }, {
                     token : "string.regex",
-                    regex : "/(?!\\s)[^[/\\n\\\\]*(?: (?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[/\\n\\\\]*)*/[imgy]{0,4}(?!\\w)"
+                    regex : /(?:\/(?![\s=])[^[\/\n\\]*(?:(?:\\[\s\S]|\[[^\]\n\\]*(?:\\[\s\S][^\]\n\\]*)*])[^[\/\n\\]*)*\/)(?:[imgy]{0,4})(?!\w)/
                 }, {
                     token : "comment",
                     merge : true,
@@ -148,12 +152,109 @@ define(function(require, exports, module) {
                 }, {
                     token : "comment",
                     regex : "#.*"
+                }, {
+                    token : [
+                        "punctuation.operator", "identifier"
+                    ],
+                    regex : "(\\.)(" + illegal + ")"
+                }, {
+                    token : "punctuation.operator",
+                    regex : "\\."
+                }, {
+                    //class A extends B
+                    token : [
+                        "keyword", "text", "language.support.class", "text", "keyword", "text", "language.support.class"
+                    ],
+                    regex : "(class)(\\s+)(" + identifier + ")(\\s+)(extends)(\\s+)(" + identifier + ")"
+                }, {
+                    //class A
+                    token : [
+                        "keyword", "text", "language.support.class"
+                    ],
+                    regex : "(class)(\\s+)(" + identifier + ")"
+                }, {
+                    //play = ({args}) ->
+                    token : [
+                        "entity.name.function", "text", "keyword.operator", "text"
+                    ].concat(functionRules["({args})->"].token),
+                    regex : "(" + identifier + ")(\\s*)(=)(\\s*)" + functionRules["({args})->"].regex
+                }, {
+                    //play : ({args}) ->
+                    token : [
+                        "entity.name.function", "text", "punctuation.operator", "text"
+                    ].concat(functionRules["({args})->"].token),
+                    regex : "(" + identifier + ")(\\s*)(:)(\\s*)" + functionRules["({args})->"].regex
+                }, {
+                    //play = ({}) ->
+                    token : [
+                        "entity.name.function", "text", "keyword.operator", "text"
+                    ].concat(functionRules["({})->"].token),
+                    regex : "(" + identifier + ")(\\s*)(=)(\\s*)" + functionRules["({})->"].regex
+                }, {
+                    //play : ({}) ->
+                    token : [
+                        "entity.name.function", "text", "punctuation.operator", "text"
+                    ].concat(functionRules["({})->"].token),
+                    regex : "(" + identifier + ")(\\s*)(:)(\\s*)" + functionRules["({})->"].regex
+                }, {
+                    //play = (args) ->
+                    token : [
+                        "entity.name.function", "text", "keyword.operator", "text"
+                    ].concat(functionRules["(args)->"].token),
+                    regex : "(" + identifier + ")(\\s*)(=)(\\s*)" + functionRules["(args)->"].regex
+                }, {
+                    //play : (args) ->
+                    token : [
+                        "entity.name.function", "text", "punctuation.operator", "text"
+                    ].concat(functionRules["(args)->"].token),
+                    regex : "(" + identifier + ")(\\s*)(:)(\\s*)" + functionRules["(args)->"].regex
+                }, {
+                    //play = () ->
+                    token : [
+                        "entity.name.function", "text", "keyword.operator", "text"
+                    ].concat(functionRules["()->"].token),
+                    regex : "(" + identifier + ")(\\s*)(=)(\\s*)" + functionRules["()->"].regex
+                }, {
+                    //play : () ->
+                    token : [
+                        "entity.name.function", "text", "punctuation.operator", "text"
+                    ].concat(functionRules["()->"].token),
+                    regex : "(" + identifier + ")(\\s*)(:)(\\s*)" + functionRules["()->"].regex
+                }, {
+                    //play = ->
+                    token : [
+                        "entity.name.function", "text", "keyword.operator", "text", "storage.type"
+                    ],
+                    regex : "(" + identifier + ")(\\s*)(=)(\\s*)([\\-=]>)"
+                }, {
+                    //play : ->
+                    token : [
+                        "entity.name.function", "text", "punctuation.operator", "text", "storage.type"
+                    ],
+                    regex : "(" + identifier + ")(\\s*)(:)(\\s*)([\\-=]>)"
+                }, 
+                functionRules["({args})->"],
+                functionRules["({})->"],
+                functionRules["(args)->"],
+                functionRules["()->"]
+                , {
+                    token : "identifier",
+                    regex : "(?:(?:\\.|::)\\s*)" + identifier
+                }, {
+                    token : "variable",
+                    regex : "@(?:" + identifier + ")?"
+                }, {
+                    token: keywordMapper,
+                    regex : identifier
                 }, {
                     token : "punctuation.operator",
                     regex : "\\?|\\:|\\,|\\."
+                }, {
+                    token : "storage.type",
+                    regex : "[\\-=]>"
                 }, {
                     token : "keyword.operator",
-                    regex : "(?:[\\-=]>|[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|[!*+-=><])"
+                    regex : "(?:[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|[!*+-=><])"
                 }, {
                     token : "paren.lparen",
                     regex : "[({[]"
@@ -164,40 +265,40 @@ define(function(require, exports, module) {
                     token : "text",
                     regex : "\\s+"
                 }],
-            
+
             qdoc : [{
                 token : "string",
                 regex : ".*?'''",
                 next : "start"
             }, stringfill],
-            
+
             qqdoc : [{
                 token : "string",
                 regex : '.*?"""',
                 next : "start"
             }, stringfill],
-            
+
             qstring : [{
                 token : "string",
                 regex : "[^\\\\']*(?:\\\\.[^\\\\']*)*'",
                 merge : true,
                 next : "start"
             }, stringfill],
-            
+
             qqstring : [{
                 token : "string",
                 regex : '[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',
                 merge : true,
                 next : "start"
             }, stringfill],
-            
+
             js : [{
                 token : "string",
                 merge : true,
                 regex : "[^\\\\`]*(?:\\\\.[^\\\\`]*)*`",
                 next : "start"
             }, stringfill],
-            
+
             heregex : [{
                 token : "string.regex",
                 regex : '.*?///[imgy]{0,4}',
@@ -210,7 +311,7 @@ define(function(require, exports, module) {
                 merge : true,
                 regex : "\\S+"
             }],
-            
+
             comment : [{
                 token : "comment",
                 regex : '.*?###',