aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/coffeescript
diff options
context:
space:
mode:
authorJon Reid2012-07-17 16:03:14 -0700
committerJon Reid2012-07-17 16:03:14 -0700
commit42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3 (patch)
tree67deeb8c5b34aacc91f737cc64a3bc9ef1f4f05f /imports/codemirror/mode/coffeescript
parenta12cabc16273ffe04af4bce1f7438dc9326efa89 (diff)
parentb4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff)
downloadninja-42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'imports/codemirror/mode/coffeescript')
-rw-r--r--imports/codemirror/mode/coffeescript/coffeescript.js6
-rw-r--r--imports/codemirror/mode/coffeescript/index.html6
2 files changed, 12 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;
diff --git a/imports/codemirror/mode/coffeescript/index.html b/imports/codemirror/mode/coffeescript/index.html
index 127c4bf9..98bd4971 100644
--- a/imports/codemirror/mode/coffeescript/index.html
+++ b/imports/codemirror/mode/coffeescript/index.html
@@ -46,12 +46,18 @@ root = this
46# Save the previous value of the `_` variable. 46# Save the previous value of the `_` variable.
47previousUnderscore = root._ 47previousUnderscore = root._
48 48
49### Multiline
50 comment
51###
49 52
50# Establish the object that gets thrown to break out of a loop iteration. 53# Establish the object that gets thrown to break out of a loop iteration.
51# `StopIteration` is SOP on Mozilla. 54# `StopIteration` is SOP on Mozilla.
52breaker = if typeof(StopIteration) is 'undefined' then '__break__' else StopIteration 55breaker = if typeof(StopIteration) is 'undefined' then '__break__' else StopIteration
53 56
54 57
58#### Docco style single line comment (title)
59
60
55# Helper function to escape **RegExp** contents, because JS doesn't have one. 61# Helper function to escape **RegExp** contents, because JS doesn't have one.
56escapeRegExp = (string) -> string.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1') 62escapeRegExp = (string) -> string.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1')
57 63