From 0344f467d54dc4fd7e68259e6b0a4041d537cc10 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Tue, 30 Dec 2014 21:25:26 +0300
Subject: [PATCH] Frontend:
 KotlinJsDeclarationCheckerProvider->KotlinJsCheckerProvider

---
 .../kotlin/generators/injectors/GenerateInjectors.kt          | 4 ++--
 .../jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt  | 4 ++--
 .../src/org/jetbrains/kotlin/idea/project/TargetPlatform.java | 4 ++--
 ...clarationCheckerProvider.kt => KotlinJsCheckerProvider.kt} | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename js/js.frontend/src/org/jetbrains/kotlin/js/resolve/{KotlinJsDeclarationCheckerProvider.kt => KotlinJsCheckerProvider.kt} (98%)

diff --git a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt
index 4f7c08b420a..2835631f491 100644
--- a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt
@@ -48,7 +48,7 @@ import org.jetbrains.kotlin.context.LazyResolveToken
 import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct
 import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverPostConstruct
 import org.jetbrains.kotlin.resolve.lazy.ScopeProvider
-import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider
+import org.jetbrains.kotlin.js.resolve.KotlinJsCheckerProvider
 import org.jetbrains.kotlin.types.DynamicTypesAllowed
 import org.jetbrains.kotlin.types.DynamicTypesSettings
 
@@ -129,7 +129,7 @@ private fun generatorForTopDownAnalyzerForJs() =
             publicField<LazyTopDownAnalyzer>()
 
             field<MutablePackageFragmentProvider>()
-            field<KotlinJsDeclarationCheckerProvider>()
+            field<KotlinJsCheckerProvider>()
             field<DynamicTypesAllowed>()
         }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt
index e4d22ea6f55..04e813406e5 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.di.InjectorForLazyResolve
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.analyzer.ModuleContent
-import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider
+import org.jetbrains.kotlin.js.resolve.KotlinJsCheckerProvider
 import org.jetbrains.kotlin.types.DynamicTypesAllowed
 
 public class JsResolverForModule(
@@ -56,7 +56,7 @@ public object JsAnalyzerFacade : AnalyzerFacade<JsResolverForModule, PlatformAna
         )
 
         val injector = InjectorForLazyResolve(project, globalContext, moduleDescriptor, declarationProviderFactory, BindingTraceContext(),
-                                              KotlinJsDeclarationCheckerProvider, DynamicTypesAllowed())
+                                              KotlinJsCheckerProvider, DynamicTypesAllowed())
         val resolveSession = injector.getResolveSession()!!
         moduleDescriptor.initialize(resolveSession.getPackageFragmentProvider())
         return JsResolverForModule(resolveSession)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatform.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatform.java
index 0b6358dadd8..03b7117e50a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatform.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatform.java
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.idea.project;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider;
+import org.jetbrains.kotlin.js.resolve.KotlinJsCheckerProvider;
 import org.jetbrains.kotlin.load.kotlin.KotlinJvmCheckerProvider;
 import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider;
 import org.jetbrains.kotlin.types.DynamicTypesAllowed;
@@ -31,5 +31,5 @@ public interface TargetPlatform {
     DynamicTypesSettings getDynamicTypesSettings();
 
     TargetPlatform JVM = new TargetPlatformImpl("JVM", KotlinJvmCheckerProvider.INSTANCE$, new DynamicTypesSettings());
-    TargetPlatform JS = new TargetPlatformImpl("JS", KotlinJsDeclarationCheckerProvider.INSTANCE$, new DynamicTypesAllowed());
+    TargetPlatform JS = new TargetPlatformImpl("JS", KotlinJsCheckerProvider.INSTANCE$, new DynamicTypesAllowed());
 }
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsCheckerProvider.kt
similarity index 98%
rename from js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt
rename to js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsCheckerProvider.kt
index a9042c8c602..6b7032ba4ba 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt
+++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsCheckerProvider.kt
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
 import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker
 
-public object KotlinJsDeclarationCheckerProvider : AdditionalCheckerProvider(
+public object KotlinJsCheckerProvider : AdditionalCheckerProvider(
         annotationCheckers = listOf(NativeInvokeChecker(), NativeGetterChecker(), NativeSetterChecker()),
         additionalCallCheckers = listOf()
 )