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

Support androidx packages

Browse Source 
... in the IDE plugin and the Android extensions compiler.

Change-Id: Iffd58351b0592e12ffc937c06d871d26958fe161
This commit is contained in:
Raluca Sauciuc
2018-04-06 08:42:17 -07:00
committed by Yan Zhulanow
parent 612baacc25
commit 89d61ee12d
13 changed files with 166 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/src/org/jetbrains/kotlin/android/intention/KotlinAndroidAddStringResource.kt
+2 -1
View File
@@ -54,6 +54,7 @@ class KotlinAndroidAddStringResource : SelfTargetingIntention<KtLiteralStringTem
private val CLASS_CONTEXT = "android.content.Context"
private val CLASS_FRAGMENT = "android.app.Fragment"
private val CLASS_SUPPORT_FRAGMENT = "android.support.v4.app.Fragment"
private val ANDROIDX_CLASS_SUPPORT_FRAGMENT = "androidx.fragment.app.Fragment"
private val CLASS_VIEW = "android.view.View"
private val GET_STRING_METHOD = "getString"
@@ -173,7 +174,7 @@ class KotlinAndroidAddStringResource : SelfTargetingIntention<KtLiteralStringTem
}
private fun needContextReceiver(element: PsiElement): Boolean {
val classesWithGetSting = listOf(CLASS_CONTEXT, CLASS_FRAGMENT, CLASS_SUPPORT_FRAGMENT)
val classesWithGetSting = listOf(CLASS_CONTEXT, CLASS_FRAGMENT, CLASS_SUPPORT_FRAGMENT, ANDROIDX_CLASS_SUPPORT_FRAGMENT)
val viewClass = listOf(CLASS_VIEW)
var parent = PsiTreeUtil.findFirstParent(element, true) { it is KtClassOrObject || it is KtFunction || it is KtLambdaExpression }