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

Rename KotlinBuiltInsNames to StandardNames

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-08-19 12:32:07 +03:00
parent d032fdfc44
commit a764732020
184 changed files with 643 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityBoundTypeCalculator.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.nj2k.inference.mutability
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames
import org.jetbrains.kotlin.builtins.StandardNames.FqNames
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.nj2k.inference.common.BoundType
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityConstraintsCollector.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.nj2k.inference.mutability
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames
import org.jetbrains.kotlin.builtins.StandardNames.FqNames
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.nj2k.inference.common.*
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityStateUpdater.kt
+8 -8
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.nj2k.inference.mutability
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.nj2k.inference.common.State
import org.jetbrains.kotlin.nj2k.inference.common.StateUpdater
@@ -54,13 +54,13 @@ class MutabilityStateUpdater : StateUpdater() {
}
val mutableToImmutable = mapOf(
KotlinBuiltInsNames.FqNames.mutableIterator to KotlinBuiltInsNames.FqNames.iterator,
KotlinBuiltInsNames.FqNames.mutableCollection to KotlinBuiltInsNames.FqNames.collection,
KotlinBuiltInsNames.FqNames.mutableList to KotlinBuiltInsNames.FqNames.list,
KotlinBuiltInsNames.FqNames.mutableListIterator to KotlinBuiltInsNames.FqNames.listIterator,
KotlinBuiltInsNames.FqNames.mutableSet to KotlinBuiltInsNames.FqNames.set,
KotlinBuiltInsNames.FqNames.mutableMap to KotlinBuiltInsNames.FqNames.map,
KotlinBuiltInsNames.FqNames.mutableMapEntry to KotlinBuiltInsNames.FqNames.mapEntry
StandardNames.FqNames.mutableIterator to StandardNames.FqNames.iterator,
StandardNames.FqNames.mutableCollection to StandardNames.FqNames.collection,
StandardNames.FqNames.mutableList to StandardNames.FqNames.list,
StandardNames.FqNames.mutableListIterator to StandardNames.FqNames.listIterator,
StandardNames.FqNames.mutableSet to StandardNames.FqNames.set,
StandardNames.FqNames.mutableMap to StandardNames.FqNames.map,
StandardNames.FqNames.mutableMapEntry to StandardNames.FqNames.mapEntry
)
val immutableToMutable = mutableToImmutable.map { (key, value) -> value to key }.toMap()
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.nj2k.conversions
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.builtins.PrimitiveType
import org.jetbrains.kotlin.j2k.ast.Nullability
import org.jetbrains.kotlin.nj2k.NewJ2kConverterContext
@@ -80,7 +80,7 @@ class ArrayInitializerConversion(context: NewJ2kConverterContext) : RecursiveApp
)
for (i in 0 until dimensions.size - 2) {
resultType = JKClassType(
symbolProvider.provideClassSymbol(KotlinBuiltInsNames.FqNames.array.toSafe()),
symbolProvider.provideClassSymbol(StandardNames.FqNames.array.toSafe()),
listOf(resultType),
Nullability.Default
)
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.nj2k.conversions
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.nj2k.*
import org.jetbrains.kotlin.nj2k.symbols.JKMethodSymbol
import org.jetbrains.kotlin.nj2k.symbols.JKUnresolvedField
@@ -499,7 +499,7 @@ class BuiltinMembersConversion(context: NewJ2kConverterContext) : RecursiveAppli
},
Method("java.lang.String.format") convertTo CustomExpression { expression ->
JKClassAccessExpression(
symbolProvider.provideClassSymbol(KotlinBuiltInsNames.FqNames.string)
symbolProvider.provideClassSymbol(StandardNames.FqNames.string)
).callOn(
symbolProvider.provideMethodSymbol("kotlin.text.String.format"),
(expression as JKCallExpression).arguments::arguments.detached()
nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKMethodSymbol.kt
+2 -2
View File
@@ -9,7 +9,7 @@ package org.jetbrains.kotlin.nj2k.symbols
import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiReference
import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName
import org.jetbrains.kotlin.j2k.ast.Nullability
import org.jetbrains.kotlin.nj2k.tree.JKClass
@@ -72,7 +72,7 @@ class JKMultiverseFunctionSymbol(
type?.let {
if (parameter.isVarArg) {
JKClassType(
symbolProvider.provideClassSymbol(KotlinBuiltInsNames.FqNames.array.toSafe()),
symbolProvider.provideClassSymbol(StandardNames.FqNames.array.toSafe()),
listOf(it)
)
} else it
nj2k/src/org/jetbrains/kotlin/nj2k/types/JKTypeFactory.kt
+15 -15
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.nj2k.types
import com.intellij.psi.*
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
import org.jetbrains.kotlin.j2k.ast.Nullability
import org.jetbrains.kotlin.js.descriptorUtils.getJetTypeFqName
@@ -36,24 +36,24 @@ class JKTypeFactory(val symbolProvider: JKSymbolProvider) {
nullability
)
val boolean = typeByFqName(KotlinBuiltInsNames.FqNames._boolean)
val char = typeByFqName(KotlinBuiltInsNames.FqNames._char)
val byte = typeByFqName(KotlinBuiltInsNames.FqNames._byte)
val short = typeByFqName(KotlinBuiltInsNames.FqNames._short)
val int = typeByFqName(KotlinBuiltInsNames.FqNames._int)
val float = typeByFqName(KotlinBuiltInsNames.FqNames._float)
val long = typeByFqName(KotlinBuiltInsNames.FqNames._long)
val double = typeByFqName(KotlinBuiltInsNames.FqNames._double)
val boolean = typeByFqName(StandardNames.FqNames._boolean)
val char = typeByFqName(StandardNames.FqNames._char)
val byte = typeByFqName(StandardNames.FqNames._byte)
val short = typeByFqName(StandardNames.FqNames._short)
val int = typeByFqName(StandardNames.FqNames._int)
val float = typeByFqName(StandardNames.FqNames._float)
val long = typeByFqName(StandardNames.FqNames._long)
val double = typeByFqName(StandardNames.FqNames._double)
val string = typeByFqName(KotlinBuiltInsNames.FqNames.string)
val possiblyNullString = typeByFqName(KotlinBuiltInsNames.FqNames.string, nullability = Nullability.Default)
val string = typeByFqName(StandardNames.FqNames.string)
val possiblyNullString = typeByFqName(StandardNames.FqNames.string, nullability = Nullability.Default)
val unit = typeByFqName(KotlinBuiltInsNames.FqNames.unit)
val nothing = typeByFqName(KotlinBuiltInsNames.FqNames.nothing)
val nullableAny = typeByFqName(KotlinBuiltInsNames.FqNames.any, nullability = Nullability.Nullable)
val unit = typeByFqName(StandardNames.FqNames.unit)
val nothing = typeByFqName(StandardNames.FqNames.nothing)
val nullableAny = typeByFqName(StandardNames.FqNames.any, nullability = Nullability.Nullable)
val javaKlass = typeByFqName(FqNameUnsafe(CommonClassNames.JAVA_LANG_CLASS))
val kotlinClass = typeByFqName(KotlinBuiltInsNames.FqNames.kClass)
val kotlinClass = typeByFqName(StandardNames.FqNames.kClass)
}
fun fromPrimitiveType(primitiveType: JKJavaPrimitiveType) = when (primitiveType.jvmPrimitiveType) {
nj2k/src/org/jetbrains/kotlin/nj2k/types/typesUtils.kt
+21 -21
View File
@@ -9,7 +9,7 @@ import com.intellij.psi.CommonClassNames
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiClassType
import com.intellij.psi.PsiType
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.builtins.PrimitiveType
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName
@@ -119,7 +119,7 @@ fun JKType.isStringType(): Boolean =
fun JKClassSymbol.isStringType(): Boolean =
fqName == CommonClassNames.JAVA_LANG_STRING
|| fqName == KotlinBuiltInsNames.FqNames.string.asString()
|| fqName == StandardNames.FqNames.string.asString()
fun JKJavaPrimitiveType.toLiteralType(): JKLiteralExpression.LiteralType? =
when (this) {
@@ -137,14 +137,14 @@ fun JKJavaPrimitiveType.toLiteralType(): JKLiteralExpression.LiteralType? =
fun JKType.asPrimitiveType(): JKJavaPrimitiveType? =
if (this is JKJavaPrimitiveType) this
else when ((this as? JKClassType)?.classReference?.fqName) {
KotlinBuiltInsNames.FqNames._char.asString(), CommonClassNames.JAVA_LANG_CHARACTER -> JKJavaPrimitiveType.CHAR
KotlinBuiltInsNames.FqNames._boolean.asString(), CommonClassNames.JAVA_LANG_BOOLEAN -> JKJavaPrimitiveType.BOOLEAN
KotlinBuiltInsNames.FqNames._int.asString(), CommonClassNames.JAVA_LANG_INTEGER -> JKJavaPrimitiveType.INT
KotlinBuiltInsNames.FqNames._long.asString(), CommonClassNames.JAVA_LANG_LONG -> JKJavaPrimitiveType.LONG
KotlinBuiltInsNames.FqNames._float.asString(), CommonClassNames.JAVA_LANG_FLOAT -> JKJavaPrimitiveType.FLOAT
KotlinBuiltInsNames.FqNames._double.asString(), CommonClassNames.JAVA_LANG_DOUBLE -> JKJavaPrimitiveType.DOUBLE
KotlinBuiltInsNames.FqNames._byte.asString(), CommonClassNames.JAVA_LANG_BYTE -> JKJavaPrimitiveType.BYTE
KotlinBuiltInsNames.FqNames._short.asString(), CommonClassNames.JAVA_LANG_SHORT -> JKJavaPrimitiveType.SHORT
StandardNames.FqNames._char.asString(), CommonClassNames.JAVA_LANG_CHARACTER -> JKJavaPrimitiveType.CHAR
StandardNames.FqNames._boolean.asString(), CommonClassNames.JAVA_LANG_BOOLEAN -> JKJavaPrimitiveType.BOOLEAN
StandardNames.FqNames._int.asString(), CommonClassNames.JAVA_LANG_INTEGER -> JKJavaPrimitiveType.INT
StandardNames.FqNames._long.asString(), CommonClassNames.JAVA_LANG_LONG -> JKJavaPrimitiveType.LONG
StandardNames.FqNames._float.asString(), CommonClassNames.JAVA_LANG_FLOAT -> JKJavaPrimitiveType.FLOAT
StandardNames.FqNames._double.asString(), CommonClassNames.JAVA_LANG_DOUBLE -> JKJavaPrimitiveType.DOUBLE
StandardNames.FqNames._byte.asString(), CommonClassNames.JAVA_LANG_BYTE -> JKJavaPrimitiveType.BYTE
StandardNames.FqNames._short.asString(), CommonClassNames.JAVA_LANG_SHORT -> JKJavaPrimitiveType.SHORT
else -> null
}
@@ -170,7 +170,7 @@ val primitiveTypes =
fun JKType.arrayFqName(): String =
if (this is JKJavaPrimitiveType)
PrimitiveType.valueOf(jvmPrimitiveType.name).arrayTypeFqName.asString()
else KotlinBuiltInsNames.FqNames.array.asString()
else StandardNames.FqNames.array.asString()
fun JKClassSymbol.isArrayType(): Boolean =
fqName in arrayFqNames
@@ -178,7 +178,7 @@ fun JKClassSymbol.isArrayType(): Boolean =
@OptIn(ExperimentalStdlibApi::class)
private val arrayFqNames = buildList {
JKJavaPrimitiveType.ALL.mapTo(this) { PrimitiveType.valueOf(it.jvmPrimitiveType.name).arrayTypeFqName.asString() }
add(KotlinBuiltInsNames.FqNames.array.asString())
add(StandardNames.FqNames.array.asString())
}
fun JKType.isArrayType() =
@@ -189,19 +189,19 @@ fun JKType.isArrayType() =
}
fun JKType.isUnit() =
safeAs<JKClassType>()?.classReference?.fqName == KotlinBuiltInsNames.FqNames.unit.asString()
safeAs<JKClassType>()?.classReference?.fqName == StandardNames.FqNames.unit.asString()
val JKType.isCollectionType: Boolean
get() = safeAs<JKClassType>()?.classReference?.fqName in collectionFqNames
private val collectionFqNames = setOf(
KotlinBuiltInsNames.FqNames.mutableIterator.asString(),
KotlinBuiltInsNames.FqNames.mutableList.asString(),
KotlinBuiltInsNames.FqNames.mutableCollection.asString(),
KotlinBuiltInsNames.FqNames.mutableSet.asString(),
KotlinBuiltInsNames.FqNames.mutableMap.asString(),
KotlinBuiltInsNames.FqNames.mutableMapEntry.asString(),
KotlinBuiltInsNames.FqNames.mutableListIterator.asString()
StandardNames.FqNames.mutableIterator.asString(),
StandardNames.FqNames.mutableList.asString(),
StandardNames.FqNames.mutableCollection.asString(),
StandardNames.FqNames.mutableSet.asString(),
StandardNames.FqNames.mutableMap.asString(),
StandardNames.FqNames.mutableMapEntry.asString(),
StandardNames.FqNames.mutableListIterator.asString()
)
fun JKType.arrayInnerType(): JKType? =
@@ -231,7 +231,7 @@ fun JKType.replaceJavaClassWithKotlinClassType(symbolProvider: JKSymbolProvider)
applyRecursive { type ->
if (type is JKClassType && type.classReference.fqName == "java.lang.Class") {
JKClassType(
symbolProvider.provideClassSymbol(KotlinBuiltInsNames.FqNames.kClass.toSafe()),
symbolProvider.provideClassSymbol(StandardNames.FqNames.kClass.toSafe()),
type.parameters.map { it.replaceJavaClassWithKotlinClassType(symbolProvider) },
Nullability.NotNull
)