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

Cleanup (minor optimization)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-07-03 16:44:14 +02:00
parent b946f58b73
commit df2bd3aeb6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/JavaPlatformModuleSystem.kt
+8 -4
View File
@@ -37,10 +37,11 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
override fun checkAccess(target: PsiClass, place: PsiElement) = checkAccess(target, place, false)
private fun checkAccess(target: PsiClass, place: PsiElement, quick: Boolean): Pair<String, List<IntentionAction>>? {
if (PsiUtil.isLanguageLevel9OrHigher(place)) {
val useFile = place.containingFile
if (useFile != null && PsiUtil.isLanguageLevel9OrHigher(useFile)) {
val targetFile = target.containingFile
if (targetFile is PsiClassOwner) {
return checkAccess(targetFile, place, targetFile.packageName, quick)
return checkAccess(targetFile, useFile, targetFile.packageName, quick)
}
}
@@ -59,7 +60,7 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
val test = index.isInTestSourceContent(useVFile)
val dirs = target.getDirectories(module.getModuleWithDependenciesAndLibrariesScope(test))
if (dirs.size == 1) {
return checkAccess(dirs[0], place, target.qualifiedName, quick)
return checkAccess(dirs[0], useFile, target.qualifiedName, quick)
}
}
}
@@ -71,7 +72,10 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
private val ERR = Pair("-", emptyList<IntentionAction>())
private fun checkAccess(target: PsiFileSystemItem, place: PsiElement, packageName: String, quick: Boolean): Pair<String, List<IntentionAction>>? {
private fun checkAccess(target: PsiFileSystemItem,
place: PsiFileSystemItem,
packageName: String,
quick: Boolean): Pair<String, List<IntentionAction>>? {
val targetModule = JavaModuleGraphUtil.findDescriptorByElement(target)
val useModule = JavaModuleGraphUtil.findDescriptorByElement(place)