azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Frontend: JavaDeclarationCheckerProvider->KotlinJvmCheckerProvider

Browse Source
This commit is contained in:
Alexey Tsvetkov
2014-12-30 21:22:21 +03:00
parent 21e28fa866
commit 491ac7db12
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.kt → compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt
+1 -1
View File
@@ -43,7 +43,7 @@ import org.jetbrains.kotlin.psi.JetPropertyAccessor
import org.jetbrains.kotlin.descriptors.MemberDescriptor import org.jetbrains.kotlin.descriptors.MemberDescriptor
import org.jetbrains.kotlin.resolve.calls.checkers.NeedSyntheticChecker import org.jetbrains.kotlin.resolve.calls.checkers.NeedSyntheticChecker
public object JavaDeclarationCheckerProvider : AdditionalCheckerProvider( public object KotlinJvmCheckerProvider : AdditionalCheckerProvider(
annotationCheckers = listOf(PlatformStaticAnnotationChecker(), LocalFunInlineChecker(), ReifiedTypeParameterAnnotationChecker(), NativeFunChecker()), annotationCheckers = listOf(PlatformStaticAnnotationChecker(), LocalFunInlineChecker(), ReifiedTypeParameterAnnotationChecker(), NativeFunChecker()),
additionalCallCheckers = listOf(NeedSyntheticChecker()) additionalCallCheckers = listOf(NeedSyntheticChecker())
) )
compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
+2 -2
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.context.GlobalContext
import org.jetbrains.kotlin.di.InjectorForLazyResolve import org.jetbrains.kotlin.di.InjectorForLazyResolve
import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory
import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport 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.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor
import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment
@@ -55,7 +55,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
getProject(), globalContext, lazyModule, getProject(), globalContext, lazyModule,
FileBasedDeclarationProviderFactory(globalContext.storageManager, listOf(psiFile)), FileBasedDeclarationProviderFactory(globalContext.storageManager, listOf(psiFile)),
CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(),
JavaDeclarationCheckerProvider, DynamicTypesSettings()).getResolveSession() KotlinJvmCheckerProvider, DynamicTypesSettings()).getResolveSession()
lazyModule.initialize(resolveSession.getPackageFragmentProvider()) lazyModule.initialize(resolveSession.getPackageFragmentProvider())
generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt
+4 -4
View File
@@ -41,7 +41,7 @@ import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava
import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory
import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM 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.resolve.lazy.KotlinCodeAnalyzer
import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider
import org.jetbrains.kotlin.context.LazyResolveToken import org.jetbrains.kotlin.context.LazyResolveToken
@@ -196,7 +196,7 @@ private fun generatorForLazyResolveWithJava() =
field<LazyResolveToken>() field<LazyResolveToken>()
field<JavaLazyAnalyzerPostConstruct>() field<JavaLazyAnalyzerPostConstruct>()
field<JavaDeclarationCheckerProvider>() field<KotlinJvmCheckerProvider>()
} }
private fun generatorForReplWithJava() = private fun generatorForReplWithJava() =
@@ -233,7 +233,7 @@ private fun generatorForTests() =
field<GlobalContext>(init = GivenExpression("org.jetbrains.kotlin.context.ContextPackage.GlobalContext()"), field<GlobalContext>(init = GivenExpression("org.jetbrains.kotlin.context.ContextPackage.GlobalContext()"),
useAsContext = true) useAsContext = true)
field<JavaDeclarationCheckerProvider>() field<KotlinJvmCheckerProvider>()
} }
private fun generatorForBodyResolve() = private fun generatorForBodyResolve() =
@@ -301,7 +301,7 @@ private fun DependencyInjectorGenerator.commonForJavaTopDownAnalyzer() {
field<JavaLazyAnalyzerPostConstruct>() field<JavaLazyAnalyzerPostConstruct>()
field<JavaFlexibleTypeCapabilitiesProvider>() field<JavaFlexibleTypeCapabilitiesProvider>()
field<JavaDeclarationCheckerProvider>() field<KotlinJvmCheckerProvider>()
field<VirtualFileFinder>(init = GivenExpression(javaClass<VirtualFileFinder>().getName() + ".SERVICE.getInstance(project)")) field<VirtualFileFinder>(init = GivenExpression(javaClass<VirtualFileFinder>().getName() + ".SERVICE.getInstance(project)"))
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatform.java
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.project;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider; 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.resolve.AdditionalCheckerProvider;
import org.jetbrains.kotlin.types.DynamicTypesAllowed; import org.jetbrains.kotlin.types.DynamicTypesAllowed;
import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.DynamicTypesSettings;
@@ -30,6 +30,6 @@ public interface TargetPlatform {
@NotNull @NotNull
DynamicTypesSettings getDynamicTypesSettings(); 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()); TargetPlatform JS = new TargetPlatformImpl("JS", KotlinJsDeclarationCheckerProvider.INSTANCE$, new DynamicTypesAllowed());
} }