From 93e2827c1a5adf9e255d183f518f5495a553208c Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 28 Sep 2015 14:45:49 +0200
Subject: [PATCH] dependency on java-i18n plugin

---
 idea/src/META-INF/i18n.xml   | 12 ++++++++++++
 idea/src/META-INF/plugin.xml |  9 +--------
 2 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 idea/src/META-INF/i18n.xml

diff --git a/idea/src/META-INF/i18n.xml b/idea/src/META-INF/i18n.xml
new file mode 100644
index 00000000000..7627352a145
--- /dev/null
+++ b/idea/src/META-INF/i18n.xml
@@ -0,0 +1,12 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+      <psi.referenceContributor language="jet" implementation="org.jetbrains.kotlin.idea.properties.KotlinPropertiesReferenceContributor"/>
+
+      <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinInvalidBundleOrPropertyInspection"
+                       displayName="Invalid property key"
+                       groupName="Kotlin"
+                       enabledByDefault="true"
+                       level="ERROR"
+      />
+  </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 ae8396884e7..87962586726 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -16,6 +16,7 @@
   <depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends>
   <depends optional="true" config-file="android.xml">org.jetbrains.android</depends>
   <depends optional="true" config-file="coverage.xml">Coverage</depends>
+  <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
 
   <project-components>
     <component>
@@ -361,7 +362,6 @@
     <weigher key="completion" implementationClass="org.jetbrains.kotlin.idea.completion.KotlinLookupElementProximityWeigher" id="kotlin.proximity" order="after proximity"/>
 
     <psi.referenceContributor language="jet" implementation="org.jetbrains.kotlin.idea.references.JetReferenceContributor"/>
-    <psi.referenceContributor language="jet" implementation="org.jetbrains.kotlin.idea.properties.KotlinPropertiesReferenceContributor"/>
 
     <renamePsiElementProcessor id="KotlinClass"
                                implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinClassProcessor"
@@ -1221,13 +1221,6 @@
                      cleanupTool="true"
                      level="WARNING"/>
 
-      <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinInvalidBundleOrPropertyInspection"
-                       displayName="Invalid property key"
-                       groupName="Kotlin"
-                       enabledByDefault="true"
-                       level="ERROR"
-      />
-
     <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>
 
     <fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>