diff options
author | Pavel Kirpichenkov <pavel.kirpichenkov@jetbrains.com> | 2020-08-06 18:35:48 +0300 |
---|---|---|
committer | kotlin-ide-monorepo-bot <kotlin-ide-monorepo-bot-no-reply@jetbrains.com> | 2020-11-27 22:03:26 +0000 |
commit | 4479c62ecc4c033ff3c76d216ef8c60e95739809 (patch) | |
tree | cd1ebc78614194c058d67e2d70ed91060be1ea03 /analysis | |
parent | 0156bb38915a334e87aff381dd65a85bf03883b3 (diff) | |
download | intellij-kotlin-4479c62ecc4c033ff3c76d216ef8c60e95739809.tar.gz |
Revert "Introduce @FrontendInternals annotation"
Revert due to Mobile IDE Trunk IJ TC configuration
This reverts commits:
ffc3d8bdfc7b578126289e683067b2cd2c50a9b5
c0e713980b5e93d61688c247e7ed0363e252d3b5
^KT-39643 In Progress
Original commit: 9ca4717d112f1a935c989bfe93acf0532e500fa5
GitOrigin-RevId: 7716b6ae654f5957e7c315af9799ceb2e8a9ccdb
Diffstat (limited to 'analysis')
5 files changed, 1 insertions, 21 deletions
diff --git a/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/IDELightClassContexts.kt b/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/IDELightClassContexts.kt index 0189152cb630..1dce10cc6899 100644 --- a/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/IDELightClassContexts.kt +++ b/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/IDELightClassContexts.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.frontend.di.configureModule -import org.jetbrains.kotlin.idea.FrontendInternals import org.jetbrains.kotlin.idea.caches.lightClasses.IDELightClassConstructionContext.Mode.EXACT import org.jetbrains.kotlin.idea.caches.lightClasses.IDELightClassConstructionContext.Mode.LIGHT import org.jetbrains.kotlin.idea.caches.lightClasses.annotations.KOTLINX_SERIALIZABLE_FQ_NAME @@ -92,7 +91,6 @@ internal object IDELightClassContexts { val bindingContext = if (classOrObject is KtClass && classOrObject.isAnnotation()) { // need to make sure default values for parameters are resolved // because java resolve depends on whether there is a default value for an annotation attribute - @OptIn(FrontendInternals::class) resolutionFacade.getFrontendService(ResolveElementCache::class.java) .resolvePrimaryConstructorParametersDefaultValues(classOrObject) } else { @@ -138,7 +136,6 @@ internal object IDELightClassContexts { fun contextForFacade(files: List<KtFile>): LightClassConstructionContext { - @OptIn(FrontendInternals::class) val resolveSession = files.first().getResolutionFacade().getFrontendService(ResolveSession::class.java) forceResolvePackageDeclarations(files, resolveSession) diff --git a/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt index 79764bdb10ec..7c4d151367f3 100644 --- a/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt +++ b/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.kotlin.idea.FrontendInternals import org.jetbrains.kotlin.idea.caches.lightClasses.IDELightClassContexts import org.jetbrains.kotlin.idea.caches.lightClasses.LazyLightClassDataHolder import org.jetbrains.kotlin.idea.project.languageVersionSettings @@ -91,9 +90,7 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG return null } - @OptIn(FrontendInternals::class) - override val deprecationResolver: DeprecationResolver - get() = resolutionFacade.getFrontendService(DeprecationResolver::class.java) + override val deprecationResolver: DeprecationResolver get() = resolutionFacade.getFrontendService(DeprecationResolver::class.java) override val typeMapper: KotlinTypeMapper by lazyPub { @@ -208,7 +205,6 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG ) } - @OptIn(FrontendInternals::class) private fun KtElement.getDiagnosticsHolder() = getResolutionFacade().frontendService<LazyLightClassDataHolder.DiagnosticsHolder>() diff --git a/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleResolutionFacadeImpl.kt b/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleResolutionFacadeImpl.kt index b177751f2636..75a7f7cc1244 100644 --- a/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleResolutionFacadeImpl.kt +++ b/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleResolutionFacadeImpl.kt @@ -25,7 +25,6 @@ import org.jetbrains.kotlin.container.getService import org.jetbrains.kotlin.container.tryGetService import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.kotlin.idea.FrontendInternals import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo import org.jetbrains.kotlin.idea.project.ResolveElementCache import org.jetbrains.kotlin.idea.resolve.ResolutionFacade @@ -68,7 +67,6 @@ internal class ModuleResolutionFacadeImpl( } } - @OptIn(FrontendInternals::class) val resolveElementCache = getFrontendService(elements.first(), ResolveElementCache::class.java) return runWithCancellationCheck { resolveElementCache.resolveToElements(elements, bodyResolveMode) @@ -97,19 +95,16 @@ internal class ModuleResolutionFacadeImpl( } } - @FrontendInternals override fun <T : Any> getFrontendService(serviceClass: Class<T>): T = getFrontendService(moduleInfo, serviceClass) override fun <T : Any> getIdeService(serviceClass: Class<T>): T { return projectFacade.resolverForModuleInfo(moduleInfo).componentProvider.create(serviceClass) } - @FrontendInternals override fun <T : Any> getFrontendService(element: PsiElement, serviceClass: Class<T>): T { return projectFacade.resolverForElement(element).componentProvider.getService(serviceClass) } - @FrontendInternals override fun <T : Any> tryGetFrontendService(element: PsiElement, serviceClass: Class<T>): T? { return projectFacade.resolverForElement(element).componentProvider.tryGetService(serviceClass) } @@ -118,7 +113,6 @@ internal class ModuleResolutionFacadeImpl( return projectFacade.resolverForModuleInfo(ideaModuleInfo).componentProvider.getService(serviceClass) } - @FrontendInternals override fun <T : Any> getFrontendService(moduleDescriptor: ModuleDescriptor, serviceClass: Class<T>): T { return projectFacade.resolverForDescriptor(moduleDescriptor).componentProvider.getService(serviceClass) } diff --git a/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeWithDebugInfo.kt b/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeWithDebugInfo.kt index bbcff6c48b89..5f2e58e7e8b8 100644 --- a/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeWithDebugInfo.kt +++ b/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeWithDebugInfo.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.analyzer.ResolverForProject import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.kotlin.idea.FrontendInternals import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo import org.jetbrains.kotlin.idea.caches.project.getNullableModuleInfo import org.jetbrains.kotlin.idea.resolve.ResolutionFacade @@ -67,7 +66,6 @@ private class ResolutionFacadeWithDebugInfo( override val moduleDescriptor: ModuleDescriptor get() = delegate.moduleDescriptor - @FrontendInternals override fun <T : Any> getFrontendService(serviceClass: Class<T>): T { return wrapExceptions({ ResolvingWhat(serviceClass = serviceClass) }) { delegate.getFrontendService(serviceClass) @@ -80,14 +78,12 @@ private class ResolutionFacadeWithDebugInfo( } } - @FrontendInternals override fun <T : Any> getFrontendService(element: PsiElement, serviceClass: Class<T>): T { return wrapExceptions({ ResolvingWhat(listOf(element), serviceClass = serviceClass) }) { delegate.getFrontendService(element, serviceClass) } } - @FrontendInternals override fun <T : Any> tryGetFrontendService(element: PsiElement, serviceClass: Class<T>): T? { return wrapExceptions({ ResolvingWhat(listOf(element), serviceClass = serviceClass) }) { delegate.tryGetFrontendService(element, serviceClass) @@ -98,7 +94,6 @@ private class ResolutionFacadeWithDebugInfo( return delegate.getResolverForProject() } - @FrontendInternals override fun <T : Any> getFrontendService(moduleDescriptor: ModuleDescriptor, serviceClass: Class<T>): T { return wrapExceptions({ ResolvingWhat(serviceClass = serviceClass, moduleDescriptor = moduleDescriptor) }) { delegate.getFrontendService(moduleDescriptor, serviceClass) diff --git a/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt b/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt index 3f42f5ddaa97..15dbd24f8d68 100644 --- a/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt +++ b/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.caches.resolve.KotlinCacheService import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.idea.FrontendInternals import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.idea.util.application.runReadAction @@ -112,7 +111,6 @@ fun PsiClass.resolveToDescriptor( } as? ClassDescriptor } -@OptIn(FrontendInternals::class) private fun PsiElement.getJavaDescriptorResolver(resolutionFacade: ResolutionFacade): JavaDescriptorResolver? { return resolutionFacade.tryGetFrontendService(this, JavaDescriptorResolver::class.java) } |