Merge 947c5fa into 704d289

jsoverson · Apr 12, 2016 · 888e933 · 888e933
2 parents 704d289 + 947c5fa
commit 888e933
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/regexrules.js b/lib/regexrules.js
@@ -62,7 +62,10 @@ module.exports = {
     }
   },
   coffee : {
-    echo : "#+[ \t]*@echo[ \t]+(.*?)[ \t]*$",
+    echo : [
+      "###+[ \t]*@echo[ \t]+(.*?)[ \t]###",
+      "#+[ \t]*@echo[ \t]+(.*?)[ \t]*$"
+    ],
     exec : "#+[ \t]*@exec[ \t]+(\\S+)[ \t]*\\((.*)\\)[ \t]*$",
     include          : "^(.*?)#+[ \t]*@include(?!-)[ \t]+(.*?)[ \t]*$",
     'include-static' : "^(.*?)#+[ \t]*@include-static[ \t]+(.*?)[ \t]*$",

diff --git a/test/echo.spec.js b/test/echo.spec.js
@@ -55,11 +55,16 @@ describe('@echo directive shall be preprocessed', function () {
   });
 
   describe('in coffeescript', function () {
-    it('and resolve and echo variables', function () {
+    it('and resolve and echo variables (line)', function () {
       input = "a\n# @echo FINGERPRINT\nc";
       pp.preprocess(input, {FINGERPRINT: '0xDEADBEEF'}, 'coffee').should.equal("a\n0xDEADBEEF\nc");
     });
 
+    it('and resolve and echo variables (block)', function () {
+      input = "a\n### @echo FINGERPRINT ###\nc";
+      pp.preprocess(input, {FINGERPRINT: '0xDEADBEEF'}, 'coffee').should.equal("a\n0xDEADBEEF\nc");
+    });
+
     it('and resolve and echo variables (multiple hashes)', function () {
       input = "a\n## @echo FINGERPRINT\nc";
       pp.preprocess(input, {FINGERPRINT: '0xDEADBEEF'}, 'coffee').should.equal("a\n0xDEADBEEF\nc");