github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-21 13:51:44 +03:00
Code Issues Projects Releases Wiki Activity

non-relative python imports just start looking at the root

Browse Source
This commit is contained in:
Timothy Clem 2018-04-23 14:10:01 -07:00
parent 021786f0c4
commit 4eba502448
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Language/Python/Syntax.hs
View File

@ -59,7 +59,7 @@ resolvePythonModules q = do
x <- search relRootDir name x <- search relRootDir name
traceResolve name x $ pure x traceResolve name x $ pure x
where where
rootDir (QualifiedName _) ModuleInfo{..} = takeDirectory modulePath rootDir (QualifiedName _) ModuleInfo{..} = mempty -- overall rootDir of the Package.
rootDir (RelativeQualifiedName n _) ModuleInfo{..} = upDir numDots (takeDirectory modulePath) rootDir (RelativeQualifiedName n _) ModuleInfo{..} = upDir numDots (takeDirectory modulePath)
where numDots = pred (length n) where numDots = pred (length n)
upDir n dir | n <= 0 = dir upDir n dir | n <= 0 = dir
@ -70,11 +70,12 @@ resolvePythonModules q = do
moduleNames (RelativeQualifiedName _ (Just paths)) = moduleNames paths moduleNames (RelativeQualifiedName _ (Just paths)) = moduleNames paths
search rootDir x = do search rootDir x = do
traceM ("searching for " <> show x <> " in " <> show rootDir)
let path = normalise (rootDir </> normalise x) let path = normalise (rootDir </> normalise x)
let searchPaths = [ path </> "__init__.py" let searchPaths = [ path </> "__init__.py"
, path <.> ".py" , path <.> ".py"
] ]
modulePath <- resolve searchPaths -- >>= maybeFail (notFound searchPaths) modulePath <- resolve searchPaths
maybe (throwResumable @(ResolutionError value) $ NotFoundError path searchPaths Language.Python) pure modulePath maybe (throwResumable @(ResolutionError value) $ NotFoundError path searchPaths Language.Python) pure modulePath