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

[SLC] generate correct name for property assessors in case of JvmRecord

Browse Source 
^KT-62357 Fixed
This commit is contained in:
Dmitrii Gridin
2024-01-04 15:29:04 +01:00
committed by Space Team
parent 5c71015b09
commit 44388ea15f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt
+7 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2024 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. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
@@ -95,8 +95,12 @@ internal class SymbolLightAccessorMethod private constructor(
withPropertySymbol { propertySymbol -> withPropertySymbol { propertySymbol ->
val accessorSymbol = propertySymbol.accessorSymbol val accessorSymbol = propertySymbol.accessorSymbol
accessorSymbol.getJvmNameFromAnnotation(accessorSite.toOptionalFilter()) ?: run { accessorSymbol.getJvmNameFromAnnotation(accessorSite.toOptionalFilter()) ?: run {
val outerClass = this@SymbolLightAccessorMethod.containingClass
val defaultName = propertySymbol.name.identifier.let { val defaultName = propertySymbol.name.identifier.let {
if (this@SymbolLightAccessorMethod.containingClass.isAnnotationType) it else it.abiName() if (outerClass.isAnnotationType || outerClass.isRecord)
it
else
it.abiName()
} }
val visibility = if (!isGetter && propertySymbol.canHaveNonPrivateField) val visibility = if (!isGetter && propertySymbol.canHaveNonPrivateField)
@@ -104,7 +108,7 @@ internal class SymbolLightAccessorMethod private constructor(
else else
propertySymbol.visibility propertySymbol.visibility
propertySymbol.computeJvmMethodName(defaultName, this@SymbolLightAccessorMethod.containingClass, accessorSite, visibility) propertySymbol.computeJvmMethodName(defaultName, outerClass, accessorSite, visibility)
} }
} }
} }
compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ public final class MyRec /* pkg.MyRec*/ {
public final java.lang.String component1();// component1() public final java.lang.String component1();// component1()
@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull()
public final java.lang.String getName();// getName() public final java.lang.String name();// name()
@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull()
public final pkg.MyRec copy(@org.jetbrains.annotations.NotNull() java.lang.String);// copy(java.lang.String) public final pkg.MyRec copy(@org.jetbrains.annotations.NotNull() java.lang.String);// copy(java.lang.String)