From beba8f215eb34db3fefa7371929c7e5646cc71b0 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 25 Oct 2018 19:54:11 +0200
Subject: [PATCH] fix registry bean registration for ultra-light classes

---
 idea/src/META-INF/jvm.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/idea/src/META-INF/jvm.xml b/idea/src/META-INF/jvm.xml
index 014105f0246..41065356acb 100644
--- a/idea/src/META-INF/jvm.xml
+++ b/idea/src/META-INF/jvm.xml
@@ -137,6 +137,11 @@
         <applicationService
             serviceInterface="org.jetbrains.kotlin.platform.DefaultIdeTargetPlatformKindProvider"
             serviceImplementation="org.jetbrains.kotlin.platform.impl.IdeaDefaultIdeTargetPlatformKindProvider"/>
+
+      <registryKey key="kotlin.use.ultra.light.classes"
+                   description="Whether to use an experimental implementation of Kotlin-as-Java classes"
+                   defaultValue="false"
+                   restartRequired="false"/>
     </extensions>
 
     <extensions defaultExtensionNs="org.jetbrains.uast">
@@ -145,8 +150,7 @@
 
     <extensions defaultExtensionNs="org.jetbrains.kotlin">
         <diagnosticSuppressor implementation="org.jetbrains.kotlin.idea.debugger.DiagnosticSuppressorForDebugger"/>
-
-        <storageComponentContainerContributor implementation="org.jetbrains.kotlin.samWithReceiver.ide.IdeSamWithReceiverComponentContributor"/>
+                                                                    <storageComponentContainerContributor implementation="org.jetbrains.kotlin.samWithReceiver.ide.IdeSamWithReceiverComponentContributor"/>
 
         <declarationAttributeAltererExtension implementation="org.jetbrains.kotlin.allopen.ide.IdeAllOpenDeclarationAttributeAltererExtension"/>
 
@@ -170,10 +174,5 @@
 
         <idePlatformKindTooling implementation="org.jetbrains.kotlin.idea.core.platform.impl.JvmIdePlatformKindTooling"/>
         <idePlatformKindTooling implementation="org.jetbrains.kotlin.idea.core.platform.impl.JsIdePlatformKindTooling"/>
-
-        <registryKey key="kotlin.use.ultra.light.classes"
-                     description="Whether to use an experimental implementation of Kotlin-as-Java classes"
-                     defaultValue="false"
-                     restartRequired="false"/>
     </extensions>
 </idea-plugin>