MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Support source and content roots while resolving stub packages (PY-30942)

Browse Source
This commit is contained in:
Semyon Proshev
2018-10-09 20:57:55 +03:00
parent 240cb203e0
commit f112937e97
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/typing/PyPEP561.kt
+13 -2
View File
@@ -5,6 +5,7 @@ package com.jetbrains.python.codeInsight.typing
import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleUtilCore
import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ProjectFileIndex
import com.intellij.openapi.util.Key
import com.intellij.openapi.vfs.VfsUtilCore
@@ -54,7 +55,7 @@ fun replaceOrUniteWithStubPackage(containingFile: PsiFile?,
if (!withoutStubs &&
containingFile != null &&
LanguageLevel.forElement(containingFile).isAtLeast(LanguageLevel.PYTHON37) &&
dir.virtualFile.let { it == ProjectFileIndex.getInstance(containingFile.project).getClassRootForFile(it) }) {
dir.virtualFile.let { it == getClassOrContentOrSourceRoot(containingFile.project, it) }) {
val stubPackageName = "${resolvedSubdir.name}$STUBS_SUFFIX"
val subdirectory = dir.findSubdirectory(stubPackageName)
@@ -115,6 +116,16 @@ fun filterTopPriorityResults(resolved: List<PsiElement>, module: Module?): List<
}
}
fun getClassOrContentOrSourceRoot(project: Project, file: VirtualFile): VirtualFile? {
val index = ProjectFileIndex.getInstance(project)
index.getClassRootForFile(file)?.let { return it }
index.getSourceRootForFile(file)?.let { return it }
index.getContentRootForFile(file)?.let { return it }
return null
}
private fun pyi(element: PsiElement) = element is PyiFile || PyUtil.turnDirIntoInit(element) is PyiFile
private fun isNamespacePackage(element: PsiElement): Boolean {
@@ -179,7 +190,7 @@ private fun getPyTyped(element: PsiElement?): VirtualFile? {
val file = if (element is PsiFileSystemItem) element.virtualFile else element.containingFile?.virtualFile
if (file == null) return null
val root = ProjectFileIndex.getInstance(element.project).getClassRootForFile(file) ?: return null
val root = getClassOrContentOrSourceRoot(element.project, file) ?: return null
var current = if (file.isDirectory) file else file.parent
while (current != null && current != root && current.isDirectory) {