github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-19 02:44:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use Module's filename instead of id

Browse Source
This commit is contained in:
Kevin Sawicki
2014-10-09 14:21:38 -07:00
parent 67d430d100
commit 7dffc58c5b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/module-cache.coffee
View File

@@ -81,11 +81,11 @@ satisfies = (version, rawRange) ->
resolveFilePath = (relativePath, parentModule) ->
return unless relativePath
return unless parentModule?.id
return unless parentModule?.filename
return unless relativePath[0] is '.' or fs.isAbsolute(relativePath)
return if relativePath[relativePath.length - 1] is '/'
resolvedPath = path.resolve(path.dirname(parentModule.id), relativePath)
resolvedPath = path.resolve(path.dirname(parentModule.filename), relativePath)
if resolvedPath.indexOf(cache.resourcePath) is 0
extension = path.extname(resolvedPath)
if extension
@@ -99,14 +99,14 @@ resolveFilePath = (relativePath, parentModule) ->
resolveModulePath = (relativePath, parentModule) ->
return unless relativePath
return unless parentModule?.id
return unless parentModule?.filename
return if nativeModules.hasOwnProperty(relativePath)
return if relativePath[0] is '.'
return if relativePath[relativePath.length - 1] is '/'
return if fs.isAbsolute(relativePath)
folderPath = path.dirname(parentModule.id)
folderPath = path.dirname(parentModule.filename)
range = cache.folders[folderPath]?[relativePath]
unless range?