From 282da4cab576a027516cea652d933a096105c470 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 12 Apr 2017 14:11:07 +0200
Subject: [PATCH] Move Kotlin UAST registration to main plugin.xml

The UAST needs to be available also when the Android plugin is disabled.
---
 idea/src/META-INF/android-lint.xml | 4 ----
 idea/src/META-INF/plugin.xml       | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/src/META-INF/android-lint.xml b/idea/src/META-INF/android-lint.xml
index c930aff3dd2..05ef470faeb 100644
--- a/idea/src/META-INF/android-lint.xml
+++ b/idea/src/META-INF/android-lint.xml
@@ -118,8 +118,4 @@
 
         <codeInspection.InspectionExtension implementation="org.jetbrains.android.inspections.klint.AndroidInspectionExtensionsFactory"/>
     </extensions>
-
-    <extensions defaultExtensionNs="org.jetbrains.uast">
-        <uastLanguagePlugin implementation="org.jetbrains.uast.kotlin.KotlinUastLanguagePlugin"/>
-    </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 695207f04db..a8ef8024c22 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -2482,6 +2482,10 @@
 
   </extensions>
 
+  <extensions defaultExtensionNs="org.jetbrains.uast">
+    <uastLanguagePlugin implementation="org.jetbrains.uast.kotlin.KotlinUastLanguagePlugin"/>
+  </extensions>
+
   <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>