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

Improve Collection/Array/String detection logic in intentions

Browse Source 
Use static methods from KotlinBuiltIns and check all supertypes, support cases
of Collection, Map and CharSequence
This commit is contained in:
Alexander Udalov
2016-10-21 16:04:49 +03:00
parent a5a422fc4d
commit 2076a31094
11 changed files with 109 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+14 -15
View File
@@ -213,11 +213,6 @@ public abstract class KotlinBuiltIns {
public final FqName mutableMap = collectionsFqName("MutableMap");
public final FqName mutableMapEntry = mutableMap.child(Name.identifier("MutableEntry"));
private final FqNameUnsafe _collection = collection.toUnsafe();
private final FqNameUnsafe _list = list.toUnsafe();
private final FqNameUnsafe _set = set.toUnsafe();
private final FqNameUnsafe _iterable = iterable.toUnsafe();
public final FqNameUnsafe kClass = reflect("KClass");
public final FqNameUnsafe kCallable = reflect("KCallable");
public final FqNameUnsafe kProperty0 = reflect("KProperty0");
@@ -355,7 +350,7 @@ public abstract class KotlinBuiltIns {
}
@NotNull
public ClassDescriptor getPrimitiveClassDescriptor(@NotNull PrimitiveType type) {
private ClassDescriptor getPrimitiveClassDescriptor(@NotNull PrimitiveType type) {
return getBuiltInClassByName(type.getTypeName().asString());
}
@@ -506,11 +501,6 @@ public abstract class KotlinBuiltIns {
return getBuiltInClassByName("String");
}
@NotNull
public ClassDescriptor getCharSequence() {
return getBuiltInClassByName("CharSequence");
}
@NotNull
public ClassDescriptor getComparable() {
return getBuiltInClassByName("Comparable");
@@ -708,6 +698,7 @@ public abstract class KotlinBuiltIns {
}
return arrayType.getArguments().get(0).getType();
}
//noinspection SuspiciousMethodCalls
KotlinType primitiveType = kotlinArrayTypeToPrimitiveKotlinType.get(TypeUtils.makeNotNullable(arrayType));
if (primitiveType == null) {
throw new IllegalStateException("not array: " + arrayType);
@@ -787,6 +778,10 @@ public abstract class KotlinBuiltIns {
return descriptor instanceof ClassDescriptor && classFqNameEquals(descriptor, fqName);
}
private static boolean isConstructedFromGivenClass(@NotNull KotlinType type, @NotNull FqName fqName) {
return isConstructedFromGivenClass(type, fqName.toUnsafe());
}
private static boolean classFqNameEquals(@NotNull ClassifierDescriptor descriptor, @NotNull FqNameUnsafe fqName) {
// Quick check to avoid creation of full FqName instance
return descriptor.getName().equals(fqName.shortName()) &&
@@ -908,19 +903,23 @@ public abstract class KotlinBuiltIns {
}
public static boolean isCollectionOrNullableCollection(@NotNull KotlinType type) {
return isConstructedFromGivenClass(type, FQ_NAMES._collection);
return isConstructedFromGivenClass(type, FQ_NAMES.collection);
}
public static boolean isListOrNullableList(@NotNull KotlinType type) {
return isConstructedFromGivenClass(type, FQ_NAMES._list);
return isConstructedFromGivenClass(type, FQ_NAMES.list);
}
public static boolean isSetOrNullableSet(@NotNull KotlinType type) {
return isConstructedFromGivenClass(type, FQ_NAMES._set);
return isConstructedFromGivenClass(type, FQ_NAMES.set);
}
public static boolean isMapOrNullableMap(@NotNull KotlinType type) {
return isConstructedFromGivenClass(type, FQ_NAMES.map);
}
public static boolean isIterableOrNullableIterable(@NotNull KotlinType type) {
return isConstructedFromGivenClass(type, FQ_NAMES._iterable);
return isConstructedFromGivenClass(type, FQ_NAMES.iterable);
}
public static boolean isKClass(@NotNull ClassDescriptor descriptor) {
idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt
+17 -30
View File
@@ -26,9 +26,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyzeAndGetResult
import org.jetbrains.kotlin.idea.core.ShortenReferences
import org.jetbrains.kotlin.idea.references.mainReference
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.js.descriptorUtils.nameIfStandardType
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.typeRefHelpers.setReceiverTypeReference
import org.jetbrains.kotlin.resolve.BindingContext
@@ -235,42 +233,31 @@ private fun KtExpression.ifBranchesOrThis(): List<KtExpression?> {
return listOf(then) + `else`?.ifBranchesOrThis().orEmpty()
}
private val arrayName = Name.identifier("Array")
private val collectionName = Name.identifier("Collection")
private val stringName = Name.identifier("String")
fun ResolvedCall<out CallableDescriptor>.resolvedToArrayType() =
resultingDescriptor.returnType?.nameIfStandardType == arrayName
fun ResolvedCall<out CallableDescriptor>.resolvedToCollectionType() =
resultingDescriptor.returnType?.constructor?.supertypes?.firstOrNull {
it.nameIfStandardType == collectionName
} != null
fun ResolvedCall<out CallableDescriptor>.resolvedToStringType() =
resultingDescriptor.returnType?.nameIfStandardType == stringName
fun ResolvedCall<out CallableDescriptor>.resolvedToArrayType(): Boolean =
resultingDescriptor.returnType.let { type ->
type != null && (KotlinBuiltIns.isArray(type) || KotlinBuiltIns.isPrimitiveArray(type))
}
fun KtElement?.isZero() = this?.text == "0"
fun KtElement?.isOne() = this?.text == "1"
private fun KtExpression.isExpressionOfTypeOrSubtype(predicate: (KotlinType) -> Boolean): Boolean {
val returnType = getResolvedCall(analyze())?.resultingDescriptor?.returnType
return returnType != null && (returnType.constructor.supertypes + returnType).any(predicate)
}
fun KtElement?.isSizeOrLength(): Boolean {
if (this !is KtDotQualifiedExpression) return false
return when (selectorExpression?.text) {
"size" -> receiverExpression.isArrayOrCollection()
"length" -> receiverExpression.isString()
"size" -> receiverExpression.isExpressionOfTypeOrSubtype { type ->
KotlinBuiltIns.isArray(type) ||
KotlinBuiltIns.isPrimitiveArray(type) ||
KotlinBuiltIns.isCollectionOrNullableCollection(type) ||
KotlinBuiltIns.isMapOrNullableMap(type)
}
"length" -> receiverExpression.isExpressionOfTypeOrSubtype(KotlinBuiltIns::isCharSequenceOrNullableCharSequence)
else -> false
}
}
private fun KtExpression.isArrayOrCollection(): Boolean {
val resolvedCall = getResolvedCall(analyze()) ?: return false
return resolvedCall.resolvedToArrayType() || resolvedCall.resolvedToCollectionType()
}
private fun KtExpression.isString(): Boolean {
val resolvedCall = getResolvedCall(analyze()) ?: return false
return resolvedCall.resolvedToStringType()
}
idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/primitiveArrayEQEQ.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// WITH_RUNTIME
// INTENTION_TEXT: Replace '==' with 'Arrays.equals'
fun foo() {
val a = charArrayOf('a', 'b', 'c')
val b = charArrayOf('a', 'b', 'c')
if (a <caret>== b) {
}
}
idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/primitiveArrayEQEQ.kt.after
Vendored
+10
View File
@@ -0,0 +1,10 @@
import java.util.Arrays
// WITH_RUNTIME
// INTENTION_TEXT: Replace '==' with 'Arrays.equals'
fun foo() {
val a = charArrayOf('a', 'b', 'c')
val b = charArrayOf('a', 'b', 'c')
if (Arrays.equals(a, b)) {
}
}
idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/collection.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// WITH_RUNTIME
fun foo() {
val c: Collection<String> = listOf("")
c.size<caret> > 0
}
idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/collection.kt.after
Vendored
+6
View File
@@ -0,0 +1,6 @@
// WITH_RUNTIME
fun foo() {
val c: Collection<String> = listOf("")
c.isNotEmpty()
}
idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/map.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// WITH_RUNTIME
fun foo() {
val m = mapOf("" to 1)
m.size<caret> > 0
}
idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/map.kt.after
Vendored
+6
View File
@@ -0,0 +1,6 @@
// WITH_RUNTIME
fun foo() {
val m = mapOf("" to 1)
m.isNotEmpty()
}
idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/primitiveArray.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// WITH_RUNTIME
fun foo() {
val a = intArrayOf(1, 2, 3)
a.size<caret> > 0
}
idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/primitiveArray.kt.after
Vendored
+6
View File
@@ -0,0 +1,6 @@
// WITH_RUNTIME
fun foo() {
val a = intArrayOf(1, 2, 3)
a.isNotEmpty()
}
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+24
View File
@@ -11173,6 +11173,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/arrayEQEQ.kt");
doTest(fileName);
}
@TestMetadata("primitiveArrayEQEQ.kt")
public void testPrimitiveArrayEQEQ() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/primitiveArrayEQEQ.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt")
@@ -11567,6 +11573,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName);
}
@TestMetadata("collection.kt")
public void testCollection() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/collection.kt");
doTest(fileName);
}
@TestMetadata("gt.kt")
public void testGt() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/gt.kt");
@@ -11603,6 +11615,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName);
}
@TestMetadata("map.kt")
public void testMap() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/map.kt");
doTest(fileName);
}
@TestMetadata("oppositeSign.kt")
public void testOppositeSign() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/oppositeSign.kt");
@@ -11615,6 +11633,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName);
}
@TestMetadata("primitiveArray.kt")
public void testPrimitiveArray() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/primitiveArray.kt");
doTest(fileName);
}
@TestMetadata("set.kt")
public void testSet() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceSizeCheckWithIsNotEmpty/set.kt");