Skip to content

Collect all necessary system paths for import other modules #1567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,20 @@ fun getDirectoriesForSysPath(
if (ancestor != null && !sources.contains(ancestor))
sources.add(ancestor)

// Collect sys.path directories with imported modules
file.importTargets.forEach { importTarget ->
importTarget.multiResolve().forEach {
val element = it.element
if (element != null) {
val directory = element.parent
if (directory is PsiDirectory) {
sources.add(directory.virtualFile)
}
}

}
}

var importPath = ancestor?.let { VfsUtil.getParentDir(VfsUtilCore.getRelativeLocation(file.virtualFile, it)) } ?: ""
if (importPath != "")
importPath += "."
Expand Down