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

Properly handle a case when Code Style settings = null

Browse Source
This commit is contained in:
Anton Yalyshev
2020-01-24 09:40:11 +03:00
parent e89893b6fd
commit 0f049fd536
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterUsageCollector.kt
+13 -5
View File
@@ -24,19 +24,27 @@ class KotlinFormatterUsageCollector : ProjectUsagesCollector() {
override fun getMetrics(project: Project): Set<MetricEvent> {
val usedFormatter = getKotlinFormatterKind(project)
val settings = CodeStyle.getSettings(project)
val kotlinCommonSettings = settings.kotlinCommonSettings
val kotlinCustomSettings = settings.kotlinCustomSettings
val data = FeatureUsageData()
.addData("kind", usedFormatter.name)
.addData("defaults", kotlinCustomSettings.CODE_STYLE_DEFAULTS ?: kotlinCommonSettings.CODE_STYLE_DEFAULTS)
.addData("defaults", getDefaultCodeStyle(project))
return setOf(
newMetric("settings", data)
)
}
private fun getDefaultCodeStyle(project: Project): String {
val settings = CodeStyle.getSettings(project)
val kotlinCommonSettings = settings.kotlinCommonSettings
val kotlinCustomSettings = settings.kotlinCustomSettings
val defaults = kotlinCustomSettings.CODE_STYLE_DEFAULTS ?: kotlinCommonSettings.CODE_STYLE_DEFAULTS
return defaults ?: "ide_defaults"
}
companion object {
private val KOTLIN_DEFAULT_COMMON = KotlinLanguageCodeStyleSettingsProvider().defaultCommonSettings