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

FIR: fix Gradle configurator exception in total IDE test

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-02-15 20:19:35 +03:00
parent a6297f5f2f
commit 2bc22fc2a6
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt
+10 -4
View File
@@ -87,8 +87,11 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator {
protected fun PsiFile.isKtDsl() = this is KtFile
private fun isFileConfigured(buildScript: PsiFile): Boolean = with(getManipulator(buildScript)) {
isConfiguredWithOldSyntax(kotlinPluginName) || isConfigured(getKotlinPluginExpression(buildScript.isKtDsl()))
private fun isFileConfigured(buildScript: PsiFile): Boolean {
val manipulator = getManipulatorIfAny(buildScript) ?: return false
return with(manipulator) {
isConfiguredWithOldSyntax(kotlinPluginName) || isConfigured(getKotlinPluginExpression(buildScript.isKtDsl()))
}
}
@JvmSuppressWildcards
@@ -289,12 +292,15 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator {
}
companion object {
fun getManipulator(file: PsiFile, preferNewSyntax: Boolean = true): GradleBuildScriptManipulator<*> = when (file) {
fun getManipulatorIfAny(file: PsiFile, preferNewSyntax: Boolean = true): GradleBuildScriptManipulator<*>? = when (file) {
is KtFile -> KotlinBuildScriptManipulator(file, preferNewSyntax)
is GroovyFile -> GroovyBuildScriptManipulator(file, preferNewSyntax)
else -> error("Unknown build script file type (${file::class.qualifiedName})!")
else -> null
}
fun getManipulator(file: PsiFile, preferNewSyntax: Boolean = true): GradleBuildScriptManipulator<*> =
getManipulatorIfAny(file, preferNewSyntax) ?: error("Unknown build script file type (${file::class.qualifiedName})!")
val GROUP_ID = "org.jetbrains.kotlin"
val GRADLE_PLUGIN_ID = "kotlin-gradle-plugin"