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

Uast: caching isJvmElement if all modules are Jvm (KT-28564)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2019-02-28 19:46:11 +03:00
parent 8ef7f73164
commit 815fcd062d
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt
+19
View File
@@ -16,7 +16,12 @@
package org.jetbrains.uast.kotlin.internal
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ProjectRootModificationTracker
import com.intellij.psi.PsiElement
import com.intellij.psi.util.CachedValueProvider.Result
import com.intellij.psi.util.CachedValuesManager
import org.jetbrains.kotlin.codegen.ClassBuilderMode
import org.jetbrains.kotlin.codegen.state.IncompatibleClassTracker
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
@@ -50,6 +55,8 @@ class IdeaKotlinUastResolveProviderService : KotlinUastResolveProviderService {
}
override fun isJvmElement(psiElement: PsiElement): Boolean {
if (allModulesSupportJvm(psiElement.project)) return true
val containingFile = psiElement.containingFile
if (containingFile is KtFile) {
return TargetPlatformDetector.getPlatform(containingFile) is JvmPlatform
@@ -69,4 +76,16 @@ class IdeaKotlinUastResolveProviderService : KotlinUastResolveProviderService {
val call = ktElement.getCall(bindingContext) ?: return emptySequence()
return call.resolveCandidates(bindingContext, resolutionFacade).map { it.candidateDescriptor }.asSequence()
}
private fun allModulesSupportJvm(project: Project): Boolean =
CachedValuesManager.getManager(project)
.getCachedValue(project, {
Result.create(
ModuleManager.getInstance(project).modules.all { module ->
TargetPlatformDetector.getPlatform(module) is JvmPlatform
},
ProjectRootModificationTracker.getInstance(project)
)
})
}
plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt.182
+19
View File
@@ -16,7 +16,12 @@
package org.jetbrains.uast.kotlin.internal
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ProjectRootModificationTracker
import com.intellij.psi.PsiElement
import com.intellij.psi.util.CachedValueProvider.Result
import com.intellij.psi.util.CachedValuesManager
import org.jetbrains.kotlin.codegen.ClassBuilderMode
import org.jetbrains.kotlin.codegen.state.IncompatibleClassTracker
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
@@ -46,6 +51,8 @@ class IdeaKotlinUastResolveProviderService : KotlinUastResolveProviderService {
}
override fun isJvmElement(psiElement: PsiElement): Boolean {
if (allModulesSupportJvm(psiElement.project)) return true
val containingFile = psiElement.containingFile
if (containingFile is KtFile) {
return TargetPlatformDetector.getPlatform(containingFile) is JvmPlatform
@@ -58,4 +65,16 @@ class IdeaKotlinUastResolveProviderService : KotlinUastResolveProviderService {
override fun getLanguageVersionSettings(element: KtElement): LanguageVersionSettings {
return element.languageVersionSettings
}
private fun allModulesSupportJvm(project: Project): Boolean =
CachedValuesManager.getManager(project)
.getCachedValue(project, {
Result.create(
ModuleManager.getInstance(project).modules.all { module ->
TargetPlatformDetector.getPlatform(module) is JvmPlatform
},
ProjectRootModificationTracker.getInstance(project)
)
})
}