azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicit package prefix should override implicit

Browse Source 
#KT-29716 Fixed
This commit is contained in:
Dmitry Gridin
2019-05-31 17:44:06 +07:00
parent 20114a0868
commit f5e83d7b47
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/packageUtils.kt
+6 -1
View File
@@ -10,6 +10,7 @@ import com.intellij.openapi.application.WriteAction
import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleUtil import com.intellij.openapi.module.ModuleUtil
import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ModulePackageIndex import com.intellij.openapi.roots.ModulePackageIndex
import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
@@ -22,6 +23,7 @@ import org.jetbrains.jps.model.module.JpsModuleSourceRootType
import org.jetbrains.kotlin.config.SourceKotlinRootType import org.jetbrains.kotlin.config.SourceKotlinRootType
import org.jetbrains.kotlin.config.TestSourceKotlinRootType import org.jetbrains.kotlin.config.TestSourceKotlinRootType
import org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService import org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService
import org.jetbrains.kotlin.idea.core.util.toPsiDirectory
import org.jetbrains.kotlin.idea.roots.invalidateProjectRoots import org.jetbrains.kotlin.idea.roots.invalidateProjectRoots
import org.jetbrains.kotlin.idea.util.rootManager import org.jetbrains.kotlin.idea.util.rootManager
import org.jetbrains.kotlin.idea.util.sourceRoot import org.jetbrains.kotlin.idea.util.sourceRoot
@@ -39,13 +41,16 @@ fun PsiFile.getFqNameByDirectory(): FqName {
fun PsiDirectory.getFqNameWithImplicitPrefix(): FqName { fun PsiDirectory.getFqNameWithImplicitPrefix(): FqName {
val packageFqName = getPackage()?.qualifiedName?.let(::FqName) ?: FqName.ROOT val packageFqName = getPackage()?.qualifiedName?.let(::FqName) ?: FqName.ROOT
sourceRoot?.let { sourceRoot -> sourceRoot?.takeIf { !it.hasExplicitPackagePrefix(project) }?.let { sourceRoot ->
val implicitPrefix = PerModulePackageCacheService.getInstance(project).getImplicitPackagePrefix(sourceRoot) val implicitPrefix = PerModulePackageCacheService.getInstance(project).getImplicitPackagePrefix(sourceRoot)
return FqName.fromSegments((implicitPrefix.pathSegments() + packageFqName.pathSegments()).map { it.asString() }) return FqName.fromSegments((implicitPrefix.pathSegments() + packageFqName.pathSegments()).map { it.asString() })
} }
return packageFqName return packageFqName
} }
private fun VirtualFile.hasExplicitPackagePrefix(project: Project): Boolean =
toPsiDirectory(project)?.getPackage()?.qualifiedName?.isNotEmpty() == true
fun KtFile.packageMatchesDirectory(): Boolean = packageFqName == getFqNameByDirectory() fun KtFile.packageMatchesDirectory(): Boolean = packageFqName == getFqNameByDirectory()
fun KtFile.packageMatchesDirectoryOrImplicit() = fun KtFile.packageMatchesDirectoryOrImplicit() =