Skip to content

Commit 5aa1d8f

Browse files
cypressiousSpace Team
authored andcommitted
[FIR] Only return generated nested classes from FirExtensionDeclarationsSymbolProvider
Otherwise, FirCommonDeclarationsMappingSymbolProvider is never called for nested classes if a compiler plugin is enabled. #KT-79693 Fixed
1 parent 179c824 commit 5aa1d8f

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

compiler/fir/providers/src/org/jetbrains/kotlin/fir/extensions/FirExtensionDeclarationsSymbolProvider.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ package org.jetbrains.kotlin.fir.extensions
88
import org.jetbrains.kotlin.fir.FirSession
99
import org.jetbrains.kotlin.fir.FirSessionComponent
1010
import org.jetbrains.kotlin.fir.caches.*
11+
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
12+
import org.jetbrains.kotlin.fir.declarations.isJavaOrEnhancement
1113
import org.jetbrains.kotlin.fir.declarations.validate
1214
import org.jetbrains.kotlin.fir.ownerGenerator
1315
import org.jetbrains.kotlin.fir.render
@@ -111,7 +113,9 @@ class FirExtensionDeclarationsSymbolProvider private constructor(
111113
result = it
112114
}
113115
}
114-
result
116+
// Lombok plugin sets the origin of generated declarations to FirDeclarationOrigin.Java.Source.
117+
// TODO(KT-79778) Remove check for FirDeclarationOrigin.Java.Source when we have a proper generated Java origin.
118+
result?.takeIf { it.origin.generated || it.origin == FirDeclarationOrigin.Java.Source }
115119
}
116120
else -> {
117121
val matchedExtensions = extensionsByTopLevelClassId.getValue()[classId] ?: return null

plugins/plugin-sandbox/testData/box/mppDependencyWithActualTypealiasAnnotation.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// LANGUAGE: +MultiPlatformProjects
22
// TARGET_BACKEND: JVM
3-
// IGNORE_HMPP: JVM_IR
43

54
// MODULE: lib-common
65
package foo

plugins/plugin-sandbox/testData/box/replaceActualFunctionBodyWitExpectDefaultValue.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// LANGUAGE: +MultiPlatformProjects
22
// ISSUE: KT-56173
3-
// IGNORE_HMPP: JVM_IR, JS_IR
43

54
// MODULE: common
65
// FILE: common.kt

0 commit comments

Comments
 (0)