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

SLC: fix type mapping mode for var

Browse Source 
^KT-57578
This commit is contained in:
Jinseong Jeon
2023-04-03 18:10:00 -07:00
committed by Ilya Kirillov
parent 95491f223c
commit 5403cc7feb
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt
+6 -1
View File
@@ -66,10 +66,15 @@ internal class SymbolLightFieldForProperty private constructor(
(kotlinOrigin as? KtProperty)?.delegateExpression?.getKtType() (kotlinOrigin as? KtProperty)?.delegateExpression?.getKtType()
else else
propertySymbol.returnType propertySymbol.returnType
// See [KotlinTypeMapper#writeFieldSignature]
val typeMappingMode = if (propertySymbol.isVal)
KtTypeMappingMode.RETURN_TYPE
else
KtTypeMappingMode.VALUE_PARAMETER
ktType?.asPsiType( ktType?.asPsiType(
this@SymbolLightFieldForProperty, this@SymbolLightFieldForProperty,
allowErrorTypes = true, allowErrorTypes = true,
KtTypeMappingMode.RETURN_TYPE typeMappingMode,
) )
} ?: nonExistentType() } ?: nonExistentType()
} }
compiler/testData/asJava/lightClasses/lightClassByPsi/generics.fir.java
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
public abstract class C /* C*/<T> { public abstract class C /* C*/<T> {
@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull()
private java.util.List<java.lang.CharSequence> constructorParam; private java.util.List<? extends java.lang.CharSequence> constructorParam;
@org.jetbrains.annotations.Nullable() @org.jetbrains.annotations.Nullable()
private java.util.HashSet<java.lang.String> sHashSetProp; private java.util.HashSet<java.lang.String> sHashSetProp;
@org.jetbrains.annotations.Nullable() @org.jetbrains.annotations.Nullable()
private java.util.List<java.lang.CharSequence> csListProp; private java.util.List<? extends java.lang.CharSequence> csListProp;
@org.jetbrains.annotations.Nullable() @org.jetbrains.annotations.Nullable()
private java.util.List<java.lang.String> sListProp; private java.util.List<java.lang.String> sListProp;