diff options
| author | Wu Cheng-Han | 2016-01-17 14:28:04 -0600 |
|---|---|---|
| committer | Wu Cheng-Han | 2016-01-17 14:28:04 -0600 |
| commit | eaa8ccaccb1091820d0a8d1223996a6dd057347d (patch) | |
| tree | 6b4aaa3b3d1a2fed68147510142663222533775a /public/vendor/codemirror/mode/coffeescript | |
| parent | ce65e58096d57ace02723d11a125673f9d48c293 (diff) | |
Upgrade CodeMirror to 5.10.1 and now support fullscreen, jump-to-line in editor
Diffstat (limited to 'public/vendor/codemirror/mode/coffeescript')
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/mode/coffeescript/coffeescript.js | 40 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/mode/coffeescript/index.html | 0 |
2 files changed, 13 insertions, 27 deletions
diff --git a/public/vendor/codemirror/mode/coffeescript/coffeescript.js b/public/vendor/codemirror/mode/coffeescript/coffeescript.js index da0eb2d5..adf2184f 100755..100644 --- a/public/vendor/codemirror/mode/coffeescript/coffeescript.js +++ b/public/vendor/codemirror/mode/coffeescript/coffeescript.js @@ -25,7 +25,7 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) { var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/; var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/; var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/; - var properties = /^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/; + var atProp = /^@[_A-Za-z$][_A-Za-z$0-9]*/; var wordOperators = wordRegexp(["and", "or", "not", "is", "isnt", "in", @@ -145,6 +145,8 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) { } } + + // Handle operators and delimiters if (stream.match(operators) || stream.match(wordOperators)) { return "operator"; @@ -157,6 +159,10 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) { return "atom"; } + if (stream.match(atProp) || state.prop && stream.match(identifiers)) { + return "property"; + } + if (stream.match(keywords)) { return "keyword"; } @@ -165,10 +171,6 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) { return "variable"; } - if (stream.match(properties)) { - return "property"; - } - // Handle non-detected items stream.next(); return ERRORCLASS; @@ -265,24 +267,11 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) { var style = state.tokenize(stream, state); var current = stream.current(); - // Handle "." connected identifiers - if (current === ".") { - style = state.tokenize(stream, state); - current = stream.current(); - if (/^\.[\w$]+$/.test(current)) { - return "variable"; - } else { - return ERRORCLASS; - } - } - // Handle scope changes. if (current === "return") { state.dedent = true; } - if (((current === "->" || current === "=>") && - !state.lambda && - !stream.peek()) + if (((current === "->" || current === "=>") && stream.eol()) || style === "indent") { indent(stream, state); } @@ -324,8 +313,7 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) { return { tokenize: tokenBase, scope: {offset:basecolumn || 0, type:"coffee", prev: null, align: false}, - lastToken: null, - lambda: false, + prop: false, dedent: 0 }; }, @@ -335,12 +323,9 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) { if (fillAlign && stream.sol()) fillAlign.align = false; var style = tokenLexer(stream, state); - if (fillAlign && style && style != "comment") fillAlign.align = true; - - state.lastToken = {style:style, content: stream.current()}; - - if (stream.eol() && stream.lambda) { - state.lambda = false; + if (style && style != "comment") { + if (fillAlign) fillAlign.align = true; + state.prop = style == "punctuation" && stream.current() == "." } return style; @@ -365,5 +350,6 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) { }); CodeMirror.defineMIME("text/x-coffeescript", "coffeescript"); +CodeMirror.defineMIME("text/coffeescript", "coffeescript"); }); diff --git a/public/vendor/codemirror/mode/coffeescript/index.html b/public/vendor/codemirror/mode/coffeescript/index.html index 93a5f4f3..93a5f4f3 100755..100644 --- a/public/vendor/codemirror/mode/coffeescript/index.html +++ b/public/vendor/codemirror/mode/coffeescript/index.html |