azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Raw FIR] Keep the name of an anonymous object of enum entry in classId of its nested classes

Browse Source 
It is needed to have an ability to distinguish those two cases in FIR2IR:

Without this change the following tests fail:
- org.jetbrains.kotlin.test.runners.codegen.FirPsiBlackBoxCodegenTestGenerated.Enum
  - testEnumEntryReferenceFromInnerClassConstructor1()
  - testEnumEntryReferenceFromInnerClassConstructor2()
  - testEnumEntryReferenceFromInnerClassConstructor3()
  - testInnerClassMethodInEnumEntryClass()
  - testInnerClassMethodInEnumEntryClass2()
  - testKt9711_2()
  - testDeepInnerClassInEnumEntryClass()
  - testKt7257_boundReference1()
  - testInnerClassInEnumEntryClass()
  - testKt44744_innerClass()
This commit is contained in:
Dmitriy Novozhilov
2023-10-04 17:20:17 +03:00
committed by Space Team
parent 000c24fc69
commit 22f55b3dc4
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt
+1 -4
View File
@@ -419,8 +419,6 @@ class LightTreeRawFirDeclarationBuilder(
}
}
private val LighterASTNode.isDirectlyInsideEnumEntry get() = getParent()?.getParent()?.elementType == ENUM_ENTRY
/***** DECLARATIONS *****/
/**
* @see org.jetbrains.kotlin.parsing.KotlinParsing.parseClassOrObject
@@ -460,8 +458,7 @@ class LightTreeRawFirDeclarationBuilder(
}
val className = identifier.nameAsSafeName(if (modifiers.isCompanion()) "Companion" else "")
val isLocalWithinParent = classNode.isDirectlyInsideEnumEntry
|| classNode.getParent()?.elementType != CLASS_BODY && isClassLocal(classNode) { getParent() }
val isLocalWithinParent = classNode.getParent()?.elementType != CLASS_BODY && isClassLocal(classNode) { getParent() }
val classIsExpect = modifiers.hasExpect() || context.containerIsExpect
return withChildClassName(className, isExpect = classIsExpect, isLocalWithinParent) {
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt
+1 -5
View File
@@ -1376,12 +1376,8 @@ open class PsiRawFirBuilder(
}
}
private val KtElement.isDirectlyInsideEnumEntry get() = parent?.parent is KtEnumEntry
override fun visitClassOrObject(classOrObject: KtClassOrObject, data: FirElement?): FirElement {
// NB: enum entry nested classes are considered local by FIR design (see discussion in KT-45115)
val isLocalWithinParent = classOrObject.isDirectlyInsideEnumEntry
|| classOrObject.parent !is KtClassBody && classOrObject.isLocal
val isLocalWithinParent = classOrObject.parent !is KtClassBody && classOrObject.isLocal
val classIsExpect = classOrObject.hasExpectModifier() || context.containerIsExpect
val sourceElement = classOrObject.toFirSourceElement()
return withChildClassName(
compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/localDeclarationsInEnumEntry.txt
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ FILE: localDeclarationsInEnumEntry.kt
}
local final? [ContainingClassKey=<anonymous>] class Nested : R|kotlin/Any| {
public? [ContainingClassKey=Nested] constructor(): R|<local>/Nested| {
public? [ContainingClassKey=Nested] constructor(): R|<local>/<anonymous>.Nested| {
super<R|kotlin/Any|>()
}