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

KT-45074 [Sealed Interfaces]: when exhaustiveness after gradle reimport

Browse Source 
Module descriptor names in the form of 'stableName' depend on a build
system. See JvmCodegenUtil#getModuleName(). For JPS we get
<module-name.main> or <module-name.test> whereas for Gradle we get top
level <module-name>.
This commit changes approach: ModuleDescriptor-to-Module conversion is
no longer made by name. ModuleInfo is utilized instead.

^KT-45074 fixed
This commit is contained in:
Andrei Klunnyi
2021-02-22 19:21:51 +01:00
committed by Space
parent a9c6c115be
commit 618de5fa32
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IdeSealedClassInheritorsProvider.kt
+7 -6
View File
@@ -5,17 +5,18 @@
package org.jetbrains.kotlin.idea.compiler package org.jetbrains.kotlin.idea.compiler
import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.module.Module
import com.intellij.psi.* import com.intellij.psi.*
import com.intellij.psi.search.* import com.intellij.psi.search.*
import com.intellij.psi.search.searches.ClassInheritorsSearch import com.intellij.psi.search.searches.ClassInheritorsSearch
import com.intellij.psi.search.searches.ClassInheritorsSearch.SearchParameters import com.intellij.psi.search.searches.ClassInheritorsSearch.SearchParameters
import org.jetbrains.kotlin.analyzer.moduleInfo
import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.codegen.JvmCodegenUtil
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.containingPackage import org.jetbrains.kotlin.descriptors.containingPackage
import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo
import org.jetbrains.kotlin.idea.caches.project.implementedDescriptors import org.jetbrains.kotlin.idea.caches.project.implementedDescriptors
import org.jetbrains.kotlin.idea.caches.resolve.util.javaResolutionFacade import org.jetbrains.kotlin.idea.caches.resolve.util.javaResolutionFacade
import org.jetbrains.kotlin.idea.caches.resolve.util.resolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.util.resolveToDescriptor
@@ -37,11 +38,10 @@ object IdeSealedClassInheritorsProvider : SealedClassInheritorsProvider() {
val sealedKtClass = sealedClass.findPsi() as? KtClass ?: return emptyList() val sealedKtClass = sealedClass.findPsi() as? KtClass ?: return emptyList()
val searchScope: SearchScope = if (allowSealedInheritorsInDifferentFilesOfSamePackage) { val searchScope: SearchScope = if (allowSealedInheritorsInDifferentFilesOfSamePackage) {
val module = sealedKtClass.module ?: return emptyList() val module = sealedKtClass.module ?: return emptyList()
val moduleManager = ModuleManager.getInstance(sealedKtClass.project)
val modulesScope = sealedClass.module.listCommonModulesIfAny().toMutableList() val modulesScope = sealedClass.module.listCommonModulesIfAny().toMutableList()
.apply { add(sealedClass.module) } .apply { add(module) }
.mapNotNull { moduleManager.findModuleByName(JvmCodegenUtil.getModuleName(it))?.moduleScope } .map { it.moduleScope }
val mppAwareSearchScope = GlobalSearchScope.union(modulesScope) val mppAwareSearchScope = GlobalSearchScope.union(modulesScope)
@@ -69,8 +69,9 @@ object IdeSealedClassInheritorsProvider : SealedClassInheritorsProvider() {
.sortedBy(ClassDescriptor::getName) // order needs to be stable (at least for tests) .sortedBy(ClassDescriptor::getName) // order needs to be stable (at least for tests)
} }
private fun ModuleDescriptor.listCommonModulesIfAny(): Collection<ModuleDescriptor> { private fun ModuleDescriptor.listCommonModulesIfAny(): Collection<Module> {
return implementedDescriptors.closure { it.implementedDescriptors } return implementedDescriptors.closure { it.implementedDescriptors }
.mapNotNull { (it.moduleInfo as? ModuleSourceInfo)?.module }
} }
private fun getPackageViaDirectoryService(ktClass: KtClass): PsiPackage? { private fun getPackageViaDirectoryService(ktClass: KtClass): PsiPackage? {