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

Drop some usages of KotlinBuiltIns.getInstance() in idea module

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-09-21 20:31:25 +03:00
parent f1c76f0467
commit 51113c10b4
30 changed files with 99 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt
+3 -2
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.types.ErrorUtils
import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.types.checker.JetTypeChecker
import org.jetbrains.kotlin.types.typeUtil.builtIns
import org.jetbrains.kotlin.util.capitalizeDecapitalize.decapitalizeSmart
import java.util.*
import java.util.regex.Pattern
@@ -134,7 +135,7 @@ public object KotlinNameSuggester {
private fun MutableCollection<String>.addNamesByType(type: JetType, validator: (String) -> Boolean) {
var type = TypeUtils.makeNotNullable(type) // wipe out '?'
val builtIns = KotlinBuiltIns.getInstance()
val builtIns = type.builtIns
val typeChecker = JetTypeChecker.DEFAULT
if (ErrorUtils.containsErrorType(type)) return
@@ -166,7 +167,7 @@ public object KotlinNameSuggester {
addName("s", validator)
}
else if (KotlinBuiltIns.isArray(type) || KotlinBuiltIns.isPrimitiveArray(type)) {
val elementType = KotlinBuiltIns.getInstance().getArrayElementType(type)
val elementType = builtIns.getArrayElementType(type)
if (typeChecker.equalTypes(builtIns.getBooleanType(), elementType)) {
addName("booleans", validator)
}