Skip to content

Commit 870c8eb

Browse files
committed
refactor: use resolveToDescriptorIfAny
1 parent 3cc7234 commit 870c8eb

File tree

1 file changed

+3
-2
lines changed
  • marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils

1 file changed

+3
-2
lines changed

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils/JVMMarkerUtils.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ import com.intellij.psi.*
2222
import com.intellij.psi.util.PsiUtil
2323
import org.jetbrains.kotlin.backend.jvm.ir.psiElement
2424
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
25+
import org.jetbrains.kotlin.descriptors.CallableDescriptor
2526
import org.jetbrains.kotlin.idea.base.psi.KotlinPsiHeuristics
2627
import org.jetbrains.kotlin.idea.base.utils.fqname.fqName
27-
import org.jetbrains.kotlin.nj2k.postProcessing.type
28+
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
2829
import org.jetbrains.kotlin.psi.KtClass
2930
import org.jetbrains.kotlin.psi.KtFile
3031
import org.jetbrains.kotlin.psi.KtFunction
@@ -239,7 +240,7 @@ object JVMMarkerUtils {
239240
if (methodParams.isNotEmpty()) {
240241
methodParams += ","
241242
}
242-
val paramType = it.type()
243+
val paramType = (it.resolveToDescriptorIfAny() as? CallableDescriptor)?.returnType
243244
val qualifiedType = if (paramType != null && KotlinBuiltIns.isPrimitiveArray(paramType)) {
244245
val arrayType = KotlinBuiltIns.getPrimitiveArrayElementType(paramType)
245246
arrayType?.let { JvmPrimitiveType.get(it).javaKeywordName + "[]" }

0 commit comments

Comments
 (0)