Merge branch 'pr-1052' into pull-requests

Sewdn · May 23, 2013 · 37fecbd · 37fecbd
2 parents 3d0a551 + 28ea851
commit 37fecbd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/History.md b/History.md
@@ -12,6 +12,9 @@
   can be used to create repeatable test cases for code that picks random
   values.  #1033
 
+* Fix CoffeeScript error reporting to include source file and line
+  number again.  #1052
+
 Patches contributed by GitHub users awwx and timhaines.
 
 

diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
@@ -15,7 +15,11 @@ var coffeescript_handler = function(bundle, source_path, serve_path, where) {
   try {
     contents = coffee.compile(contents.toString('utf8'), options);
   } catch (e) {
-    return bundle.error(e.message);
+    return bundle.error(
+      source_path + ':' +
+      (e.location ? (e.location.first_line + ': ') : ' ') +
+      e.message
+    );
   }
 
   contents = new Buffer(contents);