aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/coffeescript/coffeescript.js
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 11:42:09 -0700
committerJonathan Duran2012-07-17 11:42:09 -0700
commitb4b3e45d6684e77d361b4f8ca5be4889428320c5 (patch)
tree2156d9920ea1b7db49ed6460545fea7cda121bae /imports/codemirror/mode/coffeescript/coffeescript.js
parent4a87ff575693509ac578d46af26fa137c0dc3f58 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-b4b3e45d6684e77d361b4f8ca5be4889428320c5.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'imports/codemirror/mode/coffeescript/coffeescript.js')
-rw-r--r--imports/codemirror/mode/coffeescript/coffeescript.js6
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;