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

Refactoring: extract method for applying codestyle from string (KT-23400)

Browse Source
This commit is contained in:
Nikolay Krasko
2018-09-09 22:34:17 +03:00
parent a5e8508e5a
commit 1820028086
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/ProjectCodeStyleImporter.kt
+14
View File
@@ -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)
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
+2 -8
View File
@@ -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)
}
}