From 1f3add49f47f2704becb238d5d24e64239db16cf Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Tue, 7 Jul 2020 00:02:58 +0300
Subject: [PATCH] FIR IDE: move trailing comma related registry keys to
 ide-frontend-independent.xml

---
 .../META-INF/extensions/ide-frontend-independent.xml | 12 ++++++++++++
 idea/resources/META-INF/extensions/ide.xml           |  8 --------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/idea/resources/META-INF/extensions/ide-frontend-independent.xml b/idea/resources/META-INF/extensions/ide-frontend-independent.xml
index ca08c1de0a7..c22b31b5eb0 100644
--- a/idea/resources/META-INF/extensions/ide-frontend-independent.xml
+++ b/idea/resources/META-INF/extensions/ide-frontend-independent.xml
@@ -6,4 +6,16 @@
     <extensionPoint qualifiedName="org.jetbrains.kotlin.buildSystemTypeDetector"
                     interface="org.jetbrains.kotlin.idea.configuration.BuildSystemTypeDetector"/>
   </extensionPoints>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <registryKey key="kotlin.formatter.allowTrailingCommaInAnyProject"
+                 description="Allow a trailing comma regardless of plugin version"
+                 defaultValue="false"
+                 restartRequired="false"/>
+    <registryKey key="kotlin.formatter.allowTrailingCommaOnCallSite"
+                 description="Allow a trailing comma on call-site"
+                 defaultValue="false"
+                 restartRequired="false"/>
+
+  </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/idea/resources/META-INF/extensions/ide.xml b/idea/resources/META-INF/extensions/ide.xml
index fa3f84c9e54..a1ab97d1965 100644
--- a/idea/resources/META-INF/extensions/ide.xml
+++ b/idea/resources/META-INF/extensions/ide.xml
@@ -116,14 +116,6 @@
                      description="Add all transitive dependencies on MPP modules when Android project is imported"
                      defaultValue="true"
                      restartRequired="false"/>
-        <registryKey key="kotlin.formatter.allowTrailingCommaInAnyProject"
-                     description="Allow a trailing comma regardless of plugin version"
-                     defaultValue="false"
-                     restartRequired="false"/>
-        <registryKey key="kotlin.formatter.allowTrailingCommaOnCallSite"
-                     description="Allow a trailing comma on call-site"
-                     defaultValue="false"
-                     restartRequired="false"/>
 
         <registryKey key="kotlin.experimental.new.j2k"
                      description="Enable new Java to Kotlin converter"