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

Move util functions from KotlinBuiltIns to :core:descriptors.common module

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-08-16 23:42:40 +03:00
parent 20a2ad8223
commit 45cf221b97
12 changed files with 65 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/MemberMatching.java
+2 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames;
import org.jetbrains.kotlin.descriptors.CallableDescriptor;
import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor;
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor;
@@ -74,7 +75,7 @@ public class MemberMatching {
@Override
public String visitFunctionType(@NotNull KtFunctionType type, Void data) {
return KotlinBuiltIns.getFunctionName(type.getParameters().size() + (type.getReceiverTypeReference() != null ? 1 : 0));
return KotlinBuiltInsNames.getFunctionName(type.getParameters().size() + (type.getReceiverTypeReference() != null ? 1 : 0));
}
@Override
idea/idea-android/src/org/jetbrains/kotlin/android/ParcelableUtil.kt
+3 -3
View File
@@ -232,7 +232,7 @@ private fun PropertyDescriptor.formatReadFromParcel(parcelName: String): String?
fun KotlinType.formatJavaClassloader() = "${this.constructor.declarationDescriptor?.fqNameSafe}::class.java.classLoader"
// There is no read/write short array methods
if (KotlinBuiltIns.isPrimitiveArray(type) && KotlinBuiltIns.getPrimitiveArrayElementType(type) != PrimitiveType.SHORT) {
if (KotlinBuiltInsNames.isPrimitiveArray(type) && KotlinBuiltIns.getPrimitiveArrayElementType(type) != PrimitiveType.SHORT) {
return "$parcelName.create${type.getName()}()"
}
@@ -271,7 +271,7 @@ private fun PropertyDescriptor.formatWriteToParcel(parcelName: String, flagsName
val type = returnType ?: return null
// There is no read/write short array methods
if (KotlinBuiltIns.isPrimitiveArray(type) && KotlinBuiltIns.getPrimitiveArrayElementType(type) != PrimitiveType.SHORT) {
if (KotlinBuiltInsNames.isPrimitiveArray(type) && KotlinBuiltIns.getPrimitiveArrayElementType(type) != PrimitiveType.SHORT) {
return "$parcelName.write${type.getName()}($name)"
}
@@ -450,4 +450,4 @@ private fun KotlinType.isSparseBooleanArray(): Boolean = fqNameEquals("android.u
private fun KotlinType.isBundle(): Boolean = fqNameEquals("android.os.Bundle")
private fun <T : KtDeclaration> T.addNewLineBeforeDeclaration() = parent.addBefore(KtPsiFactory(this).createNewLine(), this)
private fun <T : KtDeclaration> T.addNewLineBeforeDeclaration() = parent.addBefore(KtPsiFactory(this).createNewLine(), this)
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/KtDeclarationAndFirDeclarationEqualityChecker.kt
+3 -2
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.fir
import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.builder.RawFirBuilder
import org.jetbrains.kotlin.fir.declarations.FirClass
@@ -69,9 +70,9 @@ object KtDeclarationAndFirDeclarationEqualityChecker {
}
is FirFunctionTypeRef -> {
val classId = if (isSuspend) {
KotlinBuiltIns.getSuspendFunctionClassId(parametersCount)
KotlinBuiltInsNames.getSuspendFunctionClassId(parametersCount)
} else {
KotlinBuiltIns.getFunctionClassId(parametersCount)
KotlinBuiltInsNames.getFunctionClassId(parametersCount)
}
buildString {
append(classId.asSingleFqName().toString())
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt
+7 -5
View File
@@ -5,9 +5,11 @@
package org.jetbrains.kotlin.idea.frontend.api.fir.components
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.fir.declarations.isSuspend
import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
import org.jetbrains.kotlin.fir.symbols.CallableId
import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
@@ -86,9 +88,9 @@ internal class KtFirCallResolver(
companion object {
private val kotlinFunctionInvokeCallableIds = (0..23).flatMapTo(hashSetOf()) { arity ->
listOf(
CallableId(KotlinBuiltIns.getFunctionClassId(arity), Name.identifier("invoke")),
CallableId(KotlinBuiltIns.getSuspendFunctionClassId(arity), Name.identifier("invoke"))
CallableId(KotlinBuiltInsNames.getFunctionClassId(arity), Name.identifier("invoke")),
CallableId(KotlinBuiltInsNames.getSuspendFunctionClassId(arity), Name.identifier("invoke"))
)
}
}
}
}