From fc4250b02b5b5c723b0ae0e26b9ab4386da211d1 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Tue, 22 Dec 2015 18:33:39 +0300
Subject: [PATCH] EA-75872 / KT-10473 fix: both JVM- and JS-diagnostic
 factories are now used as extensions

---
 idea/src/META-INF/extensions/kotlin2js.xml  | 2 ++
 idea/src/META-INF/extensions/kotlin2jvm.xml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/idea/src/META-INF/extensions/kotlin2js.xml b/idea/src/META-INF/extensions/kotlin2js.xml
index 98de17c0752..e42e3fc04ba 100644
--- a/idea/src/META-INF/extensions/kotlin2js.xml
+++ b/idea/src/META-INF/extensions/kotlin2js.xml
@@ -3,6 +3,8 @@
 
     <extensions defaultExtensionNs="org.jetbrains.kotlin">
         <defaultErrorMessages implementation="org.jetbrains.kotlin.js.resolve.diagnostics.DefaultErrorMessagesJs"/>
+        <!--temporary: JVM diagnostics included to fix KT-10473 / EA-75782-->
+        <defaultErrorMessages implementation="org.jetbrains.kotlin.resolve.jvm.diagnostics.DefaultErrorMessagesJvm"/>
         <suppressStringProvider implementation="org.jetbrains.kotlin.js.analyze.SuppressUnusedParameterForJsNative"/>
         <suppressStringProvider implementation="org.jetbrains.kotlin.js.analyze.SuppressNoBodyErrorsForNativeDeclarations"/>
         <diagnosticSuppressor implementation="org.jetbrains.kotlin.js.analyze.SuppressUninitializedErrorsForNativeDeclarations"/>
diff --git a/idea/src/META-INF/extensions/kotlin2jvm.xml b/idea/src/META-INF/extensions/kotlin2jvm.xml
index 2d8dc7f878e..c1ee2532bac 100644
--- a/idea/src/META-INF/extensions/kotlin2jvm.xml
+++ b/idea/src/META-INF/extensions/kotlin2jvm.xml
@@ -3,6 +3,8 @@
 
     <extensions defaultExtensionNs="org.jetbrains.kotlin">
         <defaultErrorMessages implementation="org.jetbrains.kotlin.resolve.jvm.diagnostics.DefaultErrorMessagesJvm"/>
+        <!--temporary: JS diagnostics included to fix KT-10473 / EA-75782-->
+        <defaultErrorMessages implementation="org.jetbrains.kotlin.js.resolve.diagnostics.DefaultErrorMessagesJs"/>
 
         <classBuilderInterceptorExtension implementation="org.jetbrains.kotlin.annotation.AnnotationCollectorExtension"/>