diff --git a/analysis/analysis-api-impl-base/build.gradle.kts b/analysis/analysis-api-impl-base/build.gradle.kts index 1b3a7eb28fe..e398325bce5 100644 --- a/analysis/analysis-api-impl-base/build.gradle.kts +++ b/analysis/analysis-api-impl-base/build.gradle.kts @@ -29,6 +29,7 @@ dependencies { testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs")) testImplementation(project(":analysis:decompiled:light-classes-for-decompiled")) testImplementation(project(":analysis:decompiled:decompiler-to-psi")) + testImplementation(project(":analysis:decompiled:native")) testImplementation(projectTests(":analysis:analysis-test-framework")) testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testImplementation(toolsJar()) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt index ffd43d047d0..afbe41f9ab4 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.analysis.api.lifetime.KtReadActionConfinementLifetim import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.StandaloneProjectFactory import org.jetbrains.kotlin.analysis.decompiled.light.classes.ClsJavaStubByVirtualFileCache import org.jetbrains.kotlin.analysis.decompiled.light.classes.DecompiledLightClassesFactory +import org.jetbrains.kotlin.analysis.decompiler.konan.KlibMetaFileType import org.jetbrains.kotlin.analysis.decompiler.psi.BuiltInDefinitionFile import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInFileType import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile @@ -104,5 +105,6 @@ object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() { override fun registerApplicationServices(application: MockApplication, testServices: TestServices) { testServices.environmentManager.getApplicationEnvironment().registerFileType(KotlinBuiltInFileType, "kotlin_builtins") testServices.environmentManager.getApplicationEnvironment().registerFileType(KotlinBuiltInFileType, "kotlin_metadata") + testServices.environmentManager.getApplicationEnvironment().registerFileType(KlibMetaFileType, "knm") } } diff --git a/analysis/analysis-api-providers/build.gradle.kts b/analysis/analysis-api-providers/build.gradle.kts index d4c41e941c1..c8599b61706 100644 --- a/analysis/analysis-api-providers/build.gradle.kts +++ b/analysis/analysis-api-providers/build.gradle.kts @@ -10,6 +10,7 @@ dependencies { implementation(project(":analysis:project-structure")) implementation(project(":analysis:decompiled:decompiler-to-file-stubs")) implementation(project(":analysis:decompiled:decompiler-to-psi")) + implementation(project(":analysis:decompiled:native")) implementation(intellijCore()) } 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 c5399adad83..90e60a5a535 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 @@ -340,7 +340,7 @@ public class KotlinStaticDeclarationProviderFactory( && file.extension != BuiltInSerializerProtocol.BUILTINS_FILE_EXTENSION -> { builtInDecompiler.stubBuilder } - + fileType == KlibMetaFileType -> K2KotlinNativeMetadataDecompiler().stubBuilder else -> return null } return stubBuilder.buildFileStub(fileContent) as? KotlinFileStubImpl