From 63f0eae7e2978be5730b1a930c1a2c2ea97a406f Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 27 Aug 2019 20:24:04 +0300
Subject: [PATCH] Remove CodeStyleSettingsProviderCompat.java after removing
 182

 #KT-33536 Fixed
---
 .idea/inspectionProfiles/idea_default.xml     |  1 -
 .../CodeStyleSettingsProviderCompat.java      | 30 -------------------
 .../KotlinCodeStyleGenerationConfigurable.kt  |  3 +-
 .../KotlinCodeStyleSettingsProvider.java      |  2 +-
 4 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/formatter/CodeStyleSettingsProviderCompat.java

diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 8ecbb17d497..a966e9a196f 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -101,7 +101,6 @@
           <Problem reference="com.intellij.util.JdomKt#element" reason="Removed in 191" />
           <Problem reference="com.intellij.execution.JavaRunConfigurationExtensionManager#getInstance" reason="Can't be used in Kotlin, because method was replaced with property after J2K in 183. Use JavaRunConfigurationExtensionManagerUtil instead." />
           <Problem reference="org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler#addSpace" reason="Method was replaced with outher methods in 182. Use addSpaceEx instead." />
-          <Problem reference="com.intellij.psi.codeStyle.CodeStyleSettingsProvider" reason="Additional method is introduced in 183 instead of deprecated one. Use CodeStyleSettingsProviderCompat instead." />
           <Problem reference="com.intellij.openapi.ui.popup.PopupChooserBuilder#PopupChooserBuilder(javax.swing.JList)" reason="Generified in 182. Use PopupChooserBuilderWrapper instead." />
           <Problem reference="com.intellij.openapi.diagnostic.LoggerKt#debugOrInfoIfTestMode" reason="Absent in 182." />
           <Problem reference="com.intellij.psi.search.PsiSearchHelper.SERVICE" reason="Deprecated since 182. Use psiSearchHelperInstance() instead." />
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/CodeStyleSettingsProviderCompat.java b/idea/src/org/jetbrains/kotlin/idea/formatter/CodeStyleSettingsProviderCompat.java
deleted file mode 100644
index 868e3044086..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/CodeStyleSettingsProviderCompat.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2010-2018 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.formatter;
-
-import com.intellij.openapi.options.Configurable;
-import com.intellij.psi.codeStyle.CodeStyleConfigurable;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
-import org.jetbrains.annotations.NotNull;
-
-// Additional method is introduced in 183 instead of deprecated one
-// BUNCH: 182
-@SuppressWarnings({"IncompatibleAPI", "MissingRecentApi"})
-public abstract class CodeStyleSettingsProviderCompat extends CodeStyleSettingsProvider {
-    // Can't use @Override because it's going to be an error in 182
-    @SuppressWarnings("override")
-    @NotNull
-    public abstract CodeStyleConfigurable createConfigurable(@NotNull CodeStyleSettings settings, @NotNull CodeStyleSettings modelSettings);
-
-    // Should be implemented or it's going to be error in 182
-    @SuppressWarnings("deprecation")
-    @Override
-    @NotNull
-    public Configurable createSettingsPage(@NotNull CodeStyleSettings settings, @NotNull  CodeStyleSettings modelSettings) {
-        return createConfigurable(settings, modelSettings);
-    }
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleGenerationConfigurable.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleGenerationConfigurable.kt
index 6ddab7b6bc1..b2c5cf1d792 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleGenerationConfigurable.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleGenerationConfigurable.kt
@@ -9,6 +9,7 @@ import com.intellij.application.options.codeStyle.CommenterForm
 import com.intellij.openapi.application.ApplicationBundle
 import com.intellij.psi.codeStyle.CodeStyleConfigurable
 import com.intellij.psi.codeStyle.CodeStyleSettings
+import com.intellij.psi.codeStyle.CodeStyleSettingsProvider
 import com.intellij.psi.codeStyle.DisplayPriority
 import com.intellij.ui.IdeBorderFactory
 import com.intellij.util.ui.JBInsets
@@ -17,7 +18,7 @@ import javax.swing.BoxLayout
 import javax.swing.JComponent
 import javax.swing.JPanel
 
-class KotlinGenerationSettingsProvider : CodeStyleSettingsProviderCompat() {
+class KotlinGenerationSettingsProvider : CodeStyleSettingsProvider() {
     override fun createConfigurable(settings: CodeStyleSettings, modelSettings: CodeStyleSettings): CodeStyleConfigurable {
         return KotlinCodeStyleGenerationConfigurable(settings)
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
index 99d3032b8eb..40d66df8dc1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.KotlinLanguage;
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings;
 
-public class KotlinCodeStyleSettingsProvider extends CodeStyleSettingsProviderCompat {
+public class KotlinCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
 
     @Override
     public String getConfigurableDisplayName() {