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

Android Extensions: Fix availability in Android/JPS projects (KT-17610)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-04-26 19:29:24 +03:00
committed by Yan Zhulanow
parent 63243b99fa
commit 8354d25800
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidPackageFragmentProviderExtension.kt
+8
View File
@@ -45,9 +45,17 @@ class IDEAndroidPackageFragmentProviderExtension(val project: Project) : Android
}
private fun isAndroidExtensionsEnabled(module: Module): Boolean {
// Android Extensions should be always enabled for Android/JPS
if (isLegacyIdeaAndroidModule(module)) return true
val androidGradleFacet = AndroidGradleFacet.getInstance(module) ?: return false
val buildFile = androidGradleFacet.gradleModel?.buildFile ?: return false
val buildGroovyFile = psiManager.findFile(buildFile) as? GroovyFile ?: return false
return GradleBuildFile.getPlugins(buildGroovyFile).contains("kotlin-android-extensions")
}
private fun isLegacyIdeaAndroidModule(module: Module): Boolean {
val facet = AndroidFacet.getInstance(module)
return facet != null && !facet.requiresAndroidModel()
}
}