From 491ac7db12fcbb59fc449e0fd378d551ad0164f2 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 30 Dec 2014 21:22:21 +0300 Subject: [PATCH] Frontend: JavaDeclarationCheckerProvider->KotlinJvmCheckerProvider --- ...tionCheckerProvider.kt => KotlinJvmCheckerProvider.kt} | 2 +- .../kotlin/renderer/AbstractDescriptorRendererTest.kt | 4 ++-- .../kotlin/generators/injectors/GenerateInjectors.kt | 8 ++++---- .../org/jetbrains/kotlin/idea/project/TargetPlatform.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/{JavaDeclarationCheckerProvider.kt => KotlinJvmCheckerProvider.kt} (98%) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt index a9bd2bcfa71..26ba4494cf2 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.kotlin.descriptors.MemberDescriptor import org.jetbrains.kotlin.resolve.calls.checkers.NeedSyntheticChecker -public object JavaDeclarationCheckerProvider : AdditionalCheckerProvider( +public object KotlinJvmCheckerProvider : AdditionalCheckerProvider( annotationCheckers = listOf(PlatformStaticAnnotationChecker(), LocalFunInlineChecker(), ReifiedTypeParameterAnnotationChecker(), NativeFunChecker()), additionalCallCheckers = listOf(NeedSyntheticChecker()) ) diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt index 3bc00b64333..1d7ec94365c 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.context.GlobalContext import org.jetbrains.kotlin.di.InjectorForLazyResolve import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport -import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider +import org.jetbrains.kotlin.load.kotlin.KotlinJvmCheckerProvider import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment @@ -55,7 +55,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment getProject(), globalContext, lazyModule, FileBasedDeclarationProviderFactory(globalContext.storageManager, listOf(psiFile)), CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), - JavaDeclarationCheckerProvider, DynamicTypesSettings()).getResolveSession() + KotlinJvmCheckerProvider, DynamicTypesSettings()).getResolveSession() lazyModule.initialize(resolveSession.getPackageFragmentProvider()) diff --git a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt index 89e10f5baa6..4f7c08b420a 100644 --- a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM -import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider +import org.jetbrains.kotlin.load.kotlin.KotlinJvmCheckerProvider import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider import org.jetbrains.kotlin.context.LazyResolveToken @@ -196,7 +196,7 @@ private fun generatorForLazyResolveWithJava() = field() field() - field() + field() } private fun generatorForReplWithJava() = @@ -233,7 +233,7 @@ private fun generatorForTests() = field(init = GivenExpression("org.jetbrains.kotlin.context.ContextPackage.GlobalContext()"), useAsContext = true) - field() + field() } private fun generatorForBodyResolve() = @@ -301,7 +301,7 @@ private fun DependencyInjectorGenerator.commonForJavaTopDownAnalyzer() { field() field() - field() + field() field(init = GivenExpression(javaClass().getName() + ".SERVICE.getInstance(project)")) } 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 86a32d10069..0b6358dadd8 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 @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.project; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider; -import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmCheckerProvider; import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesAllowed; import org.jetbrains.kotlin.types.DynamicTypesSettings; @@ -30,6 +30,6 @@ public interface TargetPlatform { @NotNull DynamicTypesSettings getDynamicTypesSettings(); - TargetPlatform JVM = new TargetPlatformImpl("JVM", JavaDeclarationCheckerProvider.INSTANCE$, new DynamicTypesSettings()); + TargetPlatform JVM = new TargetPlatformImpl("JVM", KotlinJvmCheckerProvider.INSTANCE$, new DynamicTypesSettings()); TargetPlatform JS = new TargetPlatformImpl("JS", KotlinJsDeclarationCheckerProvider.INSTANCE$, new DynamicTypesAllowed()); }