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

KotlinBuildScriptManipulator: cleanup code

Browse Source
This commit is contained in:
Dmitry Gridin
2019-07-15 13:24:51 +03:00
parent b1d1a4b2e1
commit 46dfff7d82
1 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt
+40 -42
View File
@@ -146,13 +146,13 @@ class KotlinBuildScriptManipulator(
private fun KtBlockExpression.addCompileStdlibIfMissing(stdlibArtifactName: String): KtCallExpression? = private fun KtBlockExpression.addCompileStdlibIfMissing(stdlibArtifactName: String): KtCallExpression? =
findStdLibDependency() findStdLibDependency()
?: addExpressionIfMissing( ?: addExpressionIfMissing(
getCompileDependencySnippet( getCompileDependencySnippet(
KOTLIN_GROUP_ID, KOTLIN_GROUP_ID,
stdlibArtifactName, stdlibArtifactName,
version = "\$$GSK_KOTLIN_VERSION_PROPERTY_NAME" version = "\$$GSK_KOTLIN_VERSION_PROPERTY_NAME"
) )
) as? KtCallExpression ) as? KtCallExpression
private fun addPluginRepositoryExpression(expression: String) { private fun addPluginRepositoryExpression(expression: String) {
scriptFile.getPluginManagementBlock()?.findOrCreateBlock("repositories")?.addExpressionIfMissing(expression) scriptFile.getPluginManagementBlock()?.findOrCreateBlock("repositories")?.addExpressionIfMissing(expression)
@@ -172,7 +172,7 @@ class KotlinBuildScriptManipulator(
?.findOrCreateBlock("resolutionStrategy") ?.findOrCreateBlock("resolutionStrategy")
?.findOrCreateBlock("eachPlugin") ?.findOrCreateBlock("eachPlugin")
?.addExpressionIfMissing( ?.addExpressionIfMissing(
""" """
if (requested.id.id == "$pluginId") { if (requested.id.id == "$pluginId") {
useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}{requested.version}") useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}{requested.version}")
} }
@@ -181,7 +181,12 @@ class KotlinBuildScriptManipulator(
} }
private fun KtBlockExpression.addNoVersionCompileStdlibIfMissing(stdlibArtifactName: String): KtCallExpression? = private fun KtBlockExpression.addNoVersionCompileStdlibIfMissing(stdlibArtifactName: String): KtCallExpression? =
findStdLibDependency() ?: addExpressionIfMissing("implementation(${getKotlinModuleDependencySnippet(stdlibArtifactName, null)})") as? KtCallExpression findStdLibDependency() ?: addExpressionIfMissing(
"implementation(${getKotlinModuleDependencySnippet(
stdlibArtifactName,
null
)})"
) as? KtCallExpression
private fun KtFile.containsCompileStdLib(): Boolean = private fun KtFile.containsCompileStdLib(): Boolean =
findScriptInitializer("dependencies")?.getBlock()?.findStdLibDependency() != null findScriptInitializer("dependencies")?.getBlock()?.findStdLibDependency() != null
@@ -200,10 +205,10 @@ class KotlinBuildScriptManipulator(
private fun KtBlockExpression.findPluginInPluginsGroup(pluginName: String): KtCallExpression? { private fun KtBlockExpression.findPluginInPluginsGroup(pluginName: String): KtCallExpression? {
return PsiTreeUtil.getChildrenOfAnyType( return PsiTreeUtil.getChildrenOfAnyType(
this, this,
KtCallExpression::class.java, KtCallExpression::class.java,
KtBinaryExpression::class.java, KtBinaryExpression::class.java,
KtDotQualifiedExpression::class.java KtDotQualifiedExpression::class.java
).mapNotNull { ).mapNotNull {
when (it) { when (it) {
is KtCallExpression -> it is KtCallExpression -> it
@@ -233,15 +238,14 @@ class KotlinBuildScriptManipulator(
} }
private fun KtScriptInitializer.getBlock(): KtBlockExpression? = private fun KtScriptInitializer.getBlock(): KtBlockExpression? =
PsiTreeUtil.findChildOfType<KtCallExpression>(this, KtCallExpression::class.java)?.getBlock() PsiTreeUtil.findChildOfType(this, KtCallExpression::class.java)?.getBlock()
private fun KtCallExpression.getBlock(): KtBlockExpression? = private fun KtCallExpression.getBlock(): KtBlockExpression? =
(valueArguments.singleOrNull()?.getArgumentExpression() as? KtLambdaExpression)?.bodyExpression (valueArguments.singleOrNull()?.getArgumentExpression() as? KtLambdaExpression)?.bodyExpression
private fun KtFile.getKotlinStdlibVersion(): String? { private fun KtFile.getKotlinStdlibVersion(): String? {
return findScriptInitializer("dependencies")?.getBlock()?.let { return findScriptInitializer("dependencies")?.getBlock()?.let {
val expression = it.findStdLibDependency()?.valueArguments?.firstOrNull()?.getArgumentExpression() when (val expression = it.findStdLibDependency()?.valueArguments?.firstOrNull()?.getArgumentExpression()) {
when (expression) {
is KtCallExpression -> expression.valueArguments.getOrNull(1)?.text?.trim('\"') is KtCallExpression -> expression.valueArguments.getOrNull(1)?.text?.trim('\"')
is KtStringTemplateExpression -> expression.text?.trim('\"')?.substringAfterLast(":")?.removePrefix("$") is KtStringTemplateExpression -> expression.text?.trim('\"')?.substringAfterLast(":")?.removePrefix("$")
else -> null else -> null
@@ -253,7 +257,7 @@ class KotlinBuildScriptManipulator(
return PsiTreeUtil.getChildrenOfType(this, KtCallExpression::class.java)?.find { return PsiTreeUtil.getChildrenOfType(this, KtCallExpression::class.java)?.find {
val calleeText = it.calleeExpression?.text val calleeText = it.calleeExpression?.text
calleeText in PRODUCTION_DEPENDENCY_STATEMENTS && (it.valueArguments.firstOrNull()?.getArgumentExpression()?.isKotlinStdLib() calleeText in PRODUCTION_DEPENDENCY_STATEMENTS && (it.valueArguments.firstOrNull()?.getArgumentExpression()?.isKotlinStdLib()
?: false) ?: false)
} }
} }
@@ -267,22 +271,18 @@ class KotlinBuildScriptManipulator(
else -> false else -> false
} }
private fun KtFile.getPluginManagementBlock(): KtBlockExpression? = private fun KtFile.getPluginManagementBlock(): KtBlockExpression? = findOrCreateScriptInitializer("pluginManagement", true)
findScriptInitializer("pluginManagement")?.getBlock() ?: addTopLevelBlock("pluginManagement", true)
private fun KtFile.getRepositoriesBlock(): KtBlockExpression? = private fun KtFile.getRepositoriesBlock(): KtBlockExpression? = findOrCreateScriptInitializer("repositories")
findScriptInitializer("repositories")?.getBlock() ?: addTopLevelBlock("repositories")
private fun KtFile.getDependenciesBlock(): KtBlockExpression? = private fun KtFile.getDependenciesBlock(): KtBlockExpression? = findOrCreateScriptInitializer("dependencies")
findScriptInitializer("dependencies")?.getBlock() ?: addTopLevelBlock("dependencies")
private fun KtFile.getPluginsBlock(): KtBlockExpression? = private fun KtFile.getPluginsBlock(): KtBlockExpression? = findOrCreateScriptInitializer("plugins", true)
findScriptInitializer("plugins")?.getBlock() ?: addTopLevelBlock("plugins", true)
private fun KtFile.createPluginInPluginsGroupIfMissing(pluginName: String, version: String): KtCallExpression? = private fun KtFile.createPluginInPluginsGroupIfMissing(pluginName: String, version: String): KtCallExpression? =
getPluginsBlock()?.let { getPluginsBlock()?.let {
it.findPluginInPluginsGroup(pluginName) it.findPluginInPluginsGroup(pluginName)
?: it.addExpressionIfMissing("$pluginName version \"$version\"") as? KtCallExpression ?: it.addExpressionIfMissing("$pluginName version \"$version\"") as? KtCallExpression
} }
private fun KtFile.createApplyBlock(): KtBlockExpression? { private fun KtFile.createApplyBlock(): KtBlockExpression? {
@@ -300,7 +300,7 @@ class KotlinBuildScriptManipulator(
private fun KtFile.changeCoroutineConfiguration(coroutineOption: String): PsiElement? { private fun KtFile.changeCoroutineConfiguration(coroutineOption: String): PsiElement? {
val snippet = "experimental.coroutines = Coroutines.${coroutineOption.toUpperCase()}" val snippet = "experimental.coroutines = Coroutines.${coroutineOption.toUpperCase()}"
val kotlinBlock = findScriptInitializer("kotlin")?.getBlock() ?: addTopLevelBlock("kotlin") ?: return null val kotlinBlock = findOrCreateScriptInitializer("kotlin") ?: return null
addImportIfMissing("org.jetbrains.kotlin.gradle.dsl.Coroutines") addImportIfMissing("org.jetbrains.kotlin.gradle.dsl.Coroutines")
val statement = kotlinBlock.statements.find { it.text.startsWith("experimental.coroutines") } val statement = kotlinBlock.statements.find { it.text.startsWith("experimental.coroutines") }
return if (statement != null) { return if (statement != null) {
@@ -363,14 +363,14 @@ class KotlinBuildScriptManipulator(
} }
} }
private fun KtFile.getBuildScriptBlock(): KtBlockExpression? = private fun KtFile.getBuildScriptBlock(): KtBlockExpression? = findOrCreateScriptInitializer("buildscript", true)
findScriptInitializer("buildscript")?.getBlock() ?: addTopLevelBlock("buildscript", true)
private fun KtBlockExpression.getRepositoriesBlock(): KtBlockExpression? = private fun KtFile.findOrCreateScriptInitializer(name: String, first: Boolean = false): KtBlockExpression? =
findBlock("repositories") ?: addBlock("repositories") findScriptInitializer(name)?.getBlock() ?: addTopLevelBlock(name, first)
private fun KtBlockExpression.getDependenciesBlock(): KtBlockExpression? = private fun KtBlockExpression.getRepositoriesBlock(): KtBlockExpression? = findOrCreateBlock("repositories")
findBlock("dependencies") ?: addBlock("dependencies")
private fun KtBlockExpression.getDependenciesBlock(): KtBlockExpression? = findOrCreateBlock("dependencies")
private fun KtBlockExpression.addRepositoryIfMissing(version: String): KtCallExpression? { private fun KtBlockExpression.addRepositoryIfMissing(version: String): KtCallExpression? {
val snippet = getRepositorySnippet(version) ?: return null val snippet = getRepositorySnippet(version) ?: return null
@@ -425,17 +425,15 @@ class KotlinBuildScriptManipulator(
private fun KtFile.addImportIfMissing(path: String): KtImportDirective = private fun KtFile.addImportIfMissing(path: String): KtImportDirective =
importDirectives.find { it.importPath?.pathStr == path } ?: importList?.add( importDirectives.find { it.importPath?.pathStr == path } ?: importList?.add(
psiFactory.createImportDirective( psiFactory.createImportDirective(
ImportPath.fromString( ImportPath.fromString(
path path
)
) )
)
) as KtImportDirective ) as KtImportDirective
private fun KtBlockExpression.addExpressionAfterIfMissing(text: String, after: PsiElement): KtExpression = addStatementIfMissing(text) { private fun KtBlockExpression.addExpressionAfterIfMissing(text: String, after: PsiElement): KtExpression = addStatementIfMissing(text) {
psiFactory.createExpression(it).let { created -> addAfter(psiFactory.createExpression(it), after)
addAfter(created, after)
}
} }
private fun KtBlockExpression.addExpressionIfMissing(text: String, first: Boolean = false): KtExpression = addStatementIfMissing(text) { private fun KtBlockExpression.addExpressionIfMissing(text: String, first: Boolean = false): KtExpression = addStatementIfMissing(text) {
@@ -494,8 +492,8 @@ class KotlinBuildScriptManipulator(
} }
companion object { companion object {
private val STDLIB_ARTIFACT_PREFIX = "org.jetbrains.kotlin:kotlin-stdlib" private const val STDLIB_ARTIFACT_PREFIX = "org.jetbrains.kotlin:kotlin-stdlib"
val GSK_KOTLIN_VERSION_PROPERTY_NAME = "kotlin_version" const val GSK_KOTLIN_VERSION_PROPERTY_NAME = "kotlin_version"
fun getKotlinGradlePluginClassPathSnippet(): String = fun getKotlinGradlePluginClassPathSnippet(): String =
"classpath(${getKotlinModuleDependencySnippet("gradle-plugin", "\$$GSK_KOTLIN_VERSION_PROPERTY_NAME")})" "classpath(${getKotlinModuleDependencySnippet("gradle-plugin", "\$$GSK_KOTLIN_VERSION_PROPERTY_NAME")})"