diff options
author | Jon Reid | 2012-07-17 16:03:14 -0700 |
---|---|---|
committer | Jon Reid | 2012-07-17 16:03:14 -0700 |
commit | 42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3 (patch) | |
tree | 67deeb8c5b34aacc91f737cc64a3bc9ef1f4f05f /imports/codemirror/mode/coffeescript/coffeescript.js | |
parent | a12cabc16273ffe04af4bce1f7438dc9326efa89 (diff) | |
parent | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff) | |
download | ninja-42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'imports/codemirror/mode/coffeescript/coffeescript.js')
-rw-r--r-- | imports/codemirror/mode/coffeescript/coffeescript.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/imports/codemirror/mode/coffeescript/coffeescript.js b/imports/codemirror/mode/coffeescript/coffeescript.js index 4f2bd66d..dece5f8a 100644 --- a/imports/codemirror/mode/coffeescript/coffeescript.js +++ b/imports/codemirror/mode/coffeescript/coffeescript.js | |||
@@ -60,6 +60,12 @@ CodeMirror.defineMode('coffeescript', function(conf) { | |||
60 | 60 | ||
61 | var ch = stream.peek(); | 61 | var ch = stream.peek(); |
62 | 62 | ||
63 | // Handle docco title comment (single line) | ||
64 | if (stream.match("####")) { | ||
65 | stream.skipToEnd(); | ||
66 | return 'comment'; | ||
67 | } | ||
68 | |||
63 | // Handle multi line comments | 69 | // Handle multi line comments |
64 | if (stream.match("###")) { | 70 | if (stream.match("###")) { |
65 | state.tokenize = longComment; | 71 | state.tokenize = longComment; |