diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.as33 b/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.as33
deleted file mode 100644
index 939c6c53fe5..00000000000
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.as33
+++ /dev/null
@@ -1,3 +0,0 @@
-class IDESettingsFUSCollector {
- // Not whitelisted
-}
diff --git a/idea/resources/META-INF/plugin.xml b/idea/resources/META-INF/plugin.xml
index d0d736ccdc9..d373ce96e45 100644
--- a/idea/resources/META-INF/plugin.xml
+++ b/idea/resources/META-INF/plugin.xml
@@ -110,7 +110,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
-
+
diff --git a/idea/resources/META-INF/plugin.xml.191 b/idea/resources/META-INF/plugin.xml.191
index c52972945a4..b47504db197 100644
--- a/idea/resources/META-INF/plugin.xml.191
+++ b/idea/resources/META-INF/plugin.xml.191
@@ -126,7 +126,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
-
+
diff --git a/idea/resources/META-INF/plugin.xml.192 b/idea/resources/META-INF/plugin.xml.192
index 039b1677f65..457dca0e1d3 100644
--- a/idea/resources/META-INF/plugin.xml.192
+++ b/idea/resources/META-INF/plugin.xml.192
@@ -126,7 +126,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
-
+
diff --git a/idea/resources/META-INF/plugin.xml.201 b/idea/resources/META-INF/plugin.xml.201
index 300c56b0fe7..8df41333a55 100644
--- a/idea/resources/META-INF/plugin.xml.201
+++ b/idea/resources/META-INF/plugin.xml.201
@@ -106,7 +106,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
-
+
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt b/idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt
similarity index 68%
rename from idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt
rename to idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt
index 3a43a444214..2961a07aa3b 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt
+++ b/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
}
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.191 b/idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt.191
similarity index 100%
rename from idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.191
rename to idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt.191
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.as35 b/idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt.as35
similarity index 100%
rename from idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.as35
rename to idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt.as35
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.as36 b/idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt.as36
similarity index 100%
rename from idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.as36
rename to idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt.as36
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.as40 b/idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt.as40
similarity index 100%
rename from idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt.as40
rename to idea/src/org/jetbrains/kotlin/idea/IDESettingsFUSCollector.kt.as40
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCodeInsightWorkspaceSettingsProvider.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCodeInsightWorkspaceSettingsProvider.java
index 1cffa293e44..f0b27ffb8da 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCodeInsightWorkspaceSettingsProvider.java
+++ b/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 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