github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-05-03 03:00:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid variable scope collision with extensions

Browse Source 
In #3031, an extensions variable was introduced with file-level scope
that defined the filetypes that CoffeeScript can compile. However, the
Module::load patching calls findExtension() which uses a local variable
called "extensions", which was overriding the outer level one and
causing getSourceMap() to fail.
This commit is contained in:
Doug Patti
2013-06-24 18:03:27 -04:00
parent ef5f58e30e
commit 7f1088054c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/coffee-script.coffee
View File

@@ -15,7 +15,7 @@ SourceMap = require './sourcemap'
# The current CoffeeScript version number.
exports.VERSION = '1.6.3'
extensions = ['.coffee', '.litcoffee', '.coffee.md']
fileExtensions = ['.coffee', '.litcoffee', '.coffee.md']
# Expose helpers for testing.
exports.helpers = helpers
@@ -164,7 +164,7 @@ loadFile = (module, filename) ->
# If the installed version of Node supports `require.extensions`, register
# CoffeeScript as an extension.
if require.extensions
for ext in extensions
for ext in fileExtensions
require.extensions[ext] = loadFile
# Patch Node's module loader to be able to handle mult-dot extensions.
@@ -294,7 +294,7 @@ sourceMaps = {}
# Generates the source map for a coffee file and stores it in the local cache variable.
getSourceMap = (filename) ->
return sourceMaps[filename] if sourceMaps[filename]
return unless path?.extname(filename) in extensions
return unless path?.extname(filename) in fileExtensions
answer = compileFile filename, true
sourceMaps[filename] = answer.sourceMap