github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-22 21:38:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check candidates after ranges

Browse Source 
This way builtins are checked for correctly when the
range isn’t found
This commit is contained in:
Kevin Sawicki
2014-10-13 16:21:40 -04:00
parent 6a6c7b1852
commit a0ae526017
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/module-cache.coffee
View File

@@ -121,9 +121,6 @@ resolveModulePath = (relativePath, parentModule) ->
return if relativePath[0] is '.'
return if isAbsolute(relativePath)
candidates = cache.dependencies[relativePath]
return unless candidates?
folderPath = path.dirname(parentModule.filename)
range = cache.folders[folderPath]?[relativePath]
@@ -133,6 +130,9 @@ resolveModulePath = (relativePath, parentModule) ->
else
return
candidates = cache.dependencies[relativePath]
return unless candidates?
for version, resolvedPath of candidates
if Module._cache.hasOwnProperty(resolvedPath) or isCorePath(resolvedPath)
return resolvedPath if satisfies(version, range)