From 36b2640ab74120417b00256ede1dae0f46049ff8 Mon Sep 17 00:00:00 2001
From: Alexander Podkhalyuzin <Alexander.Podkhalyuzin@jetbrains.com>
Date: Fri, 18 Jan 2019 14:38:07 +0300
Subject: [PATCH] Removed usages to deprecated API, which is going to be
 removed in 2019.1

---
 idea/resources/META-INF/plugin-common.xml     |  3 --
 .../KotlinFormatterUsageCollector.kt          |  9 ++----
 ...KotlinInlayParameterHintsUsageCollector.kt | 28 -------------------
 3 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinInlayParameterHintsUsageCollector.kt

diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml
index 94583e6ed9f..b7f1af99293 100644
--- a/idea/resources/META-INF/plugin-common.xml
+++ b/idea/resources/META-INF/plugin-common.xml
@@ -3229,9 +3229,6 @@
     <resolveScopeProvider implementation="org.jetbrains.kotlin.idea.core.script.dependencies.KotlinScriptResolveScopeProvider"/>
     <resolveScopeProvider implementation="org.jetbrains.kotlin.idea.core.script.dependencies.ScriptDependenciesResolveScopeProvider"/>
 
-    <statistics.usagesCollector implementation="org.jetbrains.kotlin.idea.formatter.KotlinFormatterUsageCollector" />
-    <statistics.usagesCollector implementation="org.jetbrains.kotlin.idea.parameterInfo.KotlinInlayParameterHintsUsageCollector" />
-
     <checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/>
 
     <!--FUS triggers-->
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterUsageCollector.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterUsageCollector.kt
index 24ddcea4cc1..9427d1244cf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterUsageCollector.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterUsageCollector.kt
@@ -5,8 +5,6 @@
 
 package org.jetbrains.kotlin.idea.formatter
 
-import com.intellij.internal.statistic.AbstractProjectsUsagesCollector
-import com.intellij.internal.statistic.beans.GroupDescriptor
 import com.intellij.internal.statistic.beans.UsageDescriptor
 import com.intellij.internal.statistic.utils.getEnumUsage
 import com.intellij.openapi.project.Project
@@ -15,10 +13,9 @@ import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import org.jetbrains.kotlin.idea.formatter.KotlinFormatterUsageCollector.KotlinFormatterKind.*
 import org.jetbrains.kotlin.idea.util.isDefaultOfficialCodeStyle
 
-class KotlinFormatterUsageCollector : AbstractProjectsUsagesCollector() {
-    override fun getGroupId(): GroupDescriptor = GroupDescriptor.create(GROUP_ID)
-
-    override fun getProjectUsages(project: Project): Set<UsageDescriptor> {
+//todo: convert to FUS?
+class KotlinFormatterUsageCollector {
+    fun getProjectUsages(project: Project): Set<UsageDescriptor> {
         val usedFormatter = getKotlinFormatterKind(project)
 
         val settings = CodeStyleSettingsManager.getSettings(project)
diff --git a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinInlayParameterHintsUsageCollector.kt b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinInlayParameterHintsUsageCollector.kt
deleted file mode 100644
index 2ef105f86b2..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinInlayParameterHintsUsageCollector.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. 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.parameterInfo
-
-import com.intellij.codeInsight.hints.InlayParameterHintsExtension
-import com.intellij.internal.statistic.UsagesCollector
-import com.intellij.internal.statistic.beans.GroupDescriptor
-import com.intellij.internal.statistic.beans.UsageDescriptor
-import org.jetbrains.kotlin.idea.KotlinLanguage
-
-class KotlinInlayParameterHintsUsageCollector : UsagesCollector() {
-    override fun getGroupId(): GroupDescriptor = GroupDescriptor.create(GROUP_ID)
-
-    override fun getUsages(): Set<UsageDescriptor> {
-        val provider = InlayParameterHintsExtension.forLanguage(KotlinLanguage.INSTANCE) ?: return emptySet()
-
-        return provider.supportedOptions.mapTo(LinkedHashSet()) {
-            com.intellij.internal.statistic.utils.getBooleanUsage(it.id, it.get())
-        }
-    }
-
-    companion object {
-        private const val GROUP_ID = "kotlin.hints.inlay"
-    }
-}
\ No newline at end of file