diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliExtraDiagnosticsProvider.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliExtraDiagnosticsProvider.kt deleted file mode 100644 index 328602d35dc..00000000000 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliExtraDiagnosticsProvider.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.cli.jvm.compiler - -import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.asJava.KotlinExtraDiagnosticsProvider -import org.jetbrains.kotlin.asJava.builder.InvalidLightClassDataHolder -import org.jetbrains.kotlin.asJava.builder.LightClassDataProviderForFileFacade -import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration -import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil -import org.jetbrains.kotlin.psi.KtClassOrObject -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics - -class CliExtraDiagnosticsProvider : KotlinExtraDiagnosticsProvider { - override fun forClassOrObject(kclass: KtClassOrObject): Diagnostics { - val lightClassDataHolder = KtLightClassForSourceDeclaration.getLightClassDataHolder(kclass) - if (lightClassDataHolder is InvalidLightClassDataHolder) { - return Diagnostics.EMPTY - } - - return lightClassDataHolder.extraDiagnostics - } - - override fun forFacade(file: KtFile, moduleScope: GlobalSearchScope): Diagnostics { - val project = file.project - val facadeFqName = JvmFileClassUtil.getFileClassInfoNoResolve(file).facadeClassFqName - return LightClassDataProviderForFileFacade(project, facadeFqName, moduleScope) - .compute() - ?.value - ?.extraDiagnostics - ?: Diagnostics.EMPTY - } -} \ No newline at end of file diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 9b9f8b8685c..3d0b14b11b1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -1,6 +1,17 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + * Copyright 2010-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.jetbrains.kotlin.cli.jvm.compiler @@ -39,7 +50,6 @@ import com.intellij.util.io.URLUtil import com.intellij.util.lang.UrlClassLoader import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport -import org.jetbrains.kotlin.asJava.KotlinExtraDiagnosticsProvider import org.jetbrains.kotlin.asJava.LightClassGenerationSupport import org.jetbrains.kotlin.asJava.classes.FacadeCache import org.jetbrains.kotlin.asJava.finder.JavaElementFinder @@ -51,6 +61,7 @@ import org.jetbrains.kotlin.cli.common.config.kotlinSourceRoots import org.jetbrains.kotlin.cli.common.extensions.ScriptEvaluationExtension import org.jetbrains.kotlin.cli.common.extensions.ShellExtension import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.STRONG_WARNING import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.jvm.compiler.jarfs.FastJarFileSystem @@ -59,6 +70,7 @@ import org.jetbrains.kotlin.cli.jvm.index.* import org.jetbrains.kotlin.cli.jvm.javac.JavacWrapperRegistrar import org.jetbrains.kotlin.cli.jvm.modules.CliJavaModuleFinder import org.jetbrains.kotlin.cli.jvm.modules.CliJavaModuleResolver +import org.jetbrains.kotlin.cli.jvm.modules.CoreJrtFileSystem import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension import org.jetbrains.kotlin.codegen.extensions.ClassFileFactoryFinalizerExtension import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension @@ -720,7 +732,6 @@ class KotlinCoreEnvironment private constructor( val traceHolder = CliTraceHolder() val cliLightClassGenerationSupport = CliLightClassGenerationSupport(traceHolder, project) val kotlinAsJavaSupport = CliKotlinAsJavaSupport(this, traceHolder) - registerService(KotlinExtraDiagnosticsProvider::class.java, CliExtraDiagnosticsProvider()) registerService(LightClassGenerationSupport::class.java, cliLightClassGenerationSupport) registerService(CliLightClassGenerationSupport::class.java, cliLightClassGenerationSupport) registerService(KotlinAsJavaSupport::class.java, kotlinAsJavaSupport) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinExtraDiagnosticsProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinExtraDiagnosticsProvider.java deleted file mode 100644 index 4bab2ecb9a7..00000000000 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinExtraDiagnosticsProvider.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.asJava; - -import com.intellij.openapi.project.Project; -import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.KtClassOrObject; -import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; - -public interface KotlinExtraDiagnosticsProvider { - @NotNull - Diagnostics forClassOrObject(@NotNull KtClassOrObject kclass); - - @NotNull - Diagnostics forFacade(@NotNull KtFile file, @NotNull GlobalSearchScope moduleScope); - - static @NotNull KotlinExtraDiagnosticsProvider getInstance(@NotNull Project project) { - return project.getService(KotlinExtraDiagnosticsProvider.class); - } -} \ No newline at end of file diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassDataProvider.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassDataProvider.kt index 272078e6c12..5b1b9db3ae0 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassDataProvider.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassDataProvider.kt @@ -1,6 +1,17 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.jetbrains.kotlin.asJava.builder @@ -25,27 +36,23 @@ import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.org.objectweb.asm.Type class LightClassDataProviderForClassOrObject( - private val classOrObject: KtClassOrObject + private val classOrObject: KtClassOrObject ) : CachedValueProvider { private fun computeLightClassData(): LightClassDataHolder.ForClass { val file = classOrObject.containingKtFile val packageFqName = file.packageFqName - return LightClassGenerationSupport.getInstance(classOrObject.project) - .createDataHolderForClass(classOrObject) { constructionContext -> - buildLightClass( - packageFqName, - listOf(file), - ClassFilterForClassOrObject(classOrObject), - constructionContext - ) { state, files -> - val packageCodegen = state.factory.forPackage(packageFqName, files) - val packagePartType = Type.getObjectType(JvmFileClassUtil.getFileClassInternalName(file)) - val context = state.rootContext.intoPackagePart(packageCodegen.packageFragment, packagePartType, file) - MemberCodegen.genClassOrObject(context, getOutermostClassOrObject(classOrObject), state, null) - state.factory.done() - } + return LightClassGenerationSupport.getInstance(classOrObject.project).createDataHolderForClass(classOrObject) { + constructionContext -> + buildLightClass(packageFqName, listOf(file), ClassFilterForClassOrObject(classOrObject), constructionContext) { + state, files -> + val packageCodegen = state.factory.forPackage(packageFqName, files) + val packagePartType = Type.getObjectType(JvmFileClassUtil.getFileClassInternalName(file)) + val context = state.rootContext.intoPackagePart(packageCodegen.packageFragment, packagePartType, file) + MemberCodegen.genClassOrObject(context, getOutermostClassOrObject(classOrObject), state, null) + state.factory.done() } + } } override fun compute(): CachedValueProvider.Result? { @@ -61,14 +68,16 @@ class LightClassDataProviderForClassOrObject( } } -class LightClassDataProviderForFileFacade constructor( - private val project: Project, private val facadeFqName: FqName, private val searchScope: GlobalSearchScope +sealed class LightClassDataProviderForFileFacade constructor( + protected val project: Project, protected val facadeFqName: FqName ) : CachedValueProvider { - fun findFiles(): Collection = KotlinAsJavaSupport.getInstance(project).findFilesForFacade(facadeFqName, searchScope) + abstract fun findFiles(): Collection private fun computeLightClassData(files: Collection): LightClassDataHolder.ForFacade { - return LightClassGenerationSupport.getInstance(project).createDataHolderForFacade(files) { constructionContext -> - buildLightClass(facadeFqName.parent(), files, ClassFilterForFacade, constructionContext) generate@{ state, files -> + return LightClassGenerationSupport.getInstance(project).createDataHolderForFacade(files) { + constructionContext -> + buildLightClass(facadeFqName.parent(), files, ClassFilterForFacade, constructionContext) generate@ { + state, files -> val representativeFile = files.first() val fileClassInfo = JvmFileClassUtil.getFileClassInfoNoResolve(representativeFile) if (!fileClassInfo.withJvmMultifileClass) { @@ -90,26 +99,46 @@ class LightClassDataProviderForFileFacade constructor( if (files.isEmpty()) return null return CachedValueProvider.Result.create( - computeLightClassData(files), - KotlinModificationTrackerService.getInstance(project).outOfBlockModificationTracker + computeLightClassData(files), + KotlinModificationTrackerService.getInstance(project).outOfBlockModificationTracker ) } override fun toString(): String { return this::class.java.name + " for $facadeFqName" } + + // create delegate by relevant files in project source using LightClassGenerationSupport + class ByProjectSource( + project: Project, + facadeFqName: FqName, + private val searchScope: GlobalSearchScope + ) : LightClassDataProviderForFileFacade(project, facadeFqName) { + override fun findFiles() = KotlinAsJavaSupport.getInstance(project).findFilesForFacade(facadeFqName, searchScope) + } + + // create delegate by single file + class ByFile( + project: Project, + facadeFqName: FqName, + private val file: KtFile + ) : LightClassDataProviderForFileFacade(project, facadeFqName) { + override fun findFiles() = listOf(file) + } } class LightClassDataProviderForScript(private val script: KtScript) : CachedValueProvider { private fun computeLightClassData(): LightClassDataHolder.ForScript { - return LightClassGenerationSupport.getInstance(script.project).createDataHolderForScript(script) { constructionContext -> + return LightClassGenerationSupport.getInstance(script.project).createDataHolderForScript(script) { + constructionContext -> buildLightClass( - script.fqName.parent(), - listOf(script.containingKtFile), - ClassFilterForScript(script), - constructionContext - ) generate@{ state, files -> + script.fqName.parent(), + listOf(script.containingKtFile), + ClassFilterForScript(script), + constructionContext + ) generate@ { + state, files -> val scriptFile = files.first() val codegen = state.factory.forPackage(scriptFile.packageFqName, files) codegen.generate() @@ -119,10 +148,10 @@ class LightClassDataProviderForScript(private val script: KtScript) : CachedValu } override fun compute(): CachedValueProvider.Result? = - CachedValueProvider.Result.create( - computeLightClassData(), - KotlinModificationTrackerService.getInstance(script.project).outOfBlockModificationTracker - ) + CachedValueProvider.Result.create( + computeLightClassData(), + KotlinModificationTrackerService.getInstance(script.project).outOfBlockModificationTracker + ) override fun toString(): String = this::class.java.name + " for ${script.fqName}" } @@ -168,7 +197,7 @@ private class ClassFilterForClassOrObject(private val classOrObject: KtClassOrOb } override fun shouldGenerateClass(processingClassOrObject: KtClassOrObject) - // generate outer classes but not their members + // generate outer classes but not their members = shouldGenerateClassMembers(processingClassOrObject) || processingClassOrObject.isAncestor(classOrObject, true) override fun shouldGenerateScript(script: KtScript) = PsiTreeUtil.isAncestor(script, classOrObject, false) @@ -185,10 +214,10 @@ object ClassFilterForFacade : GenerationState.GenerateClassFilter() { private class ClassFilterForScript(val script: KtScript) : GenerationState.GenerateClassFilter() { override fun shouldAnnotateClass(processingClassOrObject: KtClassOrObject): Boolean = - shouldGenerateClass(processingClassOrObject) + shouldGenerateClass(processingClassOrObject) override fun shouldGenerateClass(processingClassOrObject: KtClassOrObject): Boolean = - processingClassOrObject.isAncestor(script, true) + processingClassOrObject.isAncestor(script, true) override fun shouldGenerateClassMembers(processingClassOrObject: KtClassOrObject): Boolean = true diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt index 8ed5fd80d36..f2780c4ef19 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt @@ -1,17 +1,32 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiElement import com.intellij.psi.search.GlobalSearchScope +import org.jetbrains.kotlin.asJava.builder.InvalidLightClassDataHolder +import org.jetbrains.kotlin.asJava.builder.LightClassDataProviderForFileFacade +import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration import org.jetbrains.kotlin.asJava.classes.getOutermostClassOrObject import org.jetbrains.kotlin.asJava.classes.safeIsScript import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.diagnostics.Errors.* +import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData @@ -19,9 +34,25 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.* import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind.* fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Diagnostics, moduleScope: GlobalSearchScope): Diagnostics? { + fun getDiagnosticsForFileFacade(file: KtFile): Diagnostics? { + val project = file.project + + val facadeFqName = JvmFileClassUtil.getFileClassInfoNoResolve(file).facadeClassFqName + + //TODO Maybe it is better to cache this item + return LightClassDataProviderForFileFacade.ByProjectSource(project, facadeFqName, moduleScope) + .compute() + ?.value + ?.extraDiagnostics + } + fun getDiagnosticsForClass(ktClassOrObject: KtClassOrObject): Diagnostics { val outermostClass = getOutermostClassOrObject(ktClassOrObject) - return KotlinExtraDiagnosticsProvider.getInstance(ktClassOrObject.project).forClassOrObject(outermostClass) + val lightClassDataHolder = KtLightClassForSourceDeclaration.getLightClassDataHolder(outermostClass) + if (lightClassDataHolder is InvalidLightClassDataHolder) { + return Diagnostics.EMPTY + } + return lightClassDataHolder.extraDiagnostics } fun doGetDiagnostics(): Diagnostics? { @@ -45,9 +76,8 @@ fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Diagnostic when (parent) { is KtFile -> { - return KotlinExtraDiagnosticsProvider.getInstance(parent.project).forFacade(parent, moduleScope) + return getDiagnosticsForFileFacade(parent) } - is KtClassBody -> { val parentsParent = parent.getParent()