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

Refactoring: extract strings

Browse Source
This commit is contained in:
Nikolay Krasko
2016-07-07 17:27:52 +03:00
parent 8acb96fb4d
commit feea1f554a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
+4 -1
View File
@@ -57,7 +57,10 @@ import java.util.Set;
public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfigurator { public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfigurator {
private static final String VERSION_TEMPLATE = "$VERSION$"; private static final String VERSION_TEMPLATE = "$VERSION$";
protected static final String CLASSPATH = "classpath \"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version\""; public static final String GROUP_ID = "org.jetbrains.kotlin";
public static final String GRADLE_PLUGIN_ID = "kotlin-gradle-plugin";
protected static final String CLASSPATH = "classpath \"" + GROUP_ID + ":" + GRADLE_PLUGIN_ID + ":kotlin-gradle-plugin:$kotlin_version\"";
protected static final String SNAPSHOT_REPOSITORY = "maven {\nurl '" + ConfigureKotlinInProjectUtilsKt.SNAPSHOT_REPOSITORY.getUrl() + "'\n}"; protected static final String SNAPSHOT_REPOSITORY = "maven {\nurl '" + ConfigureKotlinInProjectUtilsKt.SNAPSHOT_REPOSITORY.getUrl() + "'\n}";
protected static final String EAP_REPOSITORY = "maven {\nurl '" + ConfigureKotlinInProjectUtilsKt.EAP_REPOSITORY.getUrl() + "'\n}"; protected static final String EAP_REPOSITORY = "maven {\nurl '" + ConfigureKotlinInProjectUtilsKt.EAP_REPOSITORY.getUrl() + "'\n}";
idea/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentKotlinGradleVersionInspection.kt
+7 -3
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.io.FileUtilRt
import com.intellij.util.BooleanFunction import com.intellij.util.BooleanFunction
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.idea.KotlinPluginUtil import org.jetbrains.kotlin.idea.KotlinPluginUtil
import org.jetbrains.kotlin.idea.configuration.KotlinWithGradleConfigurator
import org.jetbrains.kotlin.idea.framework.GRADLE_SYSTEM_ID import org.jetbrains.kotlin.idea.framework.GRADLE_SYSTEM_ID
import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion
import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
@@ -86,7 +87,7 @@ class DifferentKotlinGradleVersionInspection : GradleBaseInspection() {
if (buildScriptCall.invokedExpression.text != "buildscript") return if (buildScriptCall.invokedExpression.text != "buildscript") return
val kotlinPluginStatement = findClassPathStatements(closure).filter { val kotlinPluginStatement = findClassPathStatements(closure).filter {
it.text.contains("org.jetbrains.kotlin:kotlin-gradle-plugin:") it.text.contains(KOTLIN_PLUGIN_CLASSPATH_MARKER)
}.firstOrNull() ?: return }.firstOrNull() ?: return
val kotlinPluginVersion = val kotlinPluginVersion =
@@ -101,6 +102,9 @@ class DifferentKotlinGradleVersionInspection : GradleBaseInspection() {
} }
companion object { companion object {
val KOTLIN_PLUGIN_CLASSPATH_MARKER = "${KotlinWithGradleConfigurator.GROUP_ID}:${KotlinWithGradleConfigurator.GRADLE_PLUGIN_ID}:"
val KOTLIN_PLUGIN_PATH_MARKER = "${KotlinWithGradleConfigurator.GROUP_ID}/${KotlinWithGradleConfigurator.GRADLE_PLUGIN_ID}/"
private fun getHeuristicKotlinPluginVersion(classpathStatement: GrCallExpression): String? { private fun getHeuristicKotlinPluginVersion(classpathStatement: GrCallExpression): String? {
val argument = classpathStatement.getChildrenOfType<GrCommandArgumentList>().firstOrNull() ?: return null val argument = classpathStatement.getChildrenOfType<GrCommandArgumentList>().firstOrNull() ?: return null
val grLiteral = argument.children.firstOrNull()?.let { it as? GrLiteral } ?: return null val grLiteral = argument.children.firstOrNull()?.let { it as? GrLiteral } ?: return null
@@ -183,8 +187,8 @@ class DifferentKotlinGradleVersionInspection : GradleBaseInspection() {
for (classPathEntry in classpathData.classpathEntries) { for (classPathEntry in classpathData.classpathEntries) {
for (path in classPathEntry.classesFile) { for (path in classPathEntry.classesFile) {
val uniformedPath = path.replace('\\', '/') val uniformedPath = path.replace('\\', '/')
if (uniformedPath.contains("org.jetbrains.kotlin/kotlin-gradle-plugin/")) { if (uniformedPath.contains(KOTLIN_PLUGIN_PATH_MARKER)) {
val versionSubstring = uniformedPath.substringAfter("org.jetbrains.kotlin/kotlin-gradle-plugin/").substringBefore('/', "<error>") val versionSubstring = uniformedPath.substringAfter(KOTLIN_PLUGIN_PATH_MARKER).substringBefore('/', "<error>")
if (versionSubstring != "<error>") { if (versionSubstring != "<error>") {
return versionSubstring; return versionSubstring;
} }