From af94b241ece4abe70aaf166f1620c5f6ee7fc883 Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Thu, 17 Aug 2023 18:23:53 +0300 Subject: [PATCH] Extract K/N decompiler related files into a separate module KTIJ-26526 --- analysis/build.gradle.kts | 1 + .../psi/KotlinLabelProviderService.kt | 2 +- analysis/decompiled/native/build.gradle.kts | 27 +++++++++++++++++++ .../konan}/CachingIdeKlibMetadataLoader.kt | 7 +++-- .../konan}/Fe10KlibMetadataDecompiler.kt | 2 +- .../konan}/Fe10KlibMetadataStubBuilder.kt | 7 +++-- .../decompiler/konan}/FileWithMetadata.kt | 7 +++-- .../konan}/K2KlibMetadataDecompiler.kt | 2 +- .../konan}/K2KlibMetadataStubBuilder.kt | 7 +++-- .../K2KotlinNativeMetadataDecompiler.kt | 7 +++-- .../decompiler/konan}/KlibDecompiledFile.kt | 2 +- .../konan}/KlibLoadingMetadataCache.kt | 7 +++-- .../decompiler/konan}/KlibMetaFileType.kt | 8 ++++-- .../konan}/KlibMetadataDecompiler.kt | 3 ++- .../KlibMetadataDeserializerForDecompiler.kt | 2 +- .../konan}/KlibMetadataStubBuilder.kt | 7 +++-- .../konan}/KotlinNativeMetadataDecompiler.kt | 7 +++-- build.gradle.kts | 1 + settings.gradle | 1 + 19 files changed, 83 insertions(+), 24 deletions(-) create mode 100644 analysis/decompiled/native/build.gradle.kts rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/CachingIdeKlibMetadataLoader.kt (89%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/Fe10KlibMetadataDecompiler.kt (98%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/Fe10KlibMetadataStubBuilder.kt (89%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/FileWithMetadata.kt (85%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/K2KlibMetadataDecompiler.kt (97%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/K2KlibMetadataStubBuilder.kt (90%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/K2KotlinNativeMetadataDecompiler.kt (69%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/KlibDecompiledFile.kt (91%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/KlibLoadingMetadataCache.kt (95%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/KlibMetaFileType.kt (69%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/KlibMetadataDecompiler.kt (96%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/KlibMetadataDeserializerForDecompiler.kt (98%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/KlibMetadataStubBuilder.kt (84%) rename analysis/decompiled/{decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi => native/src/org/jetbrains/kotlin/analysis/decompiler/konan}/KotlinNativeMetadataDecompiler.kt (74%) diff --git a/analysis/build.gradle.kts b/analysis/build.gradle.kts index 7d2c4e5148c..ffc2fd4a9d3 100644 --- a/analysis/build.gradle.kts +++ b/analysis/build.gradle.kts @@ -6,6 +6,7 @@ tasks.register("analysisAllTests") { dependsOn( ":analysis:decompiled:decompiler-to-file-stubs:test", ":analysis:decompiled:decompiler-to-psi:test", + ":analysis:decompiled:native:test", ":analysis:analysis-api:test", ":analysis:analysis-api-fir:test", ":analysis:analysis-api-fe10:test", diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinLabelProviderService.kt b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinLabelProviderService.kt index e15c17bf203..8a5de4eb2b3 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinLabelProviderService.kt +++ b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinLabelProviderService.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 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. */ diff --git a/analysis/decompiled/native/build.gradle.kts b/analysis/decompiled/native/build.gradle.kts new file mode 100644 index 00000000000..65d071d38a7 --- /dev/null +++ b/analysis/decompiled/native/build.gradle.kts @@ -0,0 +1,27 @@ +plugins { + kotlin("jvm") + id("jps-compatible") +} + +sourceSets { + "main" { projectDefault() } + "test" { projectDefault() } +} + +projectTest { + workingDir = rootDir +} + +dependencies { + api(project(":core:deserialization")) + api(project(":compiler:psi")) + api(project(":compiler:frontend.java")) + api(project(":analysis:decompiled:decompiler-to-file-stubs")) + api(project(":analysis:decompiled:decompiler-to-psi")) + api(project(":analysis:decompiled:decompiler-to-stubs")) + api(project(":js:js.serializer")) + api(project(":kotlin-util-klib-metadata")) + compileOnly(intellijCore()) +} + +testsJar() diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/CachingIdeKlibMetadataLoader.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/CachingIdeKlibMetadataLoader.kt similarity index 89% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/CachingIdeKlibMetadataLoader.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/CachingIdeKlibMetadataLoader.kt index 1bbc20936ed..13a45728f5b 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/CachingIdeKlibMetadataLoader.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/CachingIdeKlibMetadataLoader.kt @@ -1,6 +1,9 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +/* + * Copyright 2010-2023 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.analysis.decompiler.psi +package org.jetbrains.kotlin.analysis.decompiler.konan import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.VirtualFile diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/Fe10KlibMetadataDecompiler.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataDecompiler.kt similarity index 98% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/Fe10KlibMetadataDecompiler.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataDecompiler.kt index 95c19b8d7a4..31bdaa22003 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/Fe10KlibMetadataDecompiler.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataDecompiler.kt @@ -2,7 +2,7 @@ * Copyright 2010-2023 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.analysis.decompiler.psi +package org.jetbrains.kotlin.analysis.decompiler.konan import com.intellij.openapi.fileTypes.FileType import org.jetbrains.kotlin.analysis.decompiler.psi.text.DecompiledText diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/Fe10KlibMetadataStubBuilder.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataStubBuilder.kt similarity index 89% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/Fe10KlibMetadataStubBuilder.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataStubBuilder.kt index 1432f79c089..dd048ff4632 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/Fe10KlibMetadataStubBuilder.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataStubBuilder.kt @@ -1,5 +1,8 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.analysis.decompiler.psi +/* + * Copyright 2010-2023 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.analysis.decompiler.konan import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.project.Project diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/FileWithMetadata.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/FileWithMetadata.kt similarity index 85% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/FileWithMetadata.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/FileWithMetadata.kt index 9bcdb2e14c4..3c9ddc8ffd3 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/FileWithMetadata.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/FileWithMetadata.kt @@ -1,5 +1,8 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.analysis.decompiler.psi +/* + * Copyright 2010-2023 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.analysis.decompiler.konan import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/K2KlibMetadataDecompiler.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataDecompiler.kt similarity index 97% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/K2KlibMetadataDecompiler.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataDecompiler.kt index 6e1dd1aa9c5..5eac65d772f 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/K2KlibMetadataDecompiler.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataDecompiler.kt @@ -3,7 +3,7 @@ * 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.analysis.decompiler.psi +package org.jetbrains.kotlin.analysis.decompiler.konan import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.vfs.VirtualFile diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/K2KlibMetadataStubBuilder.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataStubBuilder.kt similarity index 90% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/K2KlibMetadataStubBuilder.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataStubBuilder.kt index 4858ff905df..6e205359a77 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/K2KlibMetadataStubBuilder.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataStubBuilder.kt @@ -1,6 +1,9 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +/* + * Copyright 2010-2023 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.analysis.decompiler.psi +package org.jetbrains.kotlin.analysis.decompiler.konan import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.vfs.VirtualFile diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/K2KotlinNativeMetadataDecompiler.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt similarity index 69% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/K2KotlinNativeMetadataDecompiler.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt index 7f5588596ba..cd901eda0dc 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/K2KotlinNativeMetadataDecompiler.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt @@ -1,6 +1,9 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +/* + * Copyright 2010-2023 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.analysis.decompiler.psi +package org.jetbrains.kotlin.analysis.decompiler.konan import org.jetbrains.kotlin.library.metadata.KlibMetadataSerializerProtocol import org.jetbrains.kotlin.library.metadata.KlibMetadataVersion diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibDecompiledFile.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibDecompiledFile.kt similarity index 91% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibDecompiledFile.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibDecompiledFile.kt index 26f25b5dfee..ec532d99596 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibDecompiledFile.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibDecompiledFile.kt @@ -1,6 +1,6 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package org.jetbrains.kotlin.analysis.decompiler.psi +package org.jetbrains.kotlin.analysis.decompiler.konan import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinDecompiledFileViewProvider diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibLoadingMetadataCache.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibLoadingMetadataCache.kt similarity index 95% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibLoadingMetadataCache.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibLoadingMetadataCache.kt index 3961f6571b2..9941a8d1ce7 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibLoadingMetadataCache.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibLoadingMetadataCache.kt @@ -1,6 +1,9 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +/* + * Copyright 2010-2023 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.analysis.decompiler.psi +package org.jetbrains.kotlin.analysis.decompiler.konan import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.Service diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetaFileType.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt similarity index 69% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetaFileType.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt index be7114911c6..1ad195dc416 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetaFileType.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt @@ -1,8 +1,12 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.analysis.decompiler.psi +/* + * Copyright 2010-2023 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.analysis.decompiler.konan import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.vfs.VirtualFile +import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinLabelProviderService import org.jetbrains.kotlin.library.KLIB_METADATA_FILE_EXTENSION object KlibMetaFileType : FileType { diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetadataDecompiler.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDecompiler.kt similarity index 96% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetadataDecompiler.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDecompiler.kt index acfd5c106d2..a46f5d0c2a1 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetadataDecompiler.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDecompiler.kt @@ -2,13 +2,14 @@ * Copyright 2010-2023 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.analysis.decompiler.psi +package org.jetbrains.kotlin.analysis.decompiler.konan import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.fileTypes.FileTypeRegistry import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiManager import com.intellij.psi.compiled.ClassFileDecompilers +import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinDecompiledFileViewProvider import org.jetbrains.kotlin.analysis.decompiler.psi.text.DecompiledText import org.jetbrains.kotlin.analysis.decompiler.psi.text.createIncompatibleAbiVersionDecompiledText import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetadataDeserializerForDecompiler.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDeserializerForDecompiler.kt similarity index 98% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetadataDeserializerForDecompiler.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDeserializerForDecompiler.kt index 48286d0e102..041ea291516 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetadataDeserializerForDecompiler.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDeserializerForDecompiler.kt @@ -2,7 +2,7 @@ * Copyright 2010-2023 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.analysis.decompiler.psi +package org.jetbrains.kotlin.analysis.decompiler.konan import com.intellij.openapi.diagnostic.Logger import org.jetbrains.kotlin.analysis.decompiler.psi.DeserializerForDecompilerBase diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetadataStubBuilder.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataStubBuilder.kt similarity index 84% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetadataStubBuilder.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataStubBuilder.kt index 84d7ed7bf02..85b5d257421 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KlibMetadataStubBuilder.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataStubBuilder.kt @@ -1,5 +1,8 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.analysis.decompiler.psi +/* + * Copyright 2010-2023 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.analysis.decompiler.konan import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.fileTypes.FileTypeRegistry diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinNativeMetadataDecompiler.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt similarity index 74% rename from analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinNativeMetadataDecompiler.kt rename to analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt index cee9777c52b..a50508317dc 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinNativeMetadataDecompiler.kt +++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt @@ -1,5 +1,8 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.analysis.decompiler.psi +/* + * Copyright 2010-2023 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.analysis.decompiler.konan import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.library.metadata.KlibMetadataSerializerProtocol diff --git a/build.gradle.kts b/build.gradle.kts index e850a0fcfae..093073e5fde 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -135,6 +135,7 @@ val commonCompilerModules = arrayOf( ":compiler:frontend.java", // TODO this is fe10 module but some utils used in fir ide now ":analysis:decompiled:decompiler-to-stubs", ":analysis:decompiled:decompiler-to-file-stubs", + ":analysis:decompiled:native", ":analysis:decompiled:decompiler-to-psi", ":analysis:decompiled:light-classes-for-decompiled", ":analysis:analysis-api-providers", diff --git a/settings.gradle b/settings.gradle index f3f7c7b3898..fab3ecf273b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -569,6 +569,7 @@ include ":generators:analysis-api-generator", ":analysis:decompiled:decompiler-to-psi", ":analysis:decompiled:decompiler-to-stubs", ":analysis:decompiled:decompiler-to-file-stubs", + ":analysis:decompiled:native", ":analysis:decompiled:light-classes-for-decompiled", ":analysis:decompiled:light-classes-for-decompiled-fe10", ":prepare:analysis-api-test-framework"