From 8f69cca2b3b9e5698ced647a8e9648e20b896bb4 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 8 Jul 2019 16:36:02 +0300
Subject: [PATCH] New J2K: enable new J2K by default

---
 idea/resources/META-INF/extensions/ide.xml                | 2 +-
 idea/resources/META-INF/extensions/ide.xml.183            | 2 +-
 idea/resources/META-INF/extensions/ide.xml.as33           | 2 +-
 idea/resources/META-INF/extensions/ide.xml.as34           | 2 +-
 j2k/src/org/jetbrains/kotlin/j2k/J2KConverterExtension.kt | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idea/resources/META-INF/extensions/ide.xml b/idea/resources/META-INF/extensions/ide.xml
index bdfb9d6f73e..1e6608cfc66 100644
--- a/idea/resources/META-INF/extensions/ide.xml
+++ b/idea/resources/META-INF/extensions/ide.xml
@@ -91,7 +91,7 @@
     <extensions defaultExtensionNs="com.intellij">
         <registryKey key="kotlin.use.new.j2k"
                              description="Use new Java to Kotlin Converter (experimental)"
-                             defaultValue="false"
+                             defaultValue="true"
                              restartRequired="false"/>
         <registryKey key="kotlin.mpp.editTargetPlatformEnabled"
                      description="Enable manual editing of MPP target platforms"
diff --git a/idea/resources/META-INF/extensions/ide.xml.183 b/idea/resources/META-INF/extensions/ide.xml.183
index 7d934071cb9..a7130d04be9 100644
--- a/idea/resources/META-INF/extensions/ide.xml.183
+++ b/idea/resources/META-INF/extensions/ide.xml.183
@@ -99,7 +99,7 @@
     <extensions defaultExtensionNs="com.intellij">
         <registryKey key="kotlin.use.new.j2k"
                      description="Use new Java to Kotlin Converter (experimental)"
-                     defaultValue="false"
+                     defaultValue="true"
                      restartRequired="false"/>
     </extensions>
 </idea-plugin>
diff --git a/idea/resources/META-INF/extensions/ide.xml.as33 b/idea/resources/META-INF/extensions/ide.xml.as33
index 9bb7177860f..8b694b6c87f 100644
--- a/idea/resources/META-INF/extensions/ide.xml.as33
+++ b/idea/resources/META-INF/extensions/ide.xml.as33
@@ -91,7 +91,7 @@
     <extensions defaultExtensionNs="com.intellij">
         <registryKey key="kotlin.use.new.j2k"
                    description="Use new Java to Kotlin Converter (experimental)"
-                   defaultValue="false"
+                   defaultValue="true"
                    restartRequired="false"/>
     </extensions>
 </idea-plugin>
diff --git a/idea/resources/META-INF/extensions/ide.xml.as34 b/idea/resources/META-INF/extensions/ide.xml.as34
index f691b0c094a..2ccd753bf9a 100644
--- a/idea/resources/META-INF/extensions/ide.xml.as34
+++ b/idea/resources/META-INF/extensions/ide.xml.as34
@@ -90,7 +90,7 @@
     <extensions defaultExtensionNs="com.intellij">
             <registryKey key="kotlin.use.new.j2k"
                        description="Use new Java to Kotlin Converter (experimental)"
-                       defaultValue="false"
+                       defaultValue="true"
                        restartRequired="false"/>
     </extensions>
 </idea-plugin>
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/J2KConverterExtension.kt b/j2k/src/org/jetbrains/kotlin/j2k/J2KConverterExtension.kt
index 8aec0e605c3..04623d3523e 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/J2KConverterExtension.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/J2KConverterExtension.kt
@@ -30,7 +30,7 @@ abstract class J2kConverterExtension : AbstractExtensionPointBean() {
     ): WithProgressProcessor
 
     companion object {
-        private fun useNewJ2k() = Registry.`is`("kotlin.use.new.j2k", false)
+        private fun useNewJ2k() = Registry.`is`("kotlin.use.new.j2k", true)
 
         val EP_NAME = ExtensionPointName.create<J2kConverterExtension>("org.jetbrains.kotlin.j2kConverterExtension")