[Analysis API] Register default components in `org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirBuiltinsAndCloneableSession`
^KT-72704 fixed
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/projectStructure/LLFirBuiltinsSessionFactory.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/projectStructure/LLFirBuiltinsSessionFactory.kt
index 44a600e..7269126 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/projectStructure/LLFirBuiltinsSessionFactory.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/projectStructure/LLFirBuiltinsSessionFactory.kt
@@ -27,10 +27,7 @@
import org.jetbrains.kotlin.fir.resolve.scopes.wrapScopeWithJvmMapped
import org.jetbrains.kotlin.fir.resolve.transformers.FirDummyCompilerLazyDeclarationResolver
import org.jetbrains.kotlin.fir.scopes.FirKotlinScopeProvider
-import org.jetbrains.kotlin.fir.session.registerCommonComponents
-import org.jetbrains.kotlin.fir.session.registerCommonComponentsAfterExtensionsAreConfigured
-import org.jetbrains.kotlin.fir.session.registerJavaComponents
-import org.jetbrains.kotlin.fir.session.registerModuleData
+import org.jetbrains.kotlin.fir.session.*
import org.jetbrains.kotlin.fir.symbols.FirLazyDeclarationResolver
import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.has
@@ -79,6 +76,7 @@
return session.apply {
val languageVersionSettings = LanguageVersionSettingsImpl.DEFAULT
+ registerDefaultComponents()
registerIdeComponents(project, languageVersionSettings)
register(FirLazyDeclarationResolver::class, FirDummyCompilerLazyDeclarationResolver)
registerCommonComponents(languageVersionSettings)
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
index 78412e3..1c877a6 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
@@ -28105,6 +28105,12 @@
}
@Test
+ @TestMetadata("kt72704.kt")
+ public void testKt72704() {
+ runTest("compiler/testData/diagnostics/tests/multiplatform/kt72704.kt");
+ }
+
+ @Test
@TestMetadata("missingActual.kt")
public void testMissingActual() {
runTest("compiler/testData/diagnostics/tests/multiplatform/missingActual.kt");
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
index 876fe4f..ae30aa6 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
@@ -28105,6 +28105,12 @@
}
@Test
+ @TestMetadata("kt72704.kt")
+ public void testKt72704() {
+ runTest("compiler/testData/diagnostics/tests/multiplatform/kt72704.kt");
+ }
+
+ @Test
@TestMetadata("missingActual.kt")
public void testMissingActual() {
runTest("compiler/testData/diagnostics/tests/multiplatform/missingActual.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeWithLatestLanguageVersionTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeWithLatestLanguageVersionTestGenerated.java
index 79e104d..338e661 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeWithLatestLanguageVersionTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeWithLatestLanguageVersionTestGenerated.java
@@ -440,6 +440,12 @@
}
@Test
+ @TestMetadata("kt72704.kt")
+ public void testKt72704() {
+ runTest("compiler/testData/diagnostics/tests/multiplatform/kt72704.kt");
+ }
+
+ @Test
@TestMetadata("missingActual.kt")
public void testMissingActual() {
runTest("compiler/testData/diagnostics/tests/multiplatform/missingActual.kt");
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/TieredBackendJvmLightTreeTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/TieredBackendJvmLightTreeTestGenerated.java
index 6238651..9de3552 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/TieredBackendJvmLightTreeTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/TieredBackendJvmLightTreeTestGenerated.java
@@ -12204,6 +12204,12 @@
}
@Test
+ @TestMetadata("kt72704.kt")
+ public void testKt72704() {
+ runTest("compiler/testData/diagnostics/tests/multiplatform/kt72704.kt");
+ }
+
+ @Test
@TestMetadata("namedArguments.kt")
public void testNamedArguments() {
runTest("compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt");
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/TieredBackendJvmPsiTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/TieredBackendJvmPsiTestGenerated.java
index 8b8e587..465163f 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/TieredBackendJvmPsiTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/TieredBackendJvmPsiTestGenerated.java
@@ -12204,6 +12204,12 @@
}
@Test
+ @TestMetadata("kt72704.kt")
+ public void testKt72704() {
+ runTest("compiler/testData/diagnostics/tests/multiplatform/kt72704.kt");
+ }
+
+ @Test
@TestMetadata("namedArguments.kt")
public void testNamedArguments() {
runTest("compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt");
diff --git a/compiler/testData/diagnostics/tests/multiplatform/kt72704.kt b/compiler/testData/diagnostics/tests/multiplatform/kt72704.kt
new file mode 100644
index 0000000..71d969e
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/multiplatform/kt72704.kt
@@ -0,0 +1,29 @@
+// FIR_IDENTICAL
+// RUN_PIPELINE_TILL: BACKEND
+// MODULE: m1-common
+// FILE: common.kt
+
+public interface Encoder {
+ public fun foo(x: Int = 0): Int
+}
+
+public interface ContentEncoder : Encoder {}
+
+public expect object DeflateEncoder : ContentEncoder {
+ override fun foo(
+ x: Int
+ ): Int
+}
+
+public object Identity : Encoder {
+ override fun foo(
+ x: Int
+ ): Int = x
+}
+
+
+// MODULE: m2-js()()(m1-common)
+// FILE: js.kt
+
+public actual object DeflateEncoder : ContentEncoder, Encoder by Identity {
+}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 6993dcc..432f376 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -28105,6 +28105,12 @@
}
@Test
+ @TestMetadata("kt72704.kt")
+ public void testKt72704() {
+ runTest("compiler/testData/diagnostics/tests/multiplatform/kt72704.kt");
+ }
+
+ @Test
@TestMetadata("missingActual.kt")
public void testMissingActual() {
runTest("compiler/testData/diagnostics/tests/multiplatform/missingActual.kt");