From a98c6109582251328569f0caa3a318a612691d87 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Tue, 24 Sep 2019 22:01:05 +0200
Subject: [PATCH] Fix KotlinCodeStyleSettings and IDEKotlinBinaryClassCache.kt
 191 compilation

---
 .../core/formatter/KotlinCodeStyleSettings.java   |  4 +---
 .../idea/caches/IDEKotlinBinaryClassCache.kt      | 15 +++++++++++++--
 idea/resources/META-INF/plugin-common.xml         | 14 +++++++++++---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java b/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
index 97e1e1c4bb9..3bee6c33ee1 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.core.formatter;
 
 import com.intellij.application.options.CodeStyle;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.Service;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.InvalidDataException;
@@ -185,8 +184,7 @@ public class KotlinCodeStyleSettings extends CustomCodeStyleSettings {
         return ServiceManager.getService(KotlinCodeStyleSettingsHolder.class).defaultSettings;
     }
 
-    @Service
-    private static final class KotlinCodeStyleSettingsHolder {
+    public static final class KotlinCodeStyleSettingsHolder {
         private final KotlinCodeStyleSettings defaultSettings = new KotlinCodeStyleSettings(new CodeStyleSettings());
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/IDEKotlinBinaryClassCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/IDEKotlinBinaryClassCache.kt
index 33691e25626..9b3a21dc4f9 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/IDEKotlinBinaryClassCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/IDEKotlinBinaryClassCache.kt
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.caches
 
 import com.intellij.ide.highlighter.JavaClassFileType
-import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.components.service
 import com.intellij.openapi.util.Key
@@ -30,7 +29,6 @@ import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
 import org.jetbrains.kotlin.name.ClassId
 
-@Service
 class IDEKotlinBinaryClassCache {
     class KotlinBinaryClassHeaderData(
         val classId: ClassId,
@@ -138,5 +136,18 @@ class IDEKotlinBinaryClassCache {
 
     companion object {
         fun getInstance(): IDEKotlinBinaryClassCache = service()
+//        @JvmStatic @Volatile
+//        private var instance: IDEKotlinBinaryClassCache? = null
+//
+//        fun getInstance(): IDEKotlinBinaryClassCache {
+//            if (instance == null) {
+//                synchronized(IDEKotlinBinaryClassCache::class.java) {
+//                    if (instance == null) {
+//                        instance = IDEKotlinBinaryClassCache()
+//                    }
+//                }
+//            }
+//            return instance!!
+//        }
     }
 }
diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml
index 226ac3993b5..cc75b54c663 100644
--- a/idea/resources/META-INF/plugin-common.xml
+++ b/idea/resources/META-INF/plugin-common.xml
@@ -251,12 +251,20 @@
     <applicationService serviceInterface="org.jetbrains.kotlin.idea.KotlinPluginUpdater"
                         serviceImplementation="org.jetbrains.kotlin.idea.KotlinPluginUpdater"/>
 
-    <projectService serviceInterface="org.jetbrains.kotlin.idea.util.ImportInsertHelper"
-                    serviceImplementation="org.jetbrains.kotlin.idea.util.ImportInsertHelperImpl"/>
-
     <applicationService serviceInterface="org.jetbrains.kotlin.psi.KotlinDeclarationNavigationPolicy"
                         serviceImplementation="org.jetbrains.kotlin.idea.decompiler.navigation.KotlinDeclarationNavigationPolicyImpl"/>
 
+    <!-- since 192 use light service @Service instead of this declaration -->
+    <applicationService serviceInterface="org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache"
+                        serviceImplementation="org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache"/>
+
+    <!-- since 192 use light service @Service instead of this declaration -->
+    <applicationService serviceInterface="org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings$KotlinCodeStyleSettingsHolder"
+                        serviceImplementation="org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings$KotlinCodeStyleSettingsHolder"/>
+
+    <projectService serviceInterface="org.jetbrains.kotlin.idea.util.ImportInsertHelper"
+                    serviceImplementation="org.jetbrains.kotlin.idea.util.ImportInsertHelperImpl"/>
+
     <projectService serviceInterface="org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService"
                     serviceImplementation="org.jetbrains.kotlin.idea.caches.trackers.KotlinIDEModificationTrackerService"/>