FIR/UAST: commonize KotlinUElementWithType

plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/BaseKotlinUastResolveProviderService.kt

@@ -6,8 +6,10 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiType
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.uast.UElement
+import org.jetbrains.uast.UExpression
 
 interface BaseKotlinUastResolveProviderService {
     fun isJvmElement(psiElement: PsiElement): Boolean
@@ -15,4 +17,6 @@ interface BaseKotlinUastResolveProviderService {
     fun convertParent(uElement: UElement): UElement?
 
     fun resolveToDeclaration(ktExpression: KtExpression): PsiElement?
+
+    fun getExpressionType(uExpression: UExpression): PsiType?
 }

plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt

@@ -20,7 +20,7 @@ abstract class KotlinAbstractUElement(
         psi?.let { UastFacade.findPlugin(it) }
     }
 
-    protected val baseResolveProviderService: BaseKotlinUastResolveProviderService by lz {
+    open val baseResolveProviderService: BaseKotlinUastResolveProviderService by lz {
         baseResolveProviderServiceSupplier?.get()
             ?: psi?.project?.let { ServiceManager.getService(it, BaseKotlinUastResolveProviderService::class.java) }
             ?: error("${BaseKotlinUastResolveProviderService::class.java.name} is not available")

plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUElementWithType.kt

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.uast.kotlin
+
+import com.intellij.psi.PsiType
+import org.jetbrains.uast.UExpression
+
+interface KotlinUElementWithType : UExpression {
+    val baseResolveProviderService: BaseKotlinUastResolveProviderService
+
+    override fun getExpressionType(): PsiType? {
+        return baseResolveProviderService.getExpressionType(this)
+    }
+}