diff --git a/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinStaticDeclarationProvider.kt b/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinStaticDeclarationProvider.kt index 6a828aeca2c..7e1649284ba 100644 --- a/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinStaticDeclarationProvider.kt +++ b/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinStaticDeclarationProvider.kt @@ -338,11 +338,11 @@ public class KotlinStaticDeclarationProviderFactory( * * Otherwise, each test would start indexing of stdlib from scratch, * and under the lock which makes tests extremely slow*/ -class KotlinFakeClsStubsCache { +public class KotlinFakeClsStubsCache { private val fakeFileClsStubs = CollectionFactory.createConcurrentWeakValueMap>() - companion object { - fun processAdditionalRoot(root: VirtualFile, storage: (VirtualFile) -> List): List? { + public companion object { + public fun processAdditionalRoot(root: VirtualFile, storage: (VirtualFile) -> List): List? { val service = ApplicationManager.getApplication().getService(KotlinFakeClsStubsCache::class.java) ?: return null if (service.fakeFileClsStubs[root.path] == null) { service.fakeFileClsStubs[root.path] = storage(root) diff --git a/analysis/analysis-api-standalone/build.gradle.kts b/analysis/analysis-api-standalone/build.gradle.kts index 6b4cb6bd47e..ca41a797a6e 100644 --- a/analysis/analysis-api-standalone/build.gradle.kts +++ b/analysis/analysis-api-standalone/build.gradle.kts @@ -3,10 +3,6 @@ plugins { id("jps-compatible") } -kotlin { - explicitApiWarning() -} - dependencies { implementation(intellijCore()) implementation(project(":compiler:psi")) diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/AnalysisApiFirStandaloneModeTestConfiguratorFactory.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/AnalysisApiFirStandaloneModeTestConfiguratorFactory.kt index a71b15f165a..ab0d3397153 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/AnalysisApiFirStandaloneModeTestConfiguratorFactory.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/AnalysisApiFirStandaloneModeTestConfiguratorFactory.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.api.standalone.fir.test import org.jetbrains.kotlin.analysis.test.framework.test.configurators.* -object AnalysisApiFirStandaloneModeTestConfiguratorFactory : AnalysisApiTestConfiguratorFactory() { +public object AnalysisApiFirStandaloneModeTestConfiguratorFactory : AnalysisApiTestConfiguratorFactory() { override fun createConfigurator(data: AnalysisApiTestConfiguratorFactoryData): AnalysisApiTestConfigurator { requireSupported(data) diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeConfigurator.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeConfigurator.kt index fe645e7caae..572c2d4a49f 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeConfigurator.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeConfigurator.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.services.TestModuleStructure import org.jetbrains.kotlin.test.services.TestServices -object StandaloneModeConfigurator : AnalysisApiTestConfigurator() { +public object StandaloneModeConfigurator : AnalysisApiTestConfigurator() { override val analyseInDependentSession: Boolean get() = false override val frontendKind: FrontendKind get() = FrontendKind.Fir diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeTestServiceRegistrar.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeTestServiceRegistrar.kt index ba905170d7e..9c0df62efa3 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeTestServiceRegistrar.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeTestServiceRegistrar.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.analysis.test.framework.services.environmentManager import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar import org.jetbrains.kotlin.test.services.TestServices -object StandaloneModeTestServiceRegistrar : AnalysisApiTestServiceRegistrar() { +public object StandaloneModeTestServiceRegistrar : AnalysisApiTestServiceRegistrar() { override fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices) { } diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderTest.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderTest.kt index 838f1ee630d..2801f071173 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderTest.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/AbstractPsiDeclarationProviderTest.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractPsiDeclarationProviderTest : AbstractAnalysisApiBasedSingleModuleTest() { +public abstract class AbstractPsiDeclarationProviderTest : AbstractAnalysisApiBasedSingleModuleTest() { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { val mainKtFile = ktFiles.singleOrNull() ?: ktFiles.firstOrNull { it.name == "main.kt" } ?: ktFiles.first() val caretPosition = testServices.expressionMarkerProvider.getCaretPosition(mainKtFile) diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/TestPsiElementRenderer.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/TestPsiElementRenderer.kt index 800c4d62641..132ab3fc6bf 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/TestPsiElementRenderer.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/components/psiDeclarationProvider/TestPsiElementRenderer.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.psi.KtParameter -object TestPsiElementRenderer { - fun render(psiElement: PsiElement): String = when (psiElement) { +public object TestPsiElementRenderer { + public fun render(psiElement: PsiElement): String = when (psiElement) { is KtNamedFunction -> buildString { append("KtNamedFunction:") append(psiElement.name) diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolFromResolveExtensionProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolFromResolveExtensionProvider.kt index 73108b072d7..e18fe2fecb5 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolFromResolveExtensionProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolFromResolveExtensionProvider.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.scopes.KtScope public abstract class KtSymbolFromResolveExtensionProvider : KtAnalysisSessionComponent() { - abstract fun getResolveExtensionScopeWithTopLevelDeclarations(): KtScope + public abstract fun getResolveExtensionScopeWithTopLevelDeclarations(): KtScope } public interface KtSymbolFromResolveExtensionProviderMixIn : KtAnalysisSessionMixIn { @@ -19,7 +19,7 @@ public interface KtSymbolFromResolveExtensionProviderMixIn : KtAnalysisSessionMi * @see org.jetbrains.kotlin.analysis.api.resolve.extensions.KtResolveExtension * @see org.jetbrains.kotlin.analysis.api.resolve.extensions.KtResolveExtensionProvider */ - fun getResolveExtensionScopeWithTopLevelDeclarations(): KtScope = withValidityAssertion { + public fun getResolveExtensionScopeWithTopLevelDeclarations(): KtScope = withValidityAssertion { analysisSession.resolveExtensionProvider.getResolveExtensionScopeWithTopLevelDeclarations() } } diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtension.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtension.kt index 3124a71be36..6615394a6b1 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtension.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtension.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.name.FqName * @see KtResolveExtensionFile * @see KtResolveExtensionProvider */ -abstract class KtResolveExtension { +public abstract class KtResolveExtension { /** * Get the list of files that should be generated for the module. * @@ -32,7 +32,7 @@ abstract class KtResolveExtension { * @see KtResolveExtensionFile * @see KtResolveExtension */ - abstract fun getKtFiles(): List + public abstract fun getKtFiles(): List /** * Returns a [ModificationTracker], which controls the validity lifecycle of the files provided by [getKtFiles]. @@ -42,7 +42,7 @@ abstract class KtResolveExtension { * * @see KtResolveExtension */ - abstract fun getModificationTracker(): ModificationTracker + public abstract fun getModificationTracker(): ModificationTracker /** * Returns the set of packages that are contained in the files provided by [getKtFiles]. @@ -52,5 +52,5 @@ abstract class KtResolveExtension { * * @see KtResolveExtension */ - abstract fun getContainedPackages(): Set + public abstract fun getContainedPackages(): Set } \ No newline at end of file diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionFile.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionFile.kt index ce631679443..6767ecac398 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionFile.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionFile.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.name.Name * * @see KtResolveExtension */ -abstract class KtResolveExtensionFile { +public abstract class KtResolveExtensionFile { /** * The name a Kotlin file which will be generated. * @@ -28,7 +28,7 @@ abstract class KtResolveExtensionFile { * * @see KtResolveExtensionFile */ - abstract fun getFileName(): String + public abstract fun getFileName(): String /** * [FqName] of the package specified in the file @@ -39,7 +39,7 @@ abstract class KtResolveExtensionFile { * * @see KtResolveExtensionFile */ - abstract fun getFilePackageName(): FqName + public abstract fun getFilePackageName(): FqName /** * Returns the set of top-level classifier (classes, interfaces, objects, and type-aliases) names in the file. @@ -48,7 +48,7 @@ abstract class KtResolveExtensionFile { * * @see KtResolveExtensionFile */ - abstract fun getTopLevelClassifierNames(): Set + public abstract fun getTopLevelClassifierNames(): Set /** * Returns the set of top-level callable (functions and properties) names in the file. @@ -57,7 +57,7 @@ abstract class KtResolveExtensionFile { * * @see KtResolveExtensionFile */ - abstract fun getTopLevelCallableNames(): Set + public abstract fun getTopLevelCallableNames(): Set /** * Creates the generated Kotlin source file text. @@ -74,7 +74,7 @@ abstract class KtResolveExtensionFile { * * @see KtResolveExtensionFile */ - abstract fun buildFileText(): String + public abstract fun buildFileText(): String /** * Creates a [KtResolveExtensionReferencePsiTargetsProvider] for this [KtResolveExtensionFile]. @@ -82,6 +82,5 @@ abstract class KtResolveExtensionFile { * @see KtResolveExtensionReferencePsiTargetsProvider * @see KtResolveExtensionFile */ - abstract fun createPsiTargetsProvider(): KtResolveExtensionReferencePsiTargetsProvider - + public abstract fun createPsiTargetsProvider(): KtResolveExtensionReferencePsiTargetsProvider } \ No newline at end of file diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionProvider.kt index 7205292dc65..7ae67e01b20 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionProvider.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.project.structure.KtModule * * All member implementations should consider caching the results for subsequent invocations. */ -abstract class KtResolveExtensionProvider { +public abstract class KtResolveExtensionProvider { /** * Provides a list of [KtResolveExtension]s for a given [KtModule]. * @@ -25,12 +25,13 @@ abstract class KtResolveExtensionProvider { * * Implementation cannot use the Kotlin resolve inside, as this function is called during session initialization, so Analysis API access is forbidden. */ - abstract fun provideExtensionsFor(module: KtModule): List + public abstract fun provideExtensionsFor(module: KtModule): List - companion object { - val EP_NAME = ExtensionPointName("org.jetbrains.kotlin.ktResolveExtensionProvider") + public companion object { + public val EP_NAME: ExtensionPointName = + ExtensionPointName("org.jetbrains.kotlin.ktResolveExtensionProvider") - fun provideExtensionsFor(module: KtModule): List { + public fun provideExtensionsFor(module: KtModule): List { return EP_NAME.getExtensionList(module.project).flatMap { it.provideExtensionsFor(module) } } } diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionReferencePsiTargetsProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionReferencePsiTargetsProvider.kt index 114809b6e77..ed765b9e5d0 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionReferencePsiTargetsProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/resolve/extensions/KtResolveExtensionReferencePsiTargetsProvider.kt @@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol -abstract class KtResolveExtensionReferencePsiTargetsProvider { +public abstract class KtResolveExtensionReferencePsiTargetsProvider { /** * Provides a [PsiElement] where `reference.resolveTo` will lead for a [symbol] * @@ -18,5 +18,5 @@ abstract class KtResolveExtensionReferencePsiTargetsProvider { * * Returned [PsiElement] will be used as a navigation target for a reference inside the IDE. */ - abstract fun KtAnalysisSession.getReferenceTargetsForSymbol(symbol: KtSymbol): Collection + public abstract fun KtAnalysisSession.getReferenceTargetsForSymbol(symbol: KtSymbol): Collection } \ No newline at end of file diff --git a/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtCompilerPluginsProvider.kt b/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtCompilerPluginsProvider.kt index 760fb1143ee..1c6447268ed 100644 --- a/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtCompilerPluginsProvider.kt +++ b/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtCompilerPluginsProvider.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor */ public abstract class KtCompilerPluginsProvider { - enum class CompilerPluginType { + public enum class CompilerPluginType { ASSIGNMENT }