From 1820028086b57efa2d1ed025561147927b28f350 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Sun, 9 Sep 2018 22:34:17 +0300
Subject: [PATCH] Refactoring: extract method for applying codestyle from
 string (KT-23400)

---
 .../idea/formatter/ProjectCodeStyleImporter.kt     | 14 ++++++++++++++
 .../KotlinGradleSourceSetDataService.kt            | 10 ++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/ProjectCodeStyleImporter.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/ProjectCodeStyleImporter.kt
index 96cf2e7a384..6c01de82d3e 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/ProjectCodeStyleImporter.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/ProjectCodeStyleImporter.kt
@@ -12,6 +12,20 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsManager
 import com.intellij.psi.impl.source.codeStyle.CodeStyleSchemesImpl
 
 object ProjectCodeStyleImporter {
+    fun apply(project: Project, codeStyleStr: String?): Boolean {
+        return when (codeStyleStr) {
+            KotlinObsoleteCodeStyle.CODE_STYLE_SETTING -> {
+                ProjectCodeStyleImporter.apply(project, KotlinObsoleteCodeStyle.INSTANCE)
+                true
+            }
+            KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING -> {
+                ProjectCodeStyleImporter.apply(project, KotlinStyleGuideCodeStyle.INSTANCE)
+                true
+            }
+            else -> false
+        }
+    }
+
     fun apply(project: Project, codeStyle: KotlinPredefinedCodeStyle) {
         val schemeManager = CodeStyleSettingsManager.getInstance(project)
         val schemesModel = CodeStyleSchemesModel(project)
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
index cc5a76df964..2e47019f426 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
@@ -149,14 +149,8 @@ class KotlinGradleProjectDataService : AbstractProjectDataService<ModuleData, Vo
             GradleProjectImportHandler.getInstances(project).forEach { it.importByModule(kotlinFacet, moduleNode) }
         }
 
-        val property = GradlePropertiesFileUtils.readProperty(project, GradlePropertiesFileUtils.KOTLIN_CODE_STYLE_GRADLE_SETTING)
-        when (property) {
-            KotlinObsoleteCodeStyle.CODE_STYLE_SETTING ->
-                ProjectCodeStyleImporter.apply(project, KotlinObsoleteCodeStyle.INSTANCE)
-            KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING ->
-                ProjectCodeStyleImporter.apply(project, KotlinStyleGuideCodeStyle.INSTANCE)
-            else -> return
-        }
+        val codeStyleStr = GradlePropertiesFileUtils.readProperty(project, GradlePropertiesFileUtils.KOTLIN_CODE_STYLE_GRADLE_SETTING)
+        ProjectCodeStyleImporter.apply(project, codeStyleStr)
     }
 }