From b19071c9be151bd258f84c95906ee6bbab1c0988 Mon Sep 17 00:00:00 2001
From: "Vitaliy.Bibaev" <vitaliy.bibaev@jetbrains.com>
Date: Wed, 24 Apr 2019 19:29:19 +0300
Subject: [PATCH] [stats-collector] Normalize names of factors in logs

GitOrigin-RevId: 6cece25863b55743e349f6675731ad60a839c249
---
 .../src/com/jetbrains/completion/feature/impl/FeatureUtils.kt  | 2 ++
 .../src/com/intellij/stats/completion/LookupStateManager.kt    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/stats-collector/features/src/com/jetbrains/completion/feature/impl/FeatureUtils.kt b/plugins/stats-collector/features/src/com/jetbrains/completion/feature/impl/FeatureUtils.kt
index 4db391f586bd..b309d37fe93b 100644
--- a/plugins/stats-collector/features/src/com/jetbrains/completion/feature/impl/FeatureUtils.kt
+++ b/plugins/stats-collector/features/src/com/jetbrains/completion/feature/impl/FeatureUtils.kt
@@ -50,6 +50,8 @@ object FeatureUtils {
         return relevanceMap
     }
 
+    fun normalizeFeatureName(name: String): String = name.normalized()
+
     private fun String.normalized(): String {
         return substringBefore('@')
     }
diff --git a/plugins/stats-collector/src/com/intellij/stats/completion/LookupStateManager.kt b/plugins/stats-collector/src/com/intellij/stats/completion/LookupStateManager.kt
index 10fce94cab1c..79bcee0f442d 100644
--- a/plugins/stats-collector/src/com/intellij/stats/completion/LookupStateManager.kt
+++ b/plugins/stats-collector/src/com/intellij/stats/completion/LookupStateManager.kt
@@ -18,6 +18,7 @@ package com.intellij.stats.completion
 
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.impl.LookupImpl
+import com.jetbrains.completion.feature.impl.FeatureUtils
 
 class LookupStateManager {
     private val elementToId = mutableMapOf<String, Int>()
@@ -67,7 +68,7 @@ class LookupStateManager {
         val relevanceObjects = lookup.getRelevanceObjects(this, false)
         return this.map {
             val id = getElementId(it)!!
-            val relevanceMap = relevanceObjects[it]?.map { Pair(it.first, it.second?.toString()) }?.toMap()
+            val relevanceMap = relevanceObjects[it]?.associate { p -> FeatureUtils.normalizeFeatureName(p.first) to p.second?.toString() }
             LookupEntryInfo(id, it.lookupString.length, relevanceMap)
         }
     }