Combine usage of kotlin.ide.settings FUS collector

#KT-38620 Fixed

idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.as33

@@ -1,3 +0,0 @@
-class IDESettingsFUSCollector {
-    // Not whitelisted
-}

idea/resources/META-INF/plugin.xml

@@ -110,7 +110,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
     <statistics.counterUsagesCollector groupId="kotlin.ide.migrationTool" version="1"/>
     <statistics.counterUsagesCollector groupId="kotlin.ide.new.wizard" version="1"/>
     <statistics.counterUsagesCollector groupId="kotlin.gradle.performance" version="1"/>
-    <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.IDESettingsFUSCollector"/>
+    <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.IDESettingsFUSCollector"/>
     <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.formatter.KotlinFormatterUsageCollector"/>
     <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.ProjectConfigurationCollector"/>
 

idea/resources/META-INF/plugin.xml.191

@@ -126,7 +126,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
       <statistics.counterUsagesCollector groupId="kotlin.ide.migrationTool" version="1"/>
       <statistics.counterUsagesCollector groupId="kotlin.ide.new.wizard" version="1"/>
       <statistics.counterUsagesCollector groupId="kotlin.gradle.performance" version="1"/>
-      <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.IDESettingsFUSCollector"/>
+      <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.IDESettingsFUSCollector"/>
       <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.formatter.KotlinFormatterUsageCollector"/>
       <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.ProjectConfigurationCollector"/>
 

idea/resources/META-INF/plugin.xml.192

@@ -126,7 +126,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
       <statistics.counterUsagesCollector groupId="kotlin.ide.migrationTool" version="1"/>
       <statistics.counterUsagesCollector groupId="kotlin.ide.new.wizard" version="1"/>
       <statistics.counterUsagesCollector groupId="kotlin.gradle.performance" version="1"/>
-      <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.IDESettingsFUSCollector"/>
+      <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.IDESettingsFUSCollector"/>
       <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.formatter.KotlinFormatterUsageCollector"/>
       <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.ProjectConfigurationCollector"/>
 

idea/resources/META-INF/plugin.xml.201

@@ -106,7 +106,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
     <statistics.counterUsagesCollector groupId="kotlin.ide.migrationTool" version="1"/>
     <statistics.counterUsagesCollector groupId="kotlin.ide.new.wizard" version="1"/>
     <statistics.counterUsagesCollector groupId="kotlin.gradle.performance" version="1"/>
-    <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.IDESettingsFUSCollector"/>
+    <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.IDESettingsFUSCollector"/>
     <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.formatter.KotlinFormatterUsageCollector"/>
     <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.ProjectConfigurationCollector"/>
 

idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt

@@ -1,15 +1,16 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.statistics
+package org.jetbrains.kotlin.idea
 
 import com.intellij.internal.statistic.beans.MetricEvent
 import com.intellij.internal.statistic.eventLog.FeatureUsageData
 import com.intellij.internal.statistic.service.fus.collectors.ProjectUsagesCollector
 import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.idea.KotlinPluginUtil
+import org.jetbrains.kotlin.idea.codeInsight.KotlinCodeInsightSettings
+import org.jetbrains.kotlin.idea.codeInsight.KotlinCodeInsightWorkspaceSettings
 import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings
 import org.jetbrains.kotlin.idea.project.NewInferenceForIDEAnalysisComponent
 
@@ -24,6 +25,12 @@ class IDESettingsFUSCollector : ProjectUsagesCollector() {
         val scriptingAutoReloadEnabled = KotlinScriptingSettings.getInstance(project).isAutoReloadEnabled
         metrics.add(MetricEvent("scriptingAutoReloadEnabled", flagUsage(scriptingAutoReloadEnabled)))
 
+        val settings: KotlinCodeInsightSettings = KotlinCodeInsightSettings.getInstance()
+        val projectSettings: KotlinCodeInsightWorkspaceSettings = KotlinCodeInsightWorkspaceSettings.getInstance(project)
+
+        metrics.add(MetricEvent("addUnambiguousImportsOnTheFly", flagUsage(settings.addUnambiguousImportsOnTheFly)))
+        metrics.add(MetricEvent("optimizeImportsOnTheFly", flagUsage(projectSettings.optimizeImportsOnTheFly)))
+
         return metrics
     }
 

idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCodeInsightWorkspaceSettingsProvider.java

@@ -56,12 +56,6 @@ public class KotlinCodeInsightWorkspaceSettingsProvider implements AutoImportOpt
 
         projectSettings.optimizeImportsOnTheFly = myOptimizeImportsOnTheFly.isSelected();
         settings.addUnambiguousImportsOnTheFly = myAddUnambiguousImportsOnTheFly.isSelected();
-
-        final Map<String, String> data = new HashMap<>();
-        data.put("optimizeImportsOnTheFly", Boolean.toString(projectSettings.optimizeImportsOnTheFly));
-        data.put("addUnambiguousImportsOnTheFly", Boolean.toString(settings.addUnambiguousImportsOnTheFly));
-
-        KotlinFUSLogger.Companion.log(FUSEventGroups.Settings, "KotlinCodeInsightWorkspaceSettings", data);
     }
 
     @Override