From 29405e18ad953ff6507cb4fd2fc6e8c2778f7eff Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Wed, 29 May 2024 19:17:32 +0300 Subject: [PATCH] [Kotlin] K/N forward declarations: don't use the short fwd prefix Improves search KTIJ-29679 GitOrigin-RevId: 8c4e6bdfbcc4e09dca1ac6cfe65bada1ac2f548c --- .../KotlinNonSourceRootIndexFilter.kt | 2 +- ...rIdeForwardDeclarationsServiceFactories.kt | 8 +++---- ...nForwardDeclarationsWorkspaceEntityImpl.kt | 4 +--- .../MetadataStorageImpl.kt | 2 +- .../ProjectModuleByModuleInfo.kt | 6 ++--- .../KotlinForwardDeclarationEntities.kt | 2 +- .../KotlinForwardDeclarationsFileGenerator.kt | 4 ++-- .../KotlinForwardDeclarationsFileSystem.kt | 2 +- ...otlinForwardDeclarationsFqNameExtractor.kt | 22 +++++++++---------- ...inForwardDeclarationsModelChangeService.kt | 2 +- ...clarationsWorkspaceFileIndexContributor.kt | 2 +- .../ForwardDeclarationFqNameExtractorTest.kt | 2 +- .../k2/resources/META-INF/native-k2.xml | 8 +++---- 13 files changed, 32 insertions(+), 34 deletions(-) rename plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/{fwdDeclaration => forwardDeclarations}/KotlinForwardDeclarationsWorkspaceEntityImpl.kt (98%) rename plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/{fwdDeclaration => forwardDeclarations}/MetadataStorageImpl.kt (98%) rename plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/{fwdDeclaration => forwardDeclarations}/KotlinForwardDeclarationEntities.kt (97%) rename plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/{fwdDeclaration => forwardDeclarations}/KotlinForwardDeclarationsFileGenerator.kt (97%) rename plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/{fwdDeclaration => forwardDeclarations}/KotlinForwardDeclarationsFileSystem.kt (98%) rename plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/{fwdDeclaration => forwardDeclarations}/KotlinForwardDeclarationsFqNameExtractor.kt (53%) rename plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/{fwdDeclaration => forwardDeclarations}/KotlinForwardDeclarationsModelChangeService.kt (98%) rename plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/{fwdDeclaration => forwardDeclarations}/KotlinForwardDeclarationsWorkspaceFileIndexContributor.kt (94%) diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinNonSourceRootIndexFilter.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinNonSourceRootIndexFilter.kt index bce19d27ca54..fca440eb9ddc 100644 --- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinNonSourceRootIndexFilter.kt +++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinNonSourceRootIndexFilter.kt @@ -15,7 +15,7 @@ import com.intellij.util.indexing.hints.BaseFileTypeInputFilter import com.intellij.util.indexing.hints.BaseGlobalFileTypeInputFilter import com.intellij.util.indexing.hints.FileTypeSubstitutionStrategy.BEFORE_SUBSTITUTION import org.jetbrains.kotlin.idea.KotlinFileType -import org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration.KotlinForwardDeclarationsFileSystem +import org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations.KotlinForwardDeclarationsFileSystem private const val KOTLIN_DOT_FILE_EXTENSION = ".${KotlinFileType.EXTENSION}" diff --git a/plugins/kotlin/base/fir/analysis-api-providers/src/org/jetbrains/kotlin/idea/base/fir/analysisApiProviders/FirIdeForwardDeclarationsServiceFactories.kt b/plugins/kotlin/base/fir/analysis-api-providers/src/org/jetbrains/kotlin/idea/base/fir/analysisApiProviders/FirIdeForwardDeclarationsServiceFactories.kt index e02535715556..17ff652a7bab 100644 --- a/plugins/kotlin/base/fir/analysis-api-providers/src/org/jetbrains/kotlin/idea/base/fir/analysisApiProviders/FirIdeForwardDeclarationsServiceFactories.kt +++ b/plugins/kotlin/base/fir/analysis-api-providers/src/org/jetbrains/kotlin/idea/base/fir/analysisApiProviders/FirIdeForwardDeclarationsServiceFactories.kt @@ -16,13 +16,13 @@ import org.jetbrains.kotlin.idea.base.projectStructure.KtNativeKlibLibraryModule * FIR IDE declaration provider factory implementation for Kotlin/Native forward declarations. * Delegates to the regular factory, but uses a narrow [GlobalSearchScope] that contains only generated declarations of the [KtModule]. * - * @see [org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration.KotlinForwardDeclarationsFileGenerator] + * @see [org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations.KotlinForwardDeclarationsFileGenerator] */ class FirIdeForwardDeclarationProviderFactory : KotlinForwardDeclarationProviderFactory() { override fun createDeclarationProvider(ktModule: KtModule): KotlinDeclarationProvider? { if (ktModule !is KtNativeKlibLibraryModuleByModuleInfo) return null - return ktModule.project.createDeclarationProvider(ktModule.fwdDeclarationsScope, ktModule) + return ktModule.project.createDeclarationProvider(ktModule.forwardDeclarationsScope, ktModule) } } @@ -30,12 +30,12 @@ class FirIdeForwardDeclarationProviderFactory : KotlinForwardDeclarationProvider * FIR IDE package provider factory for Kotlin/Native forward declarations. * Delegates to the regular factory, but uses a narrow [GlobalSearchScope] that contains only generated declarations of the [KtModule]. * - * @see [org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration.KotlinForwardDeclarationsFileGenerator] + * @see [org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations.KotlinForwardDeclarationsFileGenerator] */ class FirIdeForwardDeclarationPackageProviderFactory : KotlinForwardDeclarationsPackageProviderFactory() { override fun createPackageProvider(ktModule: KtModule): KotlinPackageProvider? { if (ktModule !is KtNativeKlibLibraryModuleByModuleInfo) return null - return ktModule.project.createPackageProvider(ktModule.fwdDeclarationsScope) + return ktModule.project.createPackageProvider(ktModule.forwardDeclarationsScope) } } diff --git a/plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsWorkspaceEntityImpl.kt b/plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsWorkspaceEntityImpl.kt similarity index 98% rename from plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsWorkspaceEntityImpl.kt rename to plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsWorkspaceEntityImpl.kt index f87a663e6d0b..5f5aacee8ca1 100644 --- a/plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsWorkspaceEntityImpl.kt +++ b/plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsWorkspaceEntityImpl.kt @@ -1,15 +1,13 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration +package org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations import com.intellij.platform.workspace.jps.entities.LibraryEntity import com.intellij.platform.workspace.storage.EntitySource -import com.intellij.platform.workspace.storage.EntityType import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion import com.intellij.platform.workspace.storage.MutableEntityStorage import com.intellij.platform.workspace.storage.WorkspaceEntity -import com.intellij.platform.workspace.storage.annotations.Child import com.intellij.platform.workspace.storage.impl.ConnectionId import com.intellij.platform.workspace.storage.impl.EntityLink import com.intellij.platform.workspace.storage.impl.ModifiableWorkspaceEntityBase diff --git a/plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/MetadataStorageImpl.kt b/plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/MetadataStorageImpl.kt similarity index 98% rename from plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/MetadataStorageImpl.kt rename to plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/MetadataStorageImpl.kt index bc07a1e93d07..d2b5de7e3c75 100644 --- a/plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/MetadataStorageImpl.kt +++ b/plugins/kotlin/base/project-structure/gen/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/MetadataStorageImpl.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration +package org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations import com.intellij.platform.workspace.storage.impl.ConnectionId import com.intellij.platform.workspace.storage.metadata.impl.MetadataStorageBase diff --git a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/ProjectModuleByModuleInfo.kt b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/ProjectModuleByModuleInfo.kt index 0b73b4722d97..c1a7a5e51bb1 100644 --- a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/ProjectModuleByModuleInfo.kt +++ b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/ProjectModuleByModuleInfo.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.config.SourceKotlinRootType import org.jetbrains.kotlin.config.TestSourceKotlinRootType import org.jetbrains.kotlin.idea.KotlinFileType -import org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration.kotlinForwardDeclarationsWorkspaceEntity +import org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations.kotlinForwardDeclarationsWorkspaceEntity import org.jetbrains.kotlin.idea.base.projectStructure.moduleInfo.* import org.jetbrains.kotlin.idea.base.projectStructure.scope.LibrarySourcesScope import org.jetbrains.kotlin.idea.base.util.minus @@ -198,13 +198,13 @@ class KtNativeKlibLibraryModuleByModuleInfo( ) : KtLibraryModuleByModuleInfo(nativeLibraryInfo) { override val contentScope: GlobalSearchScope get() = GlobalSearchScope.union( - listOf(mainScope, fwdDeclarationsScope) + listOf(mainScope, forwardDeclarationsScope) ) val mainScope: GlobalSearchScope get() = nativeLibraryInfo.contentScope - val fwdDeclarationsScope: GlobalSearchScope + val forwardDeclarationsScope: GlobalSearchScope get() { val rootDirectories = getGeneratedFwdDeclarationRoots(nativeLibraryInfo) diff --git a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationEntities.kt b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationEntities.kt similarity index 97% rename from plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationEntities.kt rename to plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationEntities.kt index 98c9d7161ba0..dc9fae48da21 100644 --- a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationEntities.kt +++ b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationEntities.kt @@ -1,6 +1,6 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration +package org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations import com.intellij.platform.workspace.jps.entities.LibraryEntity import com.intellij.platform.workspace.storage.EntitySource diff --git a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsFileGenerator.kt b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsFileGenerator.kt similarity index 97% rename from plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsFileGenerator.kt rename to plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsFileGenerator.kt index 7d51a2a93dc3..0fd9f6b2ffbb 100644 --- a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsFileGenerator.kt +++ b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsFileGenerator.kt @@ -1,6 +1,6 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration +package org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.util.registry.Registry @@ -35,7 +35,7 @@ object KotlinForwardDeclarationsFileGenerator { fun generateForwardDeclarationFiles(libraryInfo: NativeKlibLibraryInfo): Path? { if (!Registry.`is`("kotlin.k2.kmp.enabled")) return null - val groupedClasses = KotlinForwardDeclarationsFqNameExtractor.getGroupedFwdDeclarations(libraryInfo).ifEmpty { return null } + val groupedClasses = KotlinForwardDeclarationsFqNameExtractor.getGroupedForwardDeclarations(libraryInfo).ifEmpty { return null } return generateForwardDeclarationsForFqNames(groupedClasses, libraryInfo.libraryRoot) } diff --git a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsFileSystem.kt b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsFileSystem.kt similarity index 98% rename from plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsFileSystem.kt rename to plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsFileSystem.kt index cf4e2449fef2..b3028a7e0245 100644 --- a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsFileSystem.kt +++ b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsFileSystem.kt @@ -1,6 +1,6 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration +package org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations import com.intellij.openapi.application.PathManager import com.intellij.openapi.util.io.FileAttributes diff --git a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsFqNameExtractor.kt b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsFqNameExtractor.kt similarity index 53% rename from plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsFqNameExtractor.kt rename to plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsFqNameExtractor.kt index d181af4e729f..2ebf650ec7b1 100644 --- a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsFqNameExtractor.kt +++ b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsFqNameExtractor.kt @@ -1,6 +1,6 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration +package org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations import org.jetbrains.kotlin.idea.base.projectStructure.moduleInfo.NativeKlibLibraryInfo import org.jetbrains.kotlin.library.KLIB_PROPERTY_INCLUDED_FORWARD_DECLARATIONS @@ -12,32 +12,32 @@ import java.util.Properties * Grouped declaration [FqName]s share the same package and so the same [org.jetbrains.kotlin.name.NativeForwardDeclarationKind]. */ object KotlinForwardDeclarationsFqNameExtractor { - fun getGroupedFwdDeclarations(libraryInfo: NativeKlibLibraryInfo): Map> { - val fqNames = getFwdDeclarationFqNames(libraryInfo) + fun getGroupedForwardDeclarations(libraryInfo: NativeKlibLibraryInfo): Map> { + val fqNames = getForwardDeclarationFqNames(libraryInfo) return groupByPackage(fqNames) } - fun getGroupedFwdDeclarations(properties: Properties): Map> { - val fqNames = getFwdDeclarationFqNames(properties) + fun getGroupedForwardDeclarations(properties: Properties): Map> { + val fqNames = getForwardDeclarationFqNames(properties) return groupByPackage(fqNames) } fun getPackageFqNames(libraryInfo: NativeKlibLibraryInfo): List { - return getGroupedFwdDeclarations(libraryInfo).keys.toList() + return getGroupedForwardDeclarations(libraryInfo).keys.toList() } internal fun groupByPackage(declarations: List): Map> = declarations.groupBy(FqName::parent) - private fun getFwdDeclarationFqNames(libraryInfo: NativeKlibLibraryInfo): List { - return getFwdDeclarationFqNames(libraryInfo.resolvedKotlinLibrary.manifestProperties) + private fun getForwardDeclarationFqNames(libraryInfo: NativeKlibLibraryInfo): List { + return getForwardDeclarationFqNames(libraryInfo.resolvedKotlinLibrary.manifestProperties) } - private fun getFwdDeclarationFqNames(properties: Properties): List { - val fwdDeclarations = properties[KLIB_PROPERTY_INCLUDED_FORWARD_DECLARATIONS]?.toString().orEmpty() + private fun getForwardDeclarationFqNames(properties: Properties): List { + val forwardDeclarations = properties[KLIB_PROPERTY_INCLUDED_FORWARD_DECLARATIONS]?.toString().orEmpty() .split(" ") .filter { it.isNotEmpty() } - return fwdDeclarations.map(::FqName) + return forwardDeclarations.map(::FqName) } } diff --git a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsModelChangeService.kt b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsModelChangeService.kt similarity index 98% rename from plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsModelChangeService.kt rename to plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsModelChangeService.kt index bb576b1a395f..4ccab06b542a 100644 --- a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsModelChangeService.kt +++ b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsModelChangeService.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration +package org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations import com.intellij.openapi.components.service import com.intellij.openapi.project.Project diff --git a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsWorkspaceFileIndexContributor.kt b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsWorkspaceFileIndexContributor.kt similarity index 94% rename from plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsWorkspaceFileIndexContributor.kt rename to plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsWorkspaceFileIndexContributor.kt index 84ffbbcc7538..4f648e30229a 100644 --- a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/fwdDeclaration/KotlinForwardDeclarationsWorkspaceFileIndexContributor.kt +++ b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/forwardDeclarations/KotlinForwardDeclarationsWorkspaceFileIndexContributor.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration +package org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations import com.intellij.openapi.util.registry.Registry import com.intellij.platform.workspace.storage.EntityStorage diff --git a/plugins/kotlin/base/project-structure/test/org/jetbrains/kotlin/idea/ForwardDeclarationFqNameExtractorTest.kt b/plugins/kotlin/base/project-structure/test/org/jetbrains/kotlin/idea/ForwardDeclarationFqNameExtractorTest.kt index 75369feddcaf..831af8d421da 100644 --- a/plugins/kotlin/base/project-structure/test/org/jetbrains/kotlin/idea/ForwardDeclarationFqNameExtractorTest.kt +++ b/plugins/kotlin/base/project-structure/test/org/jetbrains/kotlin/idea/ForwardDeclarationFqNameExtractorTest.kt @@ -3,7 +3,7 @@ package org.jetbrains.kotlin.idea import junit.framework.TestCase -import org.jetbrains.kotlin.idea.base.projectStructure.fwdDeclaration.KotlinForwardDeclarationsFqNameExtractor +import org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations.KotlinForwardDeclarationsFqNameExtractor import org.jetbrains.kotlin.name.FqName class ForwardDeclarationFqNameExtractorTest : TestCase() { diff --git a/plugins/kotlin/plugin/k2/resources/META-INF/native-k2.xml b/plugins/kotlin/plugin/k2/resources/META-INF/native-k2.xml index 67e2190a2b89..64a7b373e6ad 100644 --- a/plugins/kotlin/plugin/k2/resources/META-INF/native-k2.xml +++ b/plugins/kotlin/plugin/k2/resources/META-INF/native-k2.xml @@ -3,13 +3,13 @@ + serviceImplementation="org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations.KotlinForwardDeclarationsModelChangeService"/> + implementation="org.jetbrains.kotlin.idea.base.projectStructure.forwardDeclarations.KotlinForwardDeclarationsStartupActivity"/> - +