From 83d3a4f5756f813922eba53dabb4c932233057e7 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 24 Oct 2014 14:12:28 +0400
Subject: [PATCH] Fix synthetic property rename processor

---
 plugins/android-compiler-plugin/android-compiler-plugin.iml | 1 +
 plugins/android-idea-plugin/src/META-INF/plugin.xml         | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/plugins/android-compiler-plugin/android-compiler-plugin.iml b/plugins/android-compiler-plugin/android-compiler-plugin.iml
index aa254e3cdff..94014e1b492 100644
--- a/plugins/android-compiler-plugin/android-compiler-plugin.iml
+++ b/plugins/android-compiler-plugin/android-compiler-plugin.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend" scope="PROVIDED" />
+    <orderEntry type="module" module-name="jet.as.java.psi" exported="" scope="PROVIDED" />
   </component>
 </module>
 
diff --git a/plugins/android-idea-plugin/src/META-INF/plugin.xml b/plugins/android-idea-plugin/src/META-INF/plugin.xml
index a2bdb168eea..55499890780 100644
--- a/plugins/android-idea-plugin/src/META-INF/plugin.xml
+++ b/plugins/android-idea-plugin/src/META-INF/plugin.xml
@@ -14,6 +14,11 @@
   <extensions defaultExtensionNs="com.intellij">
       <projectService serviceInterface="org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor"
                       serviceImplementation="org.jetbrains.jet.plugin.android.IDEAndroidUIXmlProcessor"/>
+      <compileServer.plugin classpath="jps/kotlin-android-extensions-jps.jar;android-compiler-plugin.jar"/>
+
+      <renamePsiElementProcessor id="KotlinAndroidSyntheticProperty"
+                                 implementation="org.jetbrains.jet.plugin.android.AndroidRenameProcessor"
+                                 order="first"/>
   </extensions>
 
   <extensions defaultExtensionNs="org.jetbrains.kotlin">