MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: fix UsagesCollector

Browse Source 
do not report multiple UsageDescriptors with the same key - they will not be merged
This commit is contained in:
Aleksey Pivovarov
2015-11-27 14:03:08 +03:00
parent 1e2728b8ab
commit 29cbe81f8d
1 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/statistics/DiffUsagesCollector.kt
+32 -17
View File
@@ -28,6 +28,7 @@ import com.intellij.util.containers.ContainerUtil
class DiffUsagesCollector : UsagesCollector() {
companion object {
val ID = GroupDescriptor.create("Diff")
val VERSION = 1
}
override fun getGroupId(): GroupDescriptor {
@@ -35,30 +36,44 @@ class DiffUsagesCollector : UsagesCollector() {
}
override fun getUsages(): Set<UsageDescriptor> {
val usages = ContainerUtil.newHashSet<UsageDescriptor>()
val usages: MutableMap<String, Int> = ContainerUtil.newHashMap()
usages["Total"] = 1
listOf(DiffPlaces.DEFAULT, DiffPlaces.CHANGES_VIEW, DiffPlaces.COMMIT_DIALOG).forEach { place ->
val diffSettings = DiffSettingsHolder.getInstance().getSettings(place)
val textSettings = TextDiffSettingsHolder.getInstance().getSettings(place)
usages.increment("TextDiffSettings.IgnorePolicy", textSettings.ignorePolicy)
usages.increment("TextDiffSettings.HighlightPolicy", textSettings.highlightPolicy)
usages.increment("TextDiffSettings.ExpandByDefault", textSettings.isExpandByDefault)
usages.increment("DiffSettings.isUnifiedTool", isUnifiedToolDefault(diffSettings))
}
processUsages(DiffPlaces.DEFAULT, usages)
processUsages(DiffPlaces.CHANGES_VIEW, usages)
processUsages(DiffPlaces.COMMIT_DIALOG, usages)
val diffSettings = DiffSettingsHolder.getInstance().getSettings(null)
usages.add(UsageDescriptor("diff.DiffSettings.Default.IterateNextFile", if (diffSettings.isGoToNextFileOnNextDifference) 1 else 0))
usages.increment("DiffSettings.IterateNextFile", diffSettings.isGoToNextFileOnNextDifference)
return usages
return usages.map { it -> UsageDescriptor("diff.$VERSION.${it.key}", it.value) }.toSet()
}
private fun processUsages(place: String, usages: MutableSet<UsageDescriptor>) {
val diffSettings = DiffSettingsHolder.getInstance().getSettings(place)
val textSettings = TextDiffSettingsHolder.getInstance().getSettings(place)
usages.add(UsageDescriptor("diff.TextDiffSettings.Default.IgnorePolicy." + textSettings.ignorePolicy.name, 1))
usages.add(UsageDescriptor("diff.TextDiffSettings.Default.HighlightPolicy." + textSettings.highlightPolicy.name, 1))
usages.add(UsageDescriptor("diff.TextDiffSettings.Default.ExpandByDefault", if (textSettings.isExpandByDefault) 1 else 0))
val toolOrder = diffSettings.diffToolsOrder
private fun isUnifiedToolDefault(settings: DiffSettingsHolder.DiffSettings): Boolean {
val toolOrder = settings.diffToolsOrder
val defaultToolIndex = ContainerUtil.indexOf(toolOrder, SimpleDiffTool::class.java.canonicalName)
val unifiedToolIndex = ContainerUtil.indexOf(toolOrder, UnifiedDiffTool::class.java.canonicalName)
val isUnifiedDefault = unifiedToolIndex != -1 && unifiedToolIndex < defaultToolIndex
usages.add(UsageDescriptor("diff.DiffSettings.Default.isUnifiedTool", if (isUnifiedDefault) 1 else 0))
return unifiedToolIndex != -1 && unifiedToolIndex < defaultToolIndex
}
private fun MutableMap<String, Int>.increment(key: String) {
put(key, (get(key) ?: 0) + 1)
}
private fun MutableMap<String, Int>.increment(prefix: String, suffix: Enum<*>) {
increment("$prefix.${suffix.name}")
}
private fun MutableMap<String, Int>.increment(key: String, condition: Boolean) {
if (condition) increment(key)
}
}