From e6905c9b3d3da3a5502a29be716ddbe14c556b5c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 24 May 2018 12:14:54 +0300 Subject: [PATCH] Refactoring: extract function for getting project --- .../KotlinExternalSystemSyncListener.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinExternalSystemSyncListener.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinExternalSystemSyncListener.kt index e68655e3c64..87d24190d0b 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinExternalSystemSyncListener.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinExternalSystemSyncListener.kt @@ -19,22 +19,22 @@ package org.jetbrains.kotlin.idea.configuration import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskId import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotificationListenerAdapter import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskType +import com.intellij.openapi.project.Project import org.jetbrains.kotlin.idea.configuration.ui.KotlinConfigurationCheckerComponent class KotlinExternalSystemSyncListener : ExternalSystemTaskNotificationListenerAdapter() { override fun onStart(id: ExternalSystemTaskId, workingDir: String) { - if (id.type == ExternalSystemTaskType.RESOLVE_PROJECT) { - id.findProject()?.let { project -> - KotlinConfigurationCheckerComponent.getInstance(project).syncStarted() - } - } + val project = id.findResolvedProject() ?: return + KotlinConfigurationCheckerComponent.getInstance(project).syncStarted() } override fun onEnd(id: ExternalSystemTaskId) { - if (id.type == ExternalSystemTaskType.RESOLVE_PROJECT) { - id.findProject()?.let { project -> - KotlinConfigurationCheckerComponent.getInstance(project).syncDone() - } - } + val project = id.findResolvedProject() ?: return + KotlinConfigurationCheckerComponent.getInstance(project).syncDone() } } + +internal fun ExternalSystemTaskId.findResolvedProject(): Project? { + if (type != ExternalSystemTaskType.RESOLVE_PROJECT) return null + return findProject() +}