From a561fb85adf06c5ca4b4c524bafe2f29dea8893a Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 3 Sep 2020 21:39:43 +0900 Subject: [PATCH] Pill: minor, fix inspection warnings --- plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt | 2 +- plugins/pill/pill-importer/src/parser.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt index 21bd592faed..fed925ba443 100644 --- a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt +++ b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt @@ -69,7 +69,7 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla platformVersion = project.extensions.extraProperties.get("versions.intellijSdk").toString() platformBaseNumber = platformVersion.substringBefore(".", "").takeIf { it.isNotEmpty() } ?: platformVersion.substringBefore("-", "").takeIf { it.isNotEmpty() } - ?: error("Invalid platform version: $platformVersion") + ?: error("Invalid platform version: $platformVersion") intellijCoreDir = File(platformDir.parentFile.parentFile.parentFile, "intellij-core") isAndroidStudioPlatform = project.extensions.extraProperties.has("versions.androidStudioRelease") } diff --git a/plugins/pill/pill-importer/src/parser.kt b/plugins/pill/pill-importer/src/parser.kt index 6745e9f63bb..fd546b8e26e 100644 --- a/plugins/pill/pill-importer/src/parser.kt +++ b/plugins/pill/pill-importer/src/parser.kt @@ -107,7 +107,7 @@ data class PLibrary( } } -fun parse(project: Project, context: ParserContext): PProject = with(context) { +fun parse(project: Project, context: ParserContext): PProject { if (project != project.rootProject) { error("$project is not a root project") }