diff --git a/android-lang-databinding/src/com/android/tools/idea/lang/databinding/model/PsiModelClass.kt b/android-lang-databinding/src/com/android/tools/idea/lang/databinding/model/PsiModelClass.kt index 740af754500..921593650d7 100644 --- a/android-lang-databinding/src/com/android/tools/idea/lang/databinding/model/PsiModelClass.kt +++ b/android-lang-databinding/src/com/android/tools/idea/lang/databinding/model/PsiModelClass.kt @@ -25,6 +25,7 @@ import com.intellij.psi.PsiClass import com.intellij.psi.PsiClassType import com.intellij.psi.PsiSubstitutor import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.util.MethodSignatureUtil import com.intellij.psi.util.TypeConversionUtil @@ -83,7 +84,7 @@ class PsiModelClass(val type: PsiType, val mode: DataBindingMode) { /** * Returns true if this ModelClass represents a void */ - private val isVoid = PsiType.VOID.equalsToText(type.canonicalText) + private val isVoid = PsiTypes.voidType().equalsToText(type.canonicalText) /** * Returns true if this is a type variable. For example, in List<T>, T is a type variable. diff --git a/android-lang-databinding/src/com/android/tools/idea/lang/databinding/model/PsiModelMethod.kt b/android-lang-databinding/src/com/android/tools/idea/lang/databinding/model/PsiModelMethod.kt index 3fada120f90..e4528880b7e 100644 --- a/android-lang-databinding/src/com/android/tools/idea/lang/databinding/model/PsiModelMethod.kt +++ b/android-lang-databinding/src/com/android/tools/idea/lang/databinding/model/PsiModelMethod.kt @@ -17,7 +17,7 @@ package com.android.tools.idea.lang.databinding.model import com.intellij.psi.PsiMethod import com.intellij.psi.PsiModifier -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import java.lang.Integer.min /** @@ -37,7 +37,7 @@ class PsiModelMethod(override val containingClass: PsiModelClass, val psiMethod: val returnType: PsiModelClass? get() = psiMethod.returnType?.let { PsiModelClass(containingClass.substitutor.substitute(it), containingClass.mode) } - val isVoid = PsiType.VOID == psiMethod.returnType + val isVoid = PsiTypes.voidType() == psiMethod.returnType val isPublic = psiMethod.hasModifierProperty(PsiModifier.PUBLIC) diff --git a/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/DataBindingExprReferenceContributor.kt b/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/DataBindingExprReferenceContributor.kt index 999a7f26240..68f18175dbd 100644 --- a/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/DataBindingExprReferenceContributor.kt +++ b/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/DataBindingExprReferenceContributor.kt @@ -57,7 +57,7 @@ import com.intellij.psi.PsiReference import com.intellij.psi.PsiReferenceContributor import com.intellij.psi.PsiReferenceProvider import com.intellij.psi.PsiReferenceRegistrar -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.xml.XmlAttribute import com.intellij.util.ProcessingContext @@ -426,13 +426,13 @@ class DataBindingExprReferenceContributor : PsiReferenceContributor() { override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array { val literalExpr = element as PsiDbLiteralExpr val psiType = when (literalExpr.node.firstChildNode.elementType) { - DbTokenTypes.INTEGER_LITERAL -> PsiType.INT - DbTokenTypes.FLOAT_LITERAL -> PsiType.FLOAT - DbTokenTypes.LONG_LITERAL -> PsiType.LONG - DbTokenTypes.DOUBLE_LITERAL -> PsiType.DOUBLE - DbTokenTypes.TRUE, DbTokenTypes.FALSE -> PsiType.BOOLEAN - DbTokenTypes.NULL -> PsiType.NULL - DbTokenTypes.CHARACTER_LITERAL -> PsiType.CHAR + DbTokenTypes.INTEGER_LITERAL -> PsiTypes.intType() + DbTokenTypes.FLOAT_LITERAL -> PsiTypes.floatType() + DbTokenTypes.LONG_LITERAL -> PsiTypes.longType() + DbTokenTypes.DOUBLE_LITERAL -> PsiTypes.doubleType() + DbTokenTypes.TRUE, DbTokenTypes.FALSE -> PsiTypes.booleanType() + DbTokenTypes.NULL -> PsiTypes.nullType() + DbTokenTypes.CHARACTER_LITERAL -> PsiTypes.charType() DbTokenTypes.STRING_LITERAL -> LayoutBindingTypeUtil.parsePsiType("java.lang.String", element) ?: return arrayOf() else -> return arrayOf() } diff --git a/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/DataBindingXmlAttributeReferenceContributor.kt b/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/DataBindingXmlAttributeReferenceContributor.kt index 12a4181a466..058d768adc5 100644 --- a/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/DataBindingXmlAttributeReferenceContributor.kt +++ b/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/DataBindingXmlAttributeReferenceContributor.kt @@ -34,12 +34,12 @@ import com.intellij.psi.PsiClassObjectAccessExpression import com.intellij.psi.PsiElement import com.intellij.psi.PsiLiteralExpression import com.intellij.psi.PsiMethod -import com.intellij.psi.PsiPrimitiveType import com.intellij.psi.PsiReference import com.intellij.psi.PsiReferenceContributor import com.intellij.psi.PsiReferenceProvider import com.intellij.psi.PsiReferenceRegistrar import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.search.searches.AnnotatedElementsSearch import com.intellij.psi.util.PsiTypesUtil import com.intellij.psi.util.parentOfType @@ -284,7 +284,7 @@ class DataBindingXmlAttributeReferenceContributor : PsiReferenceContributor() { var methodName = (methodAttribute as? PsiLiteralExpression)?.value as? String ?: continue // If method isn't provided, the attribute name is used to find its name, either prefixing with "is" or "get". if (methodName.isEmpty()) { - val methodPrefix = if (attributeType.isAssignableFrom(PsiPrimitiveType.BOOLEAN)) "is" else "get" + val methodPrefix = if (attributeType.isAssignableFrom(PsiTypes.booleanType())) "is" else "get" methodName = methodPrefix + attribute.name.substringAfter(":").usLocaleCapitalize() } for (method in PsiModelClass(type, mode).findMethods(methodName, MemberAccess.ALL_MEMBERS)) { diff --git a/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/PsiResourceReference.kt b/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/PsiResourceReference.kt index f19a9f781ee..8b2fe2a7f0b 100644 --- a/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/PsiResourceReference.kt +++ b/android-lang-databinding/src/com/android/tools/idea/lang/databinding/reference/PsiResourceReference.kt @@ -19,7 +19,7 @@ import com.android.tools.idea.databinding.DataBindingMode import com.android.tools.idea.databinding.util.LayoutBindingTypeUtil import com.android.tools.idea.lang.databinding.model.PsiModelClass import com.intellij.psi.PsiElement -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.impl.source.tree.LeafPsiElement import org.jetbrains.android.dom.resources.ResourceValue @@ -34,7 +34,7 @@ internal class PsiResourceReference(element: PsiElement, resolveTo: PsiElement, // A plurals resource, e.g. @plurals/dog -> "dog" or "dogs", can be queried for the // underlying String value (e.g. "@plurals/dog(2)") or for the plurals resource ID // directly (e.g. "@plurals/dog"). - "plurals" -> if (element.children.isEmpty()) PsiType.INT else parseType("java.lang.String") + "plurals" -> if (element.children.isEmpty()) PsiTypes.intType() else parseType("java.lang.String") "anim" -> parseType("android.view.animation.Animation") "animator" -> parseType("android.animation.Animator") "colorStateList" -> parseType("android.content.res.ColorStateList") @@ -43,10 +43,10 @@ internal class PsiResourceReference(element: PsiElement, resolveTo: PsiElement, "transition" -> parseType("android.transition.Transition") "typedArray" -> parseType("android.content.res.TypedArray") "interpolator" -> parseType("android.view.animation.Interpolator") - "bool" -> PsiType.BOOLEAN - "color", "dimenOffset", "dimenSize", "id", "integer", "layout" -> PsiType.INT - "dimen", "fraction" -> PsiType.FLOAT - "intArray" -> PsiType.INT.createArrayType() + "bool" -> PsiTypes.booleanType() + "color", "dimenOffset", "dimenSize", "id", "integer", "layout" -> PsiTypes.intType() + "dimen", "fraction" -> PsiTypes.floatType() + "intArray" -> PsiTypes.intType().createArrayType() "string" -> parseType("java.lang.String") "stringArray" -> parseType("java.lang.String")?.createArrayType() "text" -> parseType("java.lang.CharSequence") diff --git a/android-lang/src/com/android/tools/idea/lang/proguardR8/psi/ProguardR8PsiImplUtil.kt b/android-lang/src/com/android/tools/idea/lang/proguardR8/psi/ProguardR8PsiImplUtil.kt index 65651278a87..27ff2d9fc07 100644 --- a/android-lang/src/com/android/tools/idea/lang/proguardR8/psi/ProguardR8PsiImplUtil.kt +++ b/android-lang/src/com/android/tools/idea/lang/proguardR8/psi/ProguardR8PsiImplUtil.kt @@ -29,6 +29,7 @@ import com.intellij.psi.PsiParameterList import com.intellij.psi.PsiPrimitiveType import com.intellij.psi.PsiReference import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.impl.source.PsiClassReferenceType import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet @@ -107,15 +108,15 @@ fun resolveSuperPsiClasses(classSpecificationHeader: ProguardR8ClassSpecificatio fun getPsiPrimitive(proguardR8JavaPrimitive: ProguardR8JavaPrimitive): PsiPrimitiveType? { val primitive = proguardR8JavaPrimitive.node.firstChildNode return when (primitive.elementType) { - ProguardR8PsiTypes.BOOLEAN -> PsiPrimitiveType.BOOLEAN - ProguardR8PsiTypes.BYTE -> PsiPrimitiveType.BYTE - ProguardR8PsiTypes.CHAR -> PsiPrimitiveType.CHAR - ProguardR8PsiTypes.SHORT -> PsiPrimitiveType.SHORT - ProguardR8PsiTypes.INT -> PsiPrimitiveType.INT - ProguardR8PsiTypes.LONG -> PsiPrimitiveType.LONG - ProguardR8PsiTypes.FLOAT -> PsiPrimitiveType.FLOAT - ProguardR8PsiTypes.DOUBLE -> PsiPrimitiveType.DOUBLE - ProguardR8PsiTypes.VOID -> PsiPrimitiveType.VOID + ProguardR8PsiTypes.BOOLEAN -> PsiTypes.booleanType() + ProguardR8PsiTypes.BYTE -> PsiTypes.byteType() + ProguardR8PsiTypes.CHAR -> PsiTypes.charType() + ProguardR8PsiTypes.SHORT -> PsiTypes.shortType() + ProguardR8PsiTypes.INT -> PsiTypes.intType() + ProguardR8PsiTypes.LONG -> PsiTypes.longType() + ProguardR8PsiTypes.FLOAT -> PsiTypes.floatType() + ProguardR8PsiTypes.DOUBLE -> PsiTypes.doubleType() + ProguardR8PsiTypes.VOID -> PsiTypes.voidType() else -> { assert(false) { "Couldn't match ProguardR8JavaPrimitive \"${primitive.text}\" to PsiPrimitive" } null @@ -153,7 +154,7 @@ fun matchesPsiType(type: ProguardR8Type, other: PsiType): Boolean { type.javaPrimitive != null -> type.javaPrimitive!!.psiPrimitive == typeToMatch type.qualifiedName != null && typeToMatch is PsiClassReferenceType -> type.qualifiedName!!.resolveToPsiClass() == typeToMatch.resolve() // "%" matches any primitive type ("boolean", "int", etc, but not "void"). - type.anyPrimitiveType != null -> typeToMatch is PsiPrimitiveType && typeToMatch != PsiPrimitiveType.VOID + type.anyPrimitiveType != null -> typeToMatch is PsiPrimitiveType && typeToMatch != PsiTypes.voidType() type.anyNotPrimitiveType != null -> typeToMatch is PsiClassReferenceType type.anyType != null -> true else -> false diff --git a/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8FieldTest.kt b/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8FieldTest.kt index bd6dbb7732f..04b0eeb2aba 100644 --- a/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8FieldTest.kt +++ b/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8FieldTest.kt @@ -24,7 +24,7 @@ import com.android.tools.idea.testing.moveCaret import com.google.common.truth.Truth.assertThat import com.intellij.lang.annotation.HighlightSeverity.ERROR import com.intellij.psi.PsiPolyVariantReference -import com.intellij.psi.PsiPrimitiveType +import com.intellij.psi.PsiTypes import com.intellij.psi.util.parentOfType class ProguardR8FieldsTest : ProguardR8TestCase() { @@ -51,7 +51,7 @@ class ProguardR8FieldsTest : ProguardR8TestCase() { """.trimIndent()) var fieldName = myFixture.file.findElementAt(myFixture.caretOffset)!!.parentOfType()!! assertThat(fieldName.type).isNotNull() - assertThat(fieldName.type!!.matchesPsiType(PsiPrimitiveType.INT)).isTrue() + assertThat(fieldName.type!!.matchesPsiType(PsiTypes.intType())).isTrue() myFixture.moveCaret("my|String") fieldName = myFixture.file.findElementAt(myFixture.caretOffset)!!.parentOfType()!! diff --git a/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8MethodTest.kt b/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8MethodTest.kt index 7ab047101df..e2c91e5f0d5 100644 --- a/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8MethodTest.kt +++ b/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8MethodTest.kt @@ -25,7 +25,7 @@ import com.google.common.truth.Truth.assertThat import com.intellij.lang.annotation.HighlightSeverity.ERROR import com.intellij.psi.PsiMethod import com.intellij.psi.PsiPolyVariantReference -import com.intellij.psi.PsiPrimitiveType +import com.intellij.psi.PsiTypes import com.intellij.psi.util.parentOfType import com.intellij.util.IncorrectOperationException import org.junit.Assert @@ -61,7 +61,7 @@ class ProguardR8MethodTest : ProguardR8TestCase() { var method = myFixture.file.findElementAt(myFixture.caretOffset)!!.parentOfType()!! assertThat(method.type).isNotNull() - assertThat(method.type!!.matchesPsiType(PsiPrimitiveType.INT)).isTrue() + assertThat(method.type!!.matchesPsiType(PsiTypes.intType())).isTrue() myFixture.moveCaret("my|String") method = myFixture.file.findElementAt(myFixture.caretOffset)!!.parentOfType()!! diff --git a/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8PsiImplUtilTest.kt b/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8PsiImplUtilTest.kt index 8147ac2207a..fdedd35ba6b 100644 --- a/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8PsiImplUtilTest.kt +++ b/android-lang/testSrc/com/android/tools/idea/lang/proguardR8/psi/ProguardR8PsiImplUtilTest.kt @@ -22,7 +22,7 @@ import com.android.tools.idea.testing.moveCaret import com.google.common.truth.Truth.assertThat import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiParameterList -import com.intellij.psi.PsiPrimitiveType +import com.intellij.psi.PsiTypes import com.intellij.psi.util.parentOfType class ProguardR8PsiImplUtilTest : ProguardR8TestCase() { @@ -207,14 +207,14 @@ class ProguardR8PsiImplUtilTest : ProguardR8TestCase() { var primitiveType = myFixture.file.findElementAt(myFixture.caretOffset)!!.parentOfType() assertThat(primitiveType).isNotNull() - assertThat(primitiveType!!.psiPrimitive).isEqualTo(PsiPrimitiveType.INT) + assertThat(primitiveType!!.psiPrimitive).isEqualTo(PsiTypes.intType()) myFixture.moveCaret("by|te") primitiveType = myFixture.file.findElementAt(myFixture.caretOffset)!!.parentOfType() assertThat(primitiveType).isNotNull() - assertThat(primitiveType!!.psiPrimitive).isEqualTo(PsiPrimitiveType.BYTE) + assertThat(primitiveType!!.psiPrimitive).isEqualTo(PsiTypes.byteType()) } fun testMatchesPsiType() { @@ -230,7 +230,7 @@ class ProguardR8PsiImplUtilTest : ProguardR8TestCase() { """.trimIndent()) var type = myFixture.file.findElementAt(myFixture.caretOffset)!!.parentOfType()!! - assertThat(type.matchesPsiType(PsiPrimitiveType.BOOLEAN)).isTrue() + assertThat(type.matchesPsiType(PsiTypes.booleanType())).isTrue() myFixture.moveCaret("Str|ing") type = myFixture.file.findElementAt(myFixture.caretOffset)!!.parentOfType()!! @@ -241,13 +241,13 @@ class ProguardR8PsiImplUtilTest : ProguardR8TestCase() { type = myFixture.file.findElementAt(myFixture.caretOffset - 1)!!.parentOfType()!! // String is NOT primitive assertThat(type.matchesPsiType(stringType)).isFalse() - assertThat(type.matchesPsiType(PsiPrimitiveType.LONG)).isTrue() - assertThat(type.matchesPsiType(PsiPrimitiveType.VOID)).isFalse() + assertThat(type.matchesPsiType(PsiTypes.longType())).isTrue() + assertThat(type.matchesPsiType(PsiTypes.voidType())).isFalse() myFixture.moveCaret("*|**") type = myFixture.file.findElementAt(myFixture.caretOffset)!!.parentOfType()!! assertThat(type.matchesPsiType(stringType)).isTrue() - assertThat(type.matchesPsiType(PsiPrimitiveType.LONG)).isTrue() + assertThat(type.matchesPsiType(PsiTypes.longType())).isTrue() } fun testAcceptAnyParameters() { @@ -283,7 +283,7 @@ class ProguardR8PsiImplUtilTest : ProguardR8TestCase() { fun testMatchesParameterList() { val stringFQ = String::class.java.canonicalName - val intFQ = PsiPrimitiveType.INT.name + val intFQ = PsiTypes.intType().name myFixture.configureByText( ProguardR8FileType.INSTANCE, @@ -310,7 +310,7 @@ class ProguardR8PsiImplUtilTest : ProguardR8TestCase() { psiParameters = createParameterList(intFQ, intFQ) assertThat(parameters.matchesPsiParameterList(psiParameters)).isFalse() // (int) != (long) - psiParameters = createParameterList(PsiPrimitiveType.LONG.name) + psiParameters = createParameterList(PsiTypes.longType().name) assertThat(parameters.matchesPsiParameterList(psiParameters)).isFalse() // (int) != () psiParameters = createParameterList() @@ -369,11 +369,11 @@ class ProguardR8PsiImplUtilTest : ProguardR8TestCase() { parameters = myFixture.file.findElementAt(myFixture.caretOffset)!!.parentOfType()!! // (%, String, %) == (int, String, boolean) psiParameters = createParameterList( - intFQ, stringFQ, PsiPrimitiveType.BOOLEAN.name) + intFQ, stringFQ, PsiTypes.booleanType().name) assertThat(parameters.matchesPsiParameterList(psiParameters)).isTrue() // (%, String, %) != (int, String, void) psiParameters = createParameterList( - intFQ, stringFQ, PsiPrimitiveType.VOID.name) + intFQ, stringFQ, PsiTypes.voidType().name) assertThat(parameters.matchesPsiParameterList(psiParameters)).isFalse() // (%, String, %) != (int, String, String) psiParameters = createParameterList( @@ -387,7 +387,7 @@ class ProguardR8PsiImplUtilTest : ProguardR8TestCase() { assertThat(parameters.matchesPsiParameterList(psiParameters)).isTrue() // (...) == (int, String, long[]) psiParameters = createParameterList( - intFQ, stringFQ, "${PsiPrimitiveType.LONG.name}[]") + intFQ, stringFQ, "${PsiTypes.longType().name}[]") assertThat(parameters.matchesPsiParameterList(psiParameters)).isTrue() // (...) == () psiParameters = createParameterList() @@ -400,13 +400,13 @@ class ProguardR8PsiImplUtilTest : ProguardR8TestCase() { assertThat(parameters.matchesPsiParameterList(psiParameters)).isTrue() // (int, ...) == (int, String, long[]) psiParameters = createParameterList( - intFQ, stringFQ, "${PsiPrimitiveType.LONG.name}[]") + intFQ, stringFQ, "${PsiTypes.longType().name}[]") assertThat(parameters.matchesPsiParameterList(psiParameters)).isTrue() // (int, ...) != () psiParameters = createParameterList() assertThat(parameters.matchesPsiParameterList(psiParameters)).isFalse() // (int, ...) != (String, long[]) - psiParameters = createParameterList(stringFQ, "${PsiPrimitiveType.LONG.name}[]") + psiParameters = createParameterList(stringFQ, "${PsiTypes.longType().name}[]") assertThat(parameters.matchesPsiParameterList(psiParameters)).isFalse() myFixture.moveCaret("myMethod(..|., int)") diff --git a/android-lint/src/com/android/tools/idea/lint/inspections/AndroidLintMissingPermissionInspection.java b/android-lint/src/com/android/tools/idea/lint/inspections/AndroidLintMissingPermissionInspection.java index e7a6d65b249..9a07025ed4c 100644 --- a/android-lint/src/com/android/tools/idea/lint/inspections/AndroidLintMissingPermissionInspection.java +++ b/android-lint/src/com/android/tools/idea/lint/inspections/AndroidLintMissingPermissionInspection.java @@ -50,7 +50,7 @@ import com.intellij.psi.PsiLiteralExpression; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiStatement; -import com.intellij.psi.PsiType; +import com.intellij.psi.PsiTypes; import com.intellij.psi.SmartPointerManager; import com.intellij.psi.SmartPsiElementPointer; import com.intellij.psi.codeStyle.CodeStyleManager; @@ -374,7 +374,7 @@ else if (operator == JavaTokenType.XOR) { // or adding more of a skeleton from that article. PsiMethod method = isKotlin ? null : PsiTreeUtil.getParentOfType(call, PsiMethod.class, true); - if (method != null && !PsiType.VOID.equals(method.getReturnType())) { + if (method != null && !PsiTypes.voidType().equals(method.getReturnType())) { sb.append("return TODO"); } else { diff --git a/android-lint/src/com/android/tools/idea/lint/quickFixes/ParcelableQuickFix.java b/android-lint/src/com/android/tools/idea/lint/quickFixes/ParcelableQuickFix.java index 87d98ee90fd..4bd9185c756 100644 --- a/android-lint/src/com/android/tools/idea/lint/quickFixes/ParcelableQuickFix.java +++ b/android-lint/src/com/android/tools/idea/lint/quickFixes/ParcelableQuickFix.java @@ -47,6 +47,7 @@ import com.intellij.psi.PsiReferenceList; import com.intellij.psi.PsiStatement; import com.intellij.psi.PsiType; +import com.intellij.psi.PsiTypes; import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.impl.source.PsiClassReferenceType; @@ -391,7 +392,7 @@ private static boolean isWriteToParcelMethod(@NotNull PsiMethod method) { return method.getName().equals("writeToParcel") && params.getParametersCount() == 2 && params.getParameters()[0].getType().equalsToText(CLASS_PARCEL) && - params.getParameters()[1].getType().equalsToText(PsiType.INT.getCanonicalText()); + params.getParameters()[1].getType().equalsToText(PsiTypes.intType().getCanonicalText()); } private boolean doesSuperClassImplementParcelable() { @@ -594,7 +595,7 @@ else if (isWriteWithParcelableFlags(setter)) { myPersistenceMap.put(myTType, new ParcelableFieldPersistence()); myPersistenceMap.put(myTArrayType, new EfficientParcelableArrayFieldPersistence()); myPersistenceMap.put(myTListType, new EfficientParcelableListFieldPersistence()); - myPersistenceMap.put(PsiType.BOOLEAN, new BooleanFieldPersistence()); + myPersistenceMap.put(PsiTypes.booleanType(), new BooleanFieldPersistence()); } @NotNull @@ -625,7 +626,7 @@ private static boolean isWriteWithParcelableFlags(@NotNull PsiMethod method) { return false; } PsiParameter param = method.getParameterList().getParameters()[1]; - return param.getType().equals(PsiType.INT) && Objects.equals(param.getName(), "parcelableFlags"); + return param.getType().equals(PsiTypes.intType()) && Objects.equals(param.getName(), "parcelableFlags"); } private static boolean isSimpleRead(@NotNull PsiMethod method) { diff --git a/android/src/com/android/tools/idea/actions/annotations/InferAnnotations.kt b/android/src/com/android/tools/idea/actions/annotations/InferAnnotations.kt index 651f11e8fd1..5a66262abec 100644 --- a/android/src/com/android/tools/idea/actions/annotations/InferAnnotations.kt +++ b/android/src/com/android/tools/idea/actions/annotations/InferAnnotations.kt @@ -72,6 +72,7 @@ import com.intellij.psi.PsiModifierListOwner import com.intellij.psi.PsiParameter import com.intellij.psi.PsiPrimitiveType import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.PsiVariable import com.intellij.psi.SmartPointerManager import com.intellij.psi.SmartPsiElementPointer @@ -328,14 +329,14 @@ class InferAnnotations(val settings: InferAnnotationsSettings, val project: Proj // PsiPrimitiveType.getUnboxedType does not work properly when clazz.resolve() returns null if (clazz.resolve() == null) { when (clazz.canonicalText) { - TYPE_BOOLEAN_WRAPPER -> return PsiType.BOOLEAN - TYPE_INTEGER_WRAPPER -> return PsiType.INT - TYPE_BYTE_WRAPPER -> return PsiType.BYTE - TYPE_SHORT_WRAPPER -> return PsiType.SHORT - TYPE_LONG_WRAPPER -> return PsiType.LONG - TYPE_DOUBLE_WRAPPER -> return PsiType.DOUBLE - TYPE_FLOAT_WRAPPER -> return PsiType.FLOAT - TYPE_CHARACTER_WRAPPER -> return PsiType.CHAR + TYPE_BOOLEAN_WRAPPER -> return PsiTypes.booleanType() + TYPE_INTEGER_WRAPPER -> return PsiTypes.intType() + TYPE_BYTE_WRAPPER -> return PsiTypes.byteType() + TYPE_SHORT_WRAPPER -> return PsiTypes.shortType() + TYPE_LONG_WRAPPER -> return PsiTypes.longType() + TYPE_DOUBLE_WRAPPER -> return PsiTypes.doubleType() + TYPE_FLOAT_WRAPPER -> return PsiTypes.floatType() + TYPE_CHARACTER_WRAPPER -> return PsiTypes.charType() } } PsiPrimitiveType.getUnboxedType(clazz)?.let { @@ -667,8 +668,8 @@ class InferAnnotations(val settings: InferAnnotationsSettings, val project: Proj // see a method that takes non-integers, or an actual put method // (2 parameter method where our target is the second parameter and // the name begins with put) we ignore it. - if (PsiType.INT != parameter.type || - parameter.parameterIndex() == 1 && parameters.size == 2 && method.name.startsWith("put") + if (PsiTypes.intType() != parameter.type || + parameter.parameterIndex() == 1 && parameters.size == 2 && method.name.startsWith("put") ) { continue } diff --git a/android/src/com/android/tools/idea/databinding/util/DataBindingUtil.java b/android/src/com/android/tools/idea/databinding/util/DataBindingUtil.java index 1acfddd1e37..54d1c38c059 100644 --- a/android/src/com/android/tools/idea/databinding/util/DataBindingUtil.java +++ b/android/src/com/android/tools/idea/databinding/util/DataBindingUtil.java @@ -42,6 +42,7 @@ import com.intellij.psi.PsiPrimitiveType; import com.intellij.psi.PsiType; import com.intellij.psi.PsiTypeVisitor; +import com.intellij.psi.PsiTypes; import com.intellij.psi.impl.source.PsiClassReferenceType; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlAttributeValue; @@ -213,7 +214,7 @@ public static boolean isGetter(@NotNull PsiMethod psiMethod) { if (returnType == null) { return false; // Null return type indicates a constructor } - return (!returnType.equals(PsiType.VOID) + return (!returnType.equals(PsiTypes.voidType()) && psiMethod.getParameterList().getParametersCount() == 0 && isPrefixedJavaIdentifier(psiMethod.getName(), "get")); } @@ -223,7 +224,7 @@ public static boolean isBooleanGetter(@NotNull PsiMethod psiMethod) { if (returnType == null) { return false; // Null return type indicates a constructor } - return (returnType.equals(PsiType.BOOLEAN) + return (returnType.equals(PsiTypes.booleanType()) && psiMethod.getParameterList().getParametersCount() == 0 && isPrefixedJavaIdentifier(psiMethod.getName(), "is")); } @@ -233,7 +234,7 @@ public static boolean isSetter(@NotNull PsiMethod psiMethod) { if (returnType == null) { return false; // Null return type indicates a constructor } - return (returnType.equals(PsiType.VOID) + return (returnType.equals(PsiTypes.voidType()) && psiMethod.getParameterList().getParametersCount() == 1 && isPrefixedJavaIdentifier(psiMethod.getName(), "set")); } diff --git a/android/src/com/android/tools/idea/lang/IntDefCompletionContributor.kt b/android/src/com/android/tools/idea/lang/IntDefCompletionContributor.kt index c6b7408a745..f55130f37be 100644 --- a/android/src/com/android/tools/idea/lang/IntDefCompletionContributor.kt +++ b/android/src/com/android/tools/idea/lang/IntDefCompletionContributor.kt @@ -35,7 +35,7 @@ import com.intellij.psi.PsiNameValuePair import com.intellij.psi.PsiNamedElement import com.intellij.psi.PsiParameter import com.intellij.psi.PsiReferenceExpression -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.util.CachedValueProvider import com.intellij.psi.util.CachedValuesManager import com.intellij.psi.util.parentOfType @@ -172,7 +172,7 @@ private fun getIntDefValues(calleeElement: PsiElement?, argumentIndex: Int, argu return function?.annotations?.firstNotNullOfOrNull { it.intDefValues } } is PsiMethod -> { - val parameter = calleeElement.parameters.getOrNull(argumentIndex).safeAs()?.takeIf { it.type == PsiType.INT } + val parameter = calleeElement.parameters.getOrNull(argumentIndex).safeAs()?.takeIf { it.type == PsiTypes.intType() } return parameter?.annotations?.firstNotNullOfOrNull { it.intDefValues } } is KtFunction -> { diff --git a/android/src/org/jetbrains/android/AndroidClassMembersImplicitUsagesProvider.java b/android/src/org/jetbrains/android/AndroidClassMembersImplicitUsagesProvider.java index b4db752c028..e4c99ac3467 100644 --- a/android/src/org/jetbrains/android/AndroidClassMembersImplicitUsagesProvider.java +++ b/android/src/org/jetbrains/android/AndroidClassMembersImplicitUsagesProvider.java @@ -24,6 +24,7 @@ import com.intellij.psi.PsiParameterList; import com.intellij.psi.PsiReferenceExpression; import com.intellij.psi.PsiType; +import com.intellij.psi.PsiTypes; import com.intellij.psi.impl.source.PsiClassReferenceType; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; @@ -230,7 +231,7 @@ public boolean isImplicitConstructorUsage(PsiMethod method) { } if (parameterCount > 2) { type = parameters[2].getType(); - if (!PsiType.INT.equals(type)) { + if (!PsiTypes.intType().equals(type)) { return false; } } diff --git a/android/src/org/jetbrains/android/augment/AndroidLightField.kt b/android/src/org/jetbrains/android/augment/AndroidLightField.kt index 618379fb6aa..d4f2a532465 100644 --- a/android/src/org/jetbrains/android/augment/AndroidLightField.kt +++ b/android/src/org/jetbrains/android/augment/AndroidLightField.kt @@ -17,6 +17,7 @@ import com.intellij.psi.PsiFile import com.intellij.psi.PsiModifier import com.intellij.psi.PsiType import com.intellij.psi.PsiTypeElement +import com.intellij.psi.PsiTypes import com.intellij.psi.PsiVariable import com.intellij.psi.impl.ElementPresentationUtil import com.intellij.psi.impl.PsiClassImplUtil @@ -124,7 +125,7 @@ class StyleableAttrLightField( myContext: PsiClass, fieldModifier: FieldModifier, myConstantValue: Any? -) : AndroidLightField(styleableAttrFieldUrl.toFieldName(), myContext, PsiType.INT, fieldModifier, myConstantValue) { +) : AndroidLightField(styleableAttrFieldUrl.toFieldName(), myContext, PsiTypes.intType(), fieldModifier, myConstantValue) { override fun toString(): String { return MoreObjects.toStringHelper(this) diff --git a/android/src/org/jetbrains/android/augment/InnerRClassBase.java b/android/src/org/jetbrains/android/augment/InnerRClassBase.java index 422859513a1..7f485bb1d52 100644 --- a/android/src/org/jetbrains/android/augment/InnerRClassBase.java +++ b/android/src/org/jetbrains/android/augment/InnerRClassBase.java @@ -20,6 +20,7 @@ import com.intellij.psi.PsiElementFactory; import com.intellij.psi.PsiField; import com.intellij.psi.PsiType; +import com.intellij.psi.PsiTypes; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; @@ -46,7 +47,7 @@ public abstract class InnerRClassBase extends AndroidLightInnerClassBase { @Nullable private CachedValue myFieldsCache; - protected static final PsiType INT_ARRAY = PsiType.INT.createArrayType(); + protected static final PsiType INT_ARRAY = PsiTypes.intType().createArrayType(); protected static final Predicate<@NotNull ResourceItem> ACCESSIBLE_RESOURCE_FILTER = resource -> { if (!resource.getNamespace().equals(ResourceNamespace.ANDROID) && resource.getLibraryName() == null) { @@ -127,7 +128,7 @@ protected static PsiField[] buildResourceFields(@NotNull Map PRIMITIVE_TYPES = new ImmutableMap.Builder() - .put(PsiType.BYTE, 'B') - .put(PsiType.CHAR, 'C') - .put(PsiType.DOUBLE, 'D') - .put(PsiType.FLOAT, 'F') - .put(PsiType.INT, 'I') - .put(PsiType.LONG, 'J') - .put(PsiType.SHORT, 'S') - .put(PsiType.BOOLEAN, 'Z') - .put(PsiType.VOID, 'V').build(); + .put(PsiTypes.byteType(), 'B') + .put(PsiTypes.charType(), 'C') + .put(PsiTypes.doubleType(), 'D') + .put(PsiTypes.floatType(), 'F') + .put(PsiTypes.intType(), 'I') + .put(PsiTypes.longType(), 'J') + .put(PsiTypes.shortType(), 'S') + .put(PsiTypes.booleanType(), 'Z') + .put(PsiTypes.voidType(), 'V').build(); /** * @return - java encoding of the given PsiType. diff --git a/codenavigation/testSrc/TraceSignatureConverterTest.kt b/codenavigation/testSrc/TraceSignatureConverterTest.kt index 607bff4cb04..1cc3002382f 100644 --- a/codenavigation/testSrc/TraceSignatureConverterTest.kt +++ b/codenavigation/testSrc/TraceSignatureConverterTest.kt @@ -20,6 +20,7 @@ import com.intellij.psi.PsiArrayType import com.intellij.psi.PsiClassType import com.intellij.psi.PsiType import com.intellij.psi.PsiTypeVisitor +import com.intellij.psi.PsiTypes import org.junit.Test import org.mockito.Mockito.any import org.mockito.Mockito.mock @@ -60,7 +61,7 @@ class TraceSignatureConverterTest { @Test fun convertsPrimitiveToString() { - val str = TraceSignatureConverter.convertToString(PsiType.BYTE) + val str = TraceSignatureConverter.convertToString(PsiTypes.byteType()) assertThat(str).isEqualTo("B") } @@ -91,22 +92,22 @@ class TraceSignatureConverterTest { @Test fun convertsVoidToString() { - val str = TraceSignatureConverter.convertToString(PsiType.VOID) + val str = TraceSignatureConverter.convertToString(PsiTypes.voidType()) assertThat(str).isEqualTo("V") } @Test fun convertsEmptyMethodToString() { - val str = TraceSignatureConverter.getTraceSignature(PsiType.INT, emptyArray()) + val str = TraceSignatureConverter.getTraceSignature(PsiTypes.intType(), emptyArray()) assertThat(str).isEqualTo("()I") } @Test fun convertsMethodToString() { - val str = TraceSignatureConverter.getTraceSignature(PsiType.INT, arrayOf( + val str = TraceSignatureConverter.getTraceSignature(PsiTypes.intType(), arrayOf( createPsiTypeForGeneric("java.util.List", "java.util.List"), createPsiTypeForGeneric("java.util.ArrayList", "java.util.ArrayList"), - PsiType.BOOLEAN, + PsiTypes.booleanType(), PsiArrayType(PsiArrayType(createPsiTypeFor("java.lang.Integer"))) )) @@ -115,7 +116,7 @@ class TraceSignatureConverterTest { @Test fun convertsMethodWithNoReturnValueToString() { - val str = TraceSignatureConverter.getTraceSignature(null, arrayOf(PsiType.BOOLEAN)) + val str = TraceSignatureConverter.getTraceSignature(null, arrayOf(PsiTypes.booleanType())) assertThat(str).isEqualTo("(Z)") } } \ No newline at end of file diff --git a/compose-ide-plugin/src/com/android/tools/compose/ComposeColorAnnotator.kt b/compose-ide-plugin/src/com/android/tools/compose/ComposeColorAnnotator.kt index a8f72e87a96..cbbb8795bf6 100644 --- a/compose-ide-plugin/src/com/android/tools/compose/ComposeColorAnnotator.kt +++ b/compose-ide-plugin/src/com/android/tools/compose/ComposeColorAnnotator.kt @@ -33,7 +33,7 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.command.WriteCommandAction import com.intellij.openapi.editor.markup.GutterIconRenderer import com.intellij.psi.PsiElement -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.util.ui.ColorIcon import org.jetbrains.annotations.VisibleForTesting import org.jetbrains.kotlin.idea.inspections.AbstractRangeInspection.Companion.constantValueOrNull @@ -65,7 +65,7 @@ class ComposeColorAnnotator : Annotator { element is KtCallElement -> { val uElement = element.toUElement(UCallExpression::class.java) ?: return val returnType = uElement.returnType ?: return - if (uElement.kind != UastCallKind.METHOD_CALL || returnType != PsiType.LONG || COLOR_METHOD != uElement.methodName) { + if (uElement.kind != UastCallKind.METHOD_CALL || returnType != PsiTypes.longType() || COLOR_METHOD != uElement.methodName) { return } @@ -330,9 +330,9 @@ private fun floatColorMapToColor(floatColorMap: FloatColorMap): Color? { private fun getConstructorType(arguments: List): ComposeColorConstructor? { val paramType = arguments.firstOrNull()?.getExpressionType() ?: return null return when (arguments.size) { - 1 -> if (PsiType.INT == paramType) ComposeColorConstructor.INT else ComposeColorConstructor.LONG - 3 -> if (PsiType.INT == paramType) ComposeColorConstructor.INT_X3 else ComposeColorConstructor.FLOAT_X3 - 4 -> if (PsiType.INT == paramType) ComposeColorConstructor.INT_X4 else ComposeColorConstructor.FLOAT_X4 + 1 -> if (PsiTypes.intType() == paramType) ComposeColorConstructor.INT else ComposeColorConstructor.LONG + 3 -> if (PsiTypes.intType() == paramType) ComposeColorConstructor.INT_X3 else ComposeColorConstructor.FLOAT_X3 + 4 -> if (PsiTypes.intType() == paramType) ComposeColorConstructor.INT_X4 else ComposeColorConstructor.FLOAT_X4 5 -> ComposeColorConstructor.FLOAT_X4_COLORSPACE else -> null } diff --git a/dagger/src/com/android/tools/idea/dagger/DaggerAnnotatedElementsSearch.kt b/dagger/src/com/android/tools/idea/dagger/DaggerAnnotatedElementsSearch.kt index d8a80a1912a..6f369c9bbaf 100644 --- a/dagger/src/com/android/tools/idea/dagger/DaggerAnnotatedElementsSearch.kt +++ b/dagger/src/com/android/tools/idea/dagger/DaggerAnnotatedElementsSearch.kt @@ -28,6 +28,7 @@ import com.intellij.psi.PsiMethod import com.intellij.psi.PsiModifierListOwner import com.intellij.psi.PsiParameter import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.impl.cache.TypeInfo import com.intellij.psi.impl.compiled.ClsTypeElementImpl import com.intellij.psi.impl.compiled.SignatureParsing @@ -255,7 +256,7 @@ private fun createTypeFromCanonicalText( val javaType = SignatureParsing.parseTypeString(signature, StubBuildingVisitor.GUESSING_MAPPER) val typeInfo = TypeInfo.fromString(javaType, false) - val typeText = TypeInfo.createTypeText(typeInfo) ?: return PsiType.NULL + val typeText = TypeInfo.createTypeText(typeInfo) ?: return PsiTypes.nullType() val type = ClsTypeElementImpl(psiContext, typeText, '\u0000').type return type @@ -273,20 +274,20 @@ private fun KotlinType.toPsi(context: PsiElement): PsiType { // Inspired by KtLightAnnotationsValues.kt#psiType private val kotlinPrimitiveTypeFqNameToPsiType: Map = mapOf( - "kotlin.Int" to PsiType.INT, - "kotlin.Long" to PsiType.LONG, - "kotlin.Short" to PsiType.SHORT, - "kotlin.Boolean" to PsiType.BOOLEAN, - "kotlin.Byte" to PsiType.BYTE, - "kotlin.Char" to PsiType.CHAR, - "kotlin.Double" to PsiType.DOUBLE, - "kotlin.Float" to PsiType.FLOAT, - "kotlin.IntArray" to PsiType.INT.createArrayType(), - "kotlin.LongArray" to PsiType.LONG.createArrayType(), - "kotlin.ShortArray" to PsiType.SHORT.createArrayType(), - "kotlin.BooleanArray" to PsiType.BOOLEAN.createArrayType(), - "kotlin.ByteArray" to PsiType.BYTE.createArrayType(), - "kotlin.CharArray" to PsiType.CHAR.createArrayType(), - "kotlin.DoubleArray" to PsiType.DOUBLE.createArrayType(), - "kotlin.FloatArray" to PsiType.FLOAT.createArrayType() + "kotlin.Int" to PsiTypes.intType(), + "kotlin.Long" to PsiTypes.longType(), + "kotlin.Short" to PsiTypes.shortType(), + "kotlin.Boolean" to PsiTypes.booleanType(), + "kotlin.Byte" to PsiTypes.byteType(), + "kotlin.Char" to PsiTypes.charType(), + "kotlin.Double" to PsiTypes.doubleType(), + "kotlin.Float" to PsiTypes.floatType(), + "kotlin.IntArray" to PsiTypes.intType().createArrayType(), + "kotlin.LongArray" to PsiTypes.longType().createArrayType(), + "kotlin.ShortArray" to PsiTypes.shortType().createArrayType(), + "kotlin.BooleanArray" to PsiTypes.booleanType().createArrayType(), + "kotlin.ByteArray" to PsiTypes.byteType().createArrayType(), + "kotlin.CharArray" to PsiTypes.charType().createArrayType(), + "kotlin.DoubleArray" to PsiTypes.doubleType().createArrayType(), + "kotlin.FloatArray" to PsiTypes.floatType().createArrayType() ) \ No newline at end of file diff --git a/dagger/src/com/android/tools/idea/dagger/DaggerUtil.kt b/dagger/src/com/android/tools/idea/dagger/DaggerUtil.kt index 8414ee83f6c..9e7ad6e2f06 100644 --- a/dagger/src/com/android/tools/idea/dagger/DaggerUtil.kt +++ b/dagger/src/com/android/tools/idea/dagger/DaggerUtil.kt @@ -36,13 +36,14 @@ import com.intellij.psi.PsiModifierListOwner import com.intellij.psi.PsiParameter import com.intellij.psi.PsiPrimitiveType import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.PsiVariable import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.SearchScope import org.jetbrains.kotlin.asJava.elements.KtLightField import org.jetbrains.kotlin.asJava.toLightClass -import org.jetbrains.kotlin.idea.util.findAnnotation import org.jetbrains.kotlin.idea.base.util.module +import org.jetbrains.kotlin.idea.util.findAnnotation import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtAnnotated import org.jetbrains.kotlin.psi.KtClass @@ -313,8 +314,8 @@ val PsiElement?.isAssistedInjectedConstructor: Boolean * True if PsiElement is @AssistedInject-annotated constructor. */ val PsiElement?.isAssistedFactoryMethod: Boolean - get() = (this is PsiMethod && containingClass.isDaggerAssistedFactory && this.returnType?.unboxed != PsiType.VOID) || - (this is KtNamedFunction && containingClass().isDaggerAssistedFactory && this.psiType?.unboxed != PsiType.VOID) + get() = (this is PsiMethod && containingClass.isDaggerAssistedFactory && this.returnType?.unboxed != PsiTypes.voidType()) || + (this is KtNamedFunction && containingClass().isDaggerAssistedFactory && this.psiType?.unboxed != PsiTypes.voidType()) /** * True if PsiElement is Dagger consumer i.e @Inject-annotated field or param of Dagger provider, see [isDaggerProvider]. diff --git a/databinding/src/com/android/tools/idea/databinding/psiclass/LightBindingClass.java b/databinding/src/com/android/tools/idea/databinding/psiclass/LightBindingClass.java index 45ceced47da..16793b421b9 100644 --- a/databinding/src/com/android/tools/idea/databinding/psiclass/LightBindingClass.java +++ b/databinding/src/com/android/tools/idea/databinding/psiclass/LightBindingClass.java @@ -61,6 +61,7 @@ import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiReferenceList; import com.intellij.psi.PsiType; +import com.intellij.psi.PsiTypes; import com.intellij.psi.ResolveState; import com.intellij.psi.XmlRecursiveElementWalkingVisitor; import com.intellij.psi.impl.light.LightField; @@ -484,7 +485,7 @@ private void createVariableMethods(@NotNull Pair variableT String javaName = DataBindingUtil.convertVariableNameToJavaFieldName(variable.getName()); String capitalizedName = StringUtil.capitalize(javaName); - LightMethodBuilder setter = createPublicMethod("set" + capitalizedName, PsiType.VOID); + LightMethodBuilder setter = createPublicMethod("set" + capitalizedName, PsiTypes.voidType()); setter.addParameter(javaName, type); if (myConfig.settersShouldBeAbstract()) { setter.addModifier("abstract"); @@ -519,7 +520,7 @@ private void createStaticMethods(@NotNull List outPsiMethods) { DeprecatableLightMethodBuilder inflate4Params = createPublicStaticMethod("inflate", bindingType, NullabilityType.NONNULL); inflate4Params.addNullabilityParameter("inflater", inflaterType, true); inflate4Params.addNullabilityParameter("root", viewGroupType, false); - inflate4Params.addParameter("attachToRoot", PsiType.BOOLEAN); + inflate4Params.addParameter("attachToRoot", PsiTypes.booleanType()); inflate4Params.addNullabilityParameter("bindingComponent", dataBindingComponentType, false); // Methods receiving DataBindingComponent are deprecated. see: b/116541301. inflate4Params.setDeprecated(true); @@ -527,7 +528,7 @@ private void createStaticMethods(@NotNull List outPsiMethods) { NullabilityLightMethodBuilder inflate3Params = createPublicStaticMethod("inflate", bindingType, NullabilityType.NONNULL); inflate3Params.addNullabilityParameter("inflater", inflaterType, true); inflate3Params.addNullabilityParameter("root", viewGroupType, false); - inflate3Params.addParameter("attachToRoot", PsiType.BOOLEAN); + inflate3Params.addParameter("attachToRoot", PsiTypes.booleanType()); DeprecatableLightMethodBuilder inflate2Params = createPublicStaticMethod("inflate", bindingType, NullabilityType.NONNULL); inflate2Params.addNullabilityParameter("inflater", inflaterType, true); @@ -563,7 +564,7 @@ private void createStaticMethods(@NotNull List outPsiMethods) { NullabilityLightMethodBuilder inflate3Params = createPublicStaticMethod("inflate", bindingType, NullabilityType.NONNULL); inflate3Params.addNullabilityParameter("inflater", inflaterType, true); inflate3Params.addNullabilityParameter("parent", viewGroupType, false); - inflate3Params.addParameter("attachToParent", PsiType.BOOLEAN); + inflate3Params.addParameter("attachToParent", PsiTypes.booleanType()); NullabilityLightMethodBuilder inflate1Param = createPublicStaticMethod("inflate", bindingType, NullabilityType.NONNULL); inflate1Param.addNullabilityParameter("inflater", inflaterType, true); diff --git a/databinding/src/com/android/tools/idea/databinding/psiclass/LightBrClass.kt b/databinding/src/com/android/tools/idea/databinding/psiclass/LightBrClass.kt index b53ad192d48..6d25e4801af 100644 --- a/databinding/src/com/android/tools/idea/databinding/psiclass/LightBrClass.kt +++ b/databinding/src/com/android/tools/idea/databinding/psiclass/LightBrClass.kt @@ -38,7 +38,7 @@ import com.intellij.psi.PsiManager import com.intellij.psi.PsiMethod import com.intellij.psi.PsiModifier import com.intellij.psi.PsiModifierListOwner -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.impl.light.LightField import com.intellij.psi.impl.light.LightIdentifier import com.intellij.psi.search.searches.AnnotatedElementsSearch @@ -132,7 +132,7 @@ class LightBrClass(psiManager: PsiManager, private val facet: AndroidFacet, priv } private fun createPsiField(project: Project, factory: PsiElementFactory, id: String): PsiField { - val field = factory.createField(id, PsiType.INT) + val field = factory.createField(id, PsiTypes.intType()) PsiUtil.setModifierProperty(field, PsiModifier.PUBLIC, true) PsiUtil.setModifierProperty(field, PsiModifier.STATIC, true) PsiUtil.setModifierProperty(field, PsiModifier.FINAL, true) diff --git a/databinding/testSrc/com/android/tools/idea/databinding/DataBindingUtilTest.kt b/databinding/testSrc/com/android/tools/idea/databinding/DataBindingUtilTest.kt index 697f708a5f2..6de5f93bc07 100644 --- a/databinding/testSrc/com/android/tools/idea/databinding/DataBindingUtilTest.kt +++ b/databinding/testSrc/com/android/tools/idea/databinding/DataBindingUtilTest.kt @@ -24,7 +24,7 @@ import com.android.tools.idea.projectsystem.TestProjectSystem import com.android.tools.idea.testing.AndroidProjectRule import com.android.tools.idea.util.androidFacet import com.google.common.truth.Truth.assertThat -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.testFramework.EdtRule import com.intellij.testFramework.RunsInEdt import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture @@ -116,17 +116,17 @@ class DataBindingUtilTest { val boolGetters = modelClass.methods.filter { m -> DataBindingUtil.isBooleanGetter(m) } boolGetters.forEach { method -> assertThat(method.parameters.size).isEqualTo(0) } - boolGetters.forEach { method -> assertThat(method.returnType).isEqualTo(PsiType.BOOLEAN) } + boolGetters.forEach { method -> assertThat(method.returnType).isEqualTo(PsiTypes.booleanType()) } assertThat(boolGetters.map { m -> m.name }).containsExactly("isBoolValue") val getters = modelClass.methods.filter { m -> DataBindingUtil.isGetter(m) } getters.forEach { method -> assertThat(method.parameters.size).isEqualTo(0) } - getters.forEach { method -> assertThat(method.returnType).isNotEqualTo(PsiType.VOID) } + getters.forEach { method -> assertThat(method.returnType).isNotEqualTo(PsiTypes.voidType()) } assertThat(getters.map { m -> m.name }).containsExactly("getBoolValue", "getIntValue", "getStringValue") val setters = modelClass.methods.filter { m -> DataBindingUtil.isSetter(m) } setters.forEach { method -> assertThat(method.parameters.size).isEqualTo(1) } - setters.forEach { method -> assertThat(method.returnType).isEqualTo(PsiType.VOID) } + setters.forEach { method -> assertThat(method.returnType).isEqualTo(PsiTypes.voidType()) } assertThat(setters.map { m -> m.name }).containsExactly("setBoolValue", "setIntValue", "setStringValue") } } \ No newline at end of file diff --git a/databinding/testSrc/com/android/tools/idea/databinding/integration/gradle/GeneratedCodeMatchTest.kt b/databinding/testSrc/com/android/tools/idea/databinding/integration/gradle/GeneratedCodeMatchTest.kt index 78cfaa056e6..120eb4e8d8f 100644 --- a/databinding/testSrc/com/android/tools/idea/databinding/integration/gradle/GeneratedCodeMatchTest.kt +++ b/databinding/testSrc/com/android/tools/idea/databinding/integration/gradle/GeneratedCodeMatchTest.kt @@ -37,6 +37,7 @@ import com.intellij.psi.PsiMethod import com.intellij.psi.PsiModifier import com.intellij.psi.PsiModifierListOwner import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.testFramework.EdtRule import com.intellij.testFramework.RunsInEdt import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture @@ -78,15 +79,15 @@ private object ClassDescriber { PsiModifier.STATIC to Opcodes.ACC_STATIC) private val BASIC_ASM_TYPES: Map = mapOf( - PsiType.VOID to "V", - PsiType.BOOLEAN to "Z", - PsiType.CHAR to "C", - PsiType.BYTE to "B", - PsiType.SHORT to "S", - PsiType.INT to "I", - PsiType.FLOAT to "F", - PsiType.LONG to "J", - PsiType.DOUBLE to "d") + PsiTypes.voidType() to "V", + PsiTypes.booleanType() to "Z", + PsiTypes.charType() to "C", + PsiTypes.byteType() to "B", + PsiTypes.shortType() to "S", + PsiTypes.intType() to "I", + PsiTypes.floatType() to "F", + PsiTypes.longType() to "J", + PsiTypes.doubleType() to "d") private fun PsiType.toAsm(): String { return BASIC_ASM_TYPES[this] ?: if (this is PsiArrayType) { diff --git a/mlkit/src/com/android/tools/idea/mlkit/lightpsi/LightModelClass.java b/mlkit/src/com/android/tools/idea/mlkit/lightpsi/LightModelClass.java index ef9fd372873..37b66002057 100644 --- a/mlkit/src/com/android/tools/idea/mlkit/lightpsi/LightModelClass.java +++ b/mlkit/src/com/android/tools/idea/mlkit/lightpsi/LightModelClass.java @@ -41,6 +41,7 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiType; +import com.intellij.psi.PsiTypes; import com.intellij.psi.impl.light.LightMethodBuilder; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.CachedValue; @@ -175,7 +176,7 @@ private List buildNewInstanceStaticMethods() { private PsiMethod buildCloseMethod() { LightMethodBuilder closeMethod = new NullabilityLightMethodBuilder(getManager(), "close") .addModifier(PsiModifier.PUBLIC) - .setMethodReturnType(PsiType.VOID) + .setMethodReturnType(PsiTypes.voidType()) .setContainingClass(this); closeMethod.setNavigationElement(this); diff --git a/mlkit/src/com/android/tools/idea/mlkit/lightpsi/LightModelGroupClass.java b/mlkit/src/com/android/tools/idea/mlkit/lightpsi/LightModelGroupClass.java index a6847f001de..c3adc622cc9 100644 --- a/mlkit/src/com/android/tools/idea/mlkit/lightpsi/LightModelGroupClass.java +++ b/mlkit/src/com/android/tools/idea/mlkit/lightpsi/LightModelGroupClass.java @@ -33,6 +33,7 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiType; +import com.intellij.psi.PsiTypes; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; @@ -141,14 +142,14 @@ else if (tensorInfo.getFileType() == TensorInfo.FileType.TENSOR_VALUE_LABELS) { return PsiType.getTypeByName(CommonClassNames.JAVA_LANG_STRING, project, scope); } else if (tensorInfo.getDataType() == TensorInfo.DataType.FLOAT32) { - return PsiType.FLOAT; + return PsiTypes.floatType(); } else if (tensorInfo.getDataType() == TensorInfo.DataType.UINT8) { - return PsiType.INT; + return PsiTypes.intType(); } else { Logger.getInstance(LightModelGroupClass.class).warn("Can't find desired data type, fallback to int."); - return PsiType.INT; + return PsiTypes.intType(); } } } diff --git a/nav/safeargs/src/com/android/tools/idea/nav/safeargs/psi/java/SafeArgsLightClassUtils.kt b/nav/safeargs/src/com/android/tools/idea/nav/safeargs/psi/java/SafeArgsLightClassUtils.kt index 26ed2d5aa0f..344f3758bd9 100644 --- a/nav/safeargs/src/com/android/tools/idea/nav/safeargs/psi/java/SafeArgsLightClassUtils.kt +++ b/nav/safeargs/src/com/android/tools/idea/nav/safeargs/psi/java/SafeArgsLightClassUtils.kt @@ -27,6 +27,7 @@ import com.intellij.psi.PsiElementFactory import com.intellij.psi.PsiModifier import com.intellij.psi.PsiPrimitiveType import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.psi.impl.light.LightFieldBuilder import com.intellij.psi.impl.light.LightMethodBuilder import com.intellij.psi.xml.XmlTag @@ -44,9 +45,9 @@ private const val FALLBACK_TYPE = STRING_FQCN private val NAV_TO_JAVA_TYPE_MAP = mapOf( "string" to STRING_FQCN, "string[]" to STRING_FQCN_ARRAY, - "integer" to PsiType.INT.name, + "integer" to PsiTypes.intType().name, "integer[]" to INT_ARRAY, - "reference" to PsiType.INT.name, + "reference" to PsiTypes.intType().name, "reference[]" to INT_ARRAY ) @@ -126,18 +127,18 @@ private fun String.parseReference(): String? { private fun String.parseLong(): String? { if (!endsWith('L')) return null - return substringBeforeLast('L').toLongOrNull()?.let { PsiType.LONG.name } + return substringBeforeLast('L').toLongOrNull()?.let { PsiTypes.longType().name } } private fun String.parseInt(): String? { - return this.toIntOrNull()?.let { PsiType.INT.name } + return this.toIntOrNull()?.let { PsiTypes.intType().name } } private fun String.parseUnsignedInt(): String? { if (!this.startsWith("0x")) return null try { Integer.parseUnsignedInt(this.substring(2), 16) - return PsiType.INT.name + return PsiTypes.intType().name } catch (ignore: NumberFormatException) { return null @@ -145,12 +146,12 @@ private fun String.parseUnsignedInt(): String? { } private fun String.parseFloat(): String? { - return this.toFloatOrNull()?.let { PsiType.FLOAT.name } + return this.toFloatOrNull()?.let { PsiTypes.floatType().name } } private fun String.parseBoolean(): String? { if (this == "true" || this == "false") { - return PsiType.BOOLEAN.name + return PsiTypes.booleanType().name } return null @@ -190,7 +191,7 @@ internal fun PsiClass.createMethod( name: String, navigationElement: PsiElement? = null, modifiers: Array = MODIFIERS_PUBLIC_METHOD, - returnType: PsiType = PsiType.VOID + returnType: PsiType = PsiTypes.voidType() ): LightMethodBuilder { return LightMethodBuilder(manager, JavaLanguage.INSTANCE, name) .setContainingClass(this) diff --git a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/extensions/PsiMethodUtils.kt b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/extensions/PsiMethodUtils.kt index 5d9620241f1..591697876ad 100644 --- a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/extensions/PsiMethodUtils.kt +++ b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/extensions/PsiMethodUtils.kt @@ -35,7 +35,7 @@ fun PsiMethod.checkSignaturesAndReturnType( ) { assertThat(this.name).isEqualTo(name) - if (returnType == PsiType.NULL.name) { + if (returnType == "null") { assertThat(getTypeName(this.returnType)).isNull() } else { diff --git a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightActionBuilderClassTest.kt b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightActionBuilderClassTest.kt index d1fb68094b6..6664a233785 100644 --- a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightActionBuilderClassTest.kt +++ b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightActionBuilderClassTest.kt @@ -21,7 +21,6 @@ import com.android.tools.idea.nav.safeargs.extensions.checkSignaturesAndReturnTy import com.android.tools.idea.res.ResourceRepositoryManager import com.android.tools.idea.testing.findClass import com.google.common.truth.Truth -import com.intellij.psi.PsiType import com.intellij.testFramework.RunsInEdt import org.junit.Rule import org.junit.Test @@ -218,7 +217,7 @@ class LightActionBuilderClassTest { Truth.assertThat(constructors.size).isEqualTo(1) constructors[0].checkSignaturesAndReturnType( name = "ActionFragment1ToFragment2", - returnType = PsiType.NULL.name, + returnType = "null", parameters = listOf( Parameter("overriddenArg", "String"), Parameter("arg", "String") diff --git a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsAndBuilderClassInferredTypeTest.kt b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsAndBuilderClassInferredTypeTest.kt index c4dce4a5a9b..ec2c7a35c26 100644 --- a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsAndBuilderClassInferredTypeTest.kt +++ b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsAndBuilderClassInferredTypeTest.kt @@ -22,7 +22,7 @@ import com.android.tools.idea.nav.safeargs.psi.SafeArgsFeatureVersions import com.android.tools.idea.res.ResourceRepositoryManager import com.android.tools.idea.testing.findClass import com.google.common.truth.Truth.assertThat -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.testFramework.RunsInEdt import org.junit.Rule import org.junit.Test @@ -45,14 +45,14 @@ class LightArgsAndBuilderClassInferredTypeTest( @JvmStatic @Parameterized.Parameters(name = "{0}") fun data() = listOf( - DefaultValueTypeMapping("1", PsiType.INT.name), - DefaultValueTypeMapping("0x21", PsiType.INT.name), - DefaultValueTypeMapping("1f", PsiType.FLOAT.name), - DefaultValueTypeMapping("1L", PsiType.LONG.name), - DefaultValueTypeMapping("true", PsiType.BOOLEAN.name), + DefaultValueTypeMapping("1", PsiTypes.intType().name), + DefaultValueTypeMapping("0x21", PsiTypes.intType().name), + DefaultValueTypeMapping("1f", PsiTypes.floatType().name), + DefaultValueTypeMapping("1L", PsiTypes.longType().name), + DefaultValueTypeMapping("true", PsiTypes.booleanType().name), DefaultValueTypeMapping("someString", "String"), DefaultValueTypeMapping("@null", "String"), - DefaultValueTypeMapping("@resourceType/resourceName", PsiType.INT.name), + DefaultValueTypeMapping("@resourceType/resourceName", PsiTypes.intType().name), DefaultValueTypeMapping("someCustomType", "String"), // custom type can't be recognized DefaultValueTypeMapping("someEnumType", "String") // custom type can't be recognized ) @@ -93,7 +93,7 @@ class LightArgsAndBuilderClassInferredTypeTest( assertThat(constructors.size).isEqualTo(2) constructors[0].checkSignaturesAndReturnType( name = "Builder", - returnType = PsiType.NULL.name, + returnType = "null", parameters = listOf( Parameter("original", "FragmentArgs") ) @@ -101,7 +101,7 @@ class LightArgsAndBuilderClassInferredTypeTest( constructors[1].checkSignaturesAndReturnType( name = "Builder", - returnType = PsiType.NULL.name + returnType = "null" ) } diff --git a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsAndBuilderClassNullabilityAnnotationTest.kt b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsAndBuilderClassNullabilityAnnotationTest.kt index 8a07d4dcc9b..1b4eb06d74d 100644 --- a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsAndBuilderClassNullabilityAnnotationTest.kt +++ b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsAndBuilderClassNullabilityAnnotationTest.kt @@ -21,7 +21,7 @@ import com.android.tools.idea.nav.safeargs.extensions.checkSignaturesAndReturnTy import com.android.tools.idea.res.ResourceRepositoryManager import com.android.tools.idea.testing.findClass import com.google.common.truth.Truth.assertThat -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.testFramework.RunsInEdt import org.junit.Rule import org.junit.Test @@ -44,12 +44,12 @@ class LightArgsAndBuilderClassNullabilityAnnotationTest( @JvmStatic @Parameterized.Parameters(name = "{0}") fun data() = listOf( - TypeNullabilityMapping("integer", PsiType.INT.name, false), - TypeNullabilityMapping(PsiType.FLOAT.name, false), - TypeNullabilityMapping(PsiType.LONG.name, false), - TypeNullabilityMapping(PsiType.BOOLEAN.name, false), + TypeNullabilityMapping("integer", PsiTypes.intType().name, false), + TypeNullabilityMapping(PsiTypes.floatType().name, false), + TypeNullabilityMapping(PsiTypes.longType().name, false), + TypeNullabilityMapping(PsiTypes.booleanType().name, false), TypeNullabilityMapping("string", "String", true), - TypeNullabilityMapping("reference", PsiType.INT.name, false), + TypeNullabilityMapping("reference", PsiTypes.intType().name, false), TypeNullabilityMapping("test.safeargs.MyCustomType", "MyCustomType", true) // e.g Parcelable, Serializable ) } diff --git a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsBuilderClassConstructorsAndMethodsTest.kt b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsBuilderClassConstructorsAndMethodsTest.kt index 7abd26934f0..ca547a54412 100644 --- a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsBuilderClassConstructorsAndMethodsTest.kt +++ b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsBuilderClassConstructorsAndMethodsTest.kt @@ -21,7 +21,7 @@ import com.android.tools.idea.nav.safeargs.extensions.checkSignaturesAndReturnTy import com.android.tools.idea.res.ResourceRepositoryManager import com.android.tools.idea.testing.findClass import com.google.common.truth.Truth.assertThat -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.testFramework.RunsInEdt import org.junit.Rule import org.junit.Test @@ -42,12 +42,12 @@ class LightArgsBuilderClassConstructorsAndMethodsTest(private val typeMapping: T @JvmStatic @Parameterized.Parameters(name = "{0}") fun data() = listOf( - TypeMapping("integer", PsiType.INT.name), - TypeMapping(PsiType.FLOAT.name), - TypeMapping(PsiType.LONG.name), - TypeMapping(PsiType.BOOLEAN.name), + TypeMapping("integer", PsiTypes.intType().name), + TypeMapping(PsiTypes.floatType().name), + TypeMapping(PsiTypes.longType().name), + TypeMapping(PsiTypes.booleanType().name), TypeMapping("string", "String"), - TypeMapping("reference", PsiType.INT.name), + TypeMapping("reference", PsiTypes.intType().name), TypeMapping("test.safeargs.MyCustomType", "MyCustomType"), // e.g Parcelable, Serializable TypeMapping("test.safeargs.MyEnum", "MyEnum"), TypeMapping("test.safeargs.Outer\$Inner", "Inner"), @@ -101,7 +101,7 @@ class LightArgsBuilderClassConstructorsAndMethodsTest(private val typeMapping: T assertThat(constructors.size).isEqualTo(2) constructors[0].checkSignaturesAndReturnType( name = "Builder", - returnType = PsiType.NULL.name, + returnType = "null", parameters = listOf( Parameter("original", "FragmentArgs") ) @@ -109,7 +109,7 @@ class LightArgsBuilderClassConstructorsAndMethodsTest(private val typeMapping: T constructors[1].checkSignaturesAndReturnType( name = "Builder", - returnType = PsiType.NULL.name, + returnType = "null", parameters = listOf( Parameter("argOne", typeMapping.after), Parameter("argThree", "${typeMapping.after}[]") diff --git a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsClassArgMethodsTest.kt b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsClassArgMethodsTest.kt index 9c5e2fa975d..157a917bd40 100644 --- a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsClassArgMethodsTest.kt +++ b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightArgsClassArgMethodsTest.kt @@ -22,7 +22,7 @@ import com.android.tools.idea.nav.safeargs.psi.SafeArgsFeatureVersions import com.android.tools.idea.res.ResourceRepositoryManager import com.android.tools.idea.testing.findClass import com.google.common.truth.Truth.assertThat -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.testFramework.RunsInEdt import org.junit.Rule import org.junit.Test @@ -43,12 +43,12 @@ class LightArgsClassArgMethodsTest(private val typeMapping: TypeMapping) { @JvmStatic @Parameterized.Parameters(name = "{0}") fun data() = listOf( - TypeMapping("integer", PsiType.INT.name), - TypeMapping(PsiType.FLOAT.name), - TypeMapping(PsiType.LONG.name), - TypeMapping(PsiType.BOOLEAN.name), + TypeMapping("integer", PsiTypes.intType().name), + TypeMapping(PsiTypes.floatType().name), + TypeMapping(PsiTypes.longType().name), + TypeMapping(PsiTypes.booleanType().name), TypeMapping("string", "String"), - TypeMapping("reference", PsiType.INT.name), + TypeMapping("reference", PsiTypes.intType().name), TypeMapping("test.safeargs.MyCustomType", "MyCustomType"), // e.g Parcelable, Serializable TypeMapping("test.safeargs.MyEnum", "MyEnum") ) diff --git a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightDirectionsClassTest.kt b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightDirectionsClassTest.kt index 293628b5cf9..3c874bbbfff 100644 --- a/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightDirectionsClassTest.kt +++ b/nav/safeargs/testSrc/com/android/tools/idea/nav/safeargs/psi/java/LightDirectionsClassTest.kt @@ -22,7 +22,7 @@ import com.android.tools.idea.res.ResourceRepositoryManager import com.android.tools.idea.testing.findClass import com.google.common.truth.Truth.assertThat import com.intellij.psi.PsiMethod -import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypes import com.intellij.testFramework.RunsInEdt import org.junit.Rule import org.junit.Test @@ -159,7 +159,7 @@ class LightDirectionsClassTest { returnType = "ActionFragment1ToFragment2", parameters = listOf( Parameter("argOne", "String"), - Parameter("argTwo", PsiType.FLOAT.name) + Parameter("argTwo", PsiTypes.floatType().name) ) ) } @@ -168,7 +168,7 @@ class LightDirectionsClassTest { name = "actionFragment1ToFragment3", returnType = "ActionFragment1ToFragment3", parameters = listOf( - Parameter("arg", PsiType.INT.name) + Parameter("arg", PsiTypes.intType().name) ) ) } diff --git a/room/src/com/android/tools/idea/room/migrations/generators/JavaMigrationClassGenerator.java b/room/src/com/android/tools/idea/room/migrations/generators/JavaMigrationClassGenerator.java index d1b4dd3c04b..966e3e4d9ca 100644 --- a/room/src/com/android/tools/idea/room/migrations/generators/JavaMigrationClassGenerator.java +++ b/room/src/com/android/tools/idea/room/migrations/generators/JavaMigrationClassGenerator.java @@ -34,6 +34,7 @@ import com.intellij.psi.PsiReferenceList; import com.intellij.psi.PsiStatement; import com.intellij.psi.PsiType; +import com.intellij.psi.PsiTypes; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.search.GlobalSearchScope; @@ -96,7 +97,7 @@ private void addSuperClass(@NotNull PsiClass migrationClass) { private void addMigrationMethod(@NotNull PsiClass migrationClass, @NotNull DatabaseUpdate databaseUpdate) { - PsiMethod migrationMethod = myPsiElementFactory.createMethod(MIGRATION_METHOD_NAME, PsiType.VOID); + PsiMethod migrationMethod = myPsiElementFactory.createMethod(MIGRATION_METHOD_NAME, PsiTypes.voidType()); migrationMethod.getModifierList().addAnnotation(OVERRIDE_ANNOTATION); diff --git a/room/src/com/android/tools/idea/room/migrations/generators/JavaMigrationTestGenerator.java b/room/src/com/android/tools/idea/room/migrations/generators/JavaMigrationTestGenerator.java index 08978e8f0ea..b7a04888b01 100644 --- a/room/src/com/android/tools/idea/room/migrations/generators/JavaMigrationTestGenerator.java +++ b/room/src/com/android/tools/idea/room/migrations/generators/JavaMigrationTestGenerator.java @@ -49,6 +49,7 @@ import com.intellij.psi.PsiPackage; import com.intellij.psi.PsiStatement; import com.intellij.psi.PsiType; +import com.intellij.psi.PsiTypes; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import org.jetbrains.annotations.NotNull; @@ -148,7 +149,8 @@ private void addMigrationTestMethod(@NotNull PsiClass migrationTest, @NotNull String databaseName, int startVersion, int endVersion) { - PsiMethod migrationTestMethod = myPsiElementFactory.createMethod(getMigrationTestMethodName(startVersion, endVersion), PsiType.VOID); + PsiMethod migrationTestMethod = myPsiElementFactory.createMethod(getMigrationTestMethodName(startVersion, endVersion), + PsiTypes.voidType()); migrationTestMethod.getModifierList().addAnnotation(TEST_ANNOTATION_QUALIFIED_NAME); migrationTestMethod.getThrowsList().add( myPsiElementFactory.createFQClassNameReferenceElement(IO_EXCEPTION_QUALIFIED_NAME,