Fixes jashkenas#2849: now the compilation errors thrown by CoffeeScri…

…pt.compile will include the correct filename and source code information

src/coffee-script.coffee

@@ -33,7 +33,13 @@ exports.compile = compile = (code, options = {}) ->
   if options.sourceMap
     map = new SourceMap
 
-  fragments = (parser.parse lexer.tokenize(code, options)).compileToFragments options
+  try
+    fragments = (parser.parse lexer.tokenize(code, options)).compileToFragments options
+  catch err
+    # Add source file information to error so it can be pretty-printed later.
+    err.filename = options.filename
+    err.code = code
+    throw err
 
   currentLine = 0
   currentLine += 1 if options.header or options.inline

src/helpers.coffee

@@ -145,9 +145,13 @@ exports.throwSyntaxError = (message, location) ->
 # Creates a nice error message like, following the "standard" format
 # <filename>:<line>:<col>: <message> plus the line with the error and a marker
 # showing where the error is.
-exports.prettyErrorMessage = (error, fileName, code, useColors) ->
+exports.prettyErrorMessage = (error, filename, code, useColors) ->
   return error.stack or "#{error}" unless error.location
 
+  # Prefer original source file information stored in the error if present.
+  filename = error.filename or filename
+  code     = error.code or code
+
   {first_line, first_column, last_line, last_column} = error.location
   codeLine = code.split('\n')[first_line]
   start    = first_column
@@ -156,15 +160,15 @@ exports.prettyErrorMessage = (error, fileName, code, useColors) ->
   marker   = repeat(' ', start) + repeat('^', end - start)
 
   if useColors
-    colorize  = (str) -> "\x1B[1;31m#{str}\x1B[0m"
+    colorize = (str) -> "\x1B[1;31m#{str}\x1B[0m"
     codeLine = codeLine[...start] + colorize(codeLine[start...end]) + codeLine[end..]
-    marker    = colorize marker
+    marker   = colorize marker
 
   message = """
-  #{fileName}:#{first_line + 1}:#{first_column + 1}: error: #{error.message}
-  #{codeLine}
-  #{marker}
-            """
+    #{filename}:#{first_line + 1}:#{first_column + 1}: error: #{error.message}
+    #{codeLine}
+    #{marker}
+  """
 
   # Uncomment to add stacktrace.
   #message += "\n#{error.stack}"