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

Minor: Fix build, remove inline function usage

Browse Source
This commit is contained in:
Yan Zhulanow
2017-12-15 17:37:54 +09:00
parent da98b7e07b
commit 4ec20ad595
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ErrorTypeCorrector.kt
+2 -2
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.kapt3.stubs package org.jetbrains.kotlin.kapt3.stubs
import com.intellij.psi.util.PsiTreeUtil
import com.sun.tools.javac.code.BoundKind import com.sun.tools.javac.code.BoundKind
import com.sun.tools.javac.tree.JCTree import com.sun.tools.javac.tree.JCTree
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
@@ -28,7 +29,6 @@ import org.jetbrains.kotlin.kapt3.stubs.ErrorTypeCorrector.TypeKind.METHOD_PARAM
import org.jetbrains.kotlin.kapt3.stubs.ErrorTypeCorrector.TypeKind.RETURN_TYPE import org.jetbrains.kotlin.kapt3.stubs.ErrorTypeCorrector.TypeKind.RETURN_TYPE
import org.jetbrains.kotlin.load.kotlin.TypeMappingMode import org.jetbrains.kotlin.load.kotlin.TypeMappingMode
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.source.getPsi import org.jetbrains.kotlin.resolve.source.getPsi
import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.*
@@ -124,7 +124,7 @@ class ErrorTypeCorrector(
val arguments = type.typeArguments val arguments = type.typeArguments
if (arguments.isEmpty()) return baseExpression if (arguments.isEmpty()) return baseExpression
val typeReference = type.getParentOfType<KtTypeReference>(strict = true) val typeReference = PsiTreeUtil.getParentOfType(type, KtTypeReference::class.java, true)
val kotlinType = bindingContext[BindingContext.TYPE, typeReference] ?: ErrorUtils.createErrorType("Kapt error type") val kotlinType = bindingContext[BindingContext.TYPE, typeReference] ?: ErrorUtils.createErrorType("Kapt error type")
val typeMappingMode = when (typeKind) { val typeMappingMode = when (typeKind) {