From 55f4c067e2e9c9cd5d825920add6efca0e729a3c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 24 May 2019 18:06:57 +0200 Subject: [PATCH] Fix compilation of uast-kotlin-idea for 182 Caused by 4e15b95d172 --- .../src/IdeaKotlinUastResolveProviderService.kt.182 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt.182 b/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt.182 index 7846d6f5d2c..4805ad6b8a4 100644 --- a/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt.182 +++ b/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt.182 @@ -23,15 +23,13 @@ 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 -import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.project.TargetPlatformDetector import org.jetbrains.kotlin.idea.project.languageVersionSettings import org.jetbrains.kotlin.idea.util.module -import org.jetbrains.kotlin.load.java.JvmAbi +import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform @@ -44,8 +42,7 @@ class IdeaKotlinUastResolveProviderService : KotlinUastResolveProviderService { override fun getTypeMapper(element: KtElement): KotlinTypeMapper? { return KotlinTypeMapper( getBindingContext(element), ClassBuilderMode.LIGHT_CLASSES, - JvmAbi.DEFAULT_MODULE_NAME, - element.languageVersionSettings + JvmProtoBufUtil.DEFAULT_MODULE_NAME, element.languageVersionSettings ) }