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

[AA FIR] support symbol pointer restore for value parameter from delegated setter

Browse Source 
^KT-54051
This commit is contained in:
Dmitrii Gridin
2022-11-23 20:58:12 +01:00
committed by Space Team
parent 55ca2d608b
commit dfc59d5d07
9 changed files with 248 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java
Generated
+6
View File
@@ -106,6 +106,12 @@ public class Fe10IdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated extends A
runTest("analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt");
}
@Test
@TestMetadata("delegatedProp.kt")
public void testDelegatedProp() throws Exception {
runTest("analysis/analysis-api/testData/symbols/symbolByPsi/delegatedProp.kt");
}
@Test
@TestMetadata("deprecated.kt")
public void testDeprecated() throws Exception {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/KtFirValueParameterSymbolPointer.kt
+2 -2
View File
@@ -26,7 +26,7 @@ internal class KtFirValueParameterSymbolPointer(
}
val function = ownerSymbol.firSymbol.fir as? FirFunction ?: return null
val firValueParameterSymbol = function.valueParameters.getOrNull(index)?.takeIf { it.name == name } ?: return null
return analysisSession.firSymbolBuilder.variableLikeBuilder.buildValueParameterSymbol(firValueParameterSymbol.symbol)
val firValueParameterSymbol = function.valueParameters.getOrNull(index)?.symbol?.takeIf { it.name == name } ?: return null
return analysisSession.firSymbolBuilder.variableLikeBuilder.buildValueParameterSymbol(firValueParameterSymbol)
}
}
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/symbols/FirIdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java
Generated
+6
View File
@@ -106,6 +106,12 @@ public class FirIdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated extends Ab
runTest("analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt");
}
@Test
@TestMetadata("delegatedProp.kt")
public void testDelegatedProp() throws Exception {
runTest("analysis/analysis-api/testData/symbols/symbolByPsi/delegatedProp.kt");
}
@Test
@TestMetadata("deprecated.kt")
public void testDeprecated() throws Exception {
analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/symbols/FirStandaloneNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java
Generated
+6
View File
@@ -106,6 +106,12 @@ public class FirStandaloneNormalAnalysisSourceModuleSymbolByPsiTestGenerated ext
runTest("analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt");
}
@Test
@TestMetadata("delegatedProp.kt")
public void testDelegatedProp() throws Exception {
runTest("analysis/analysis-api/testData/symbols/symbolByPsi/delegatedProp.kt");
}
@Test
@TestMetadata("deprecated.kt")
public void testDeprecated() throws Exception {
analysis/analysis-api/testData/symbols/symbolByPsi/delegatedProp.descriptors.pretty.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
var delegatedProp: kotlin.String
get()
set(value: kotlin.String)
analysis/analysis-api/testData/symbols/symbolByPsi/delegatedProp.descriptors.txt
Vendored
+110
View File
@@ -0,0 +1,110 @@
KtKotlinPropertySymbol:
annotationsList: []
callableIdIfNonLocal: /delegatedProp
contextReceivers: []
getter: KtPropertyGetterSymbol:
annotationsList: []
callableIdIfNonLocal: null
contextReceivers: []
hasBody: false
hasStableParameterNames: true
isDefault: true
isExtension: false
isInline: false
isOverride: false
modality: FINAL
origin: SOURCE
receiverParameter: null
returnType: kotlin/String
symbolKind: ACCESSOR
typeParameters: []
valueParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
hasBackingField: false
hasGetter: true
hasSetter: true
initializer: null
isConst: false
isDelegatedProperty: true
isExtension: false
isFromPrimaryConstructor: false
isLateInit: false
isOverride: false
isStatic: false
isVal: false
modality: FINAL
name: delegatedProp
origin: SOURCE
receiverParameter: null
returnType: kotlin/String
setter: KtPropertySetterSymbol:
annotationsList: []
callableIdIfNonLocal: null
contextReceivers: []
hasBody: false
hasStableParameterNames: true
isDefault: true
isExtension: false
isInline: false
isOverride: false
modality: FINAL
origin: SOURCE
parameter: KtValueParameterSymbol:
annotationsList: []
callableIdIfNonLocal: null
contextReceivers: []
generatedPrimaryConstructorProperty: null
hasDefaultValue: false
isCrossinline: false
isExtension: false
isImplicitLambdaParameter: false
isNoinline: false
isVararg: false
name: value
origin: SOURCE
receiverParameter: null
returnType: kotlin/String
symbolKind: LOCAL
typeParameters: []
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
receiverParameter: null
returnType: kotlin/Unit
symbolKind: ACCESSOR
typeParameters: []
valueParameters: [
KtValueParameterSymbol:
annotationsList: []
callableIdIfNonLocal: null
contextReceivers: []
generatedPrimaryConstructorProperty: null
hasDefaultValue: false
isCrossinline: false
isExtension: false
isImplicitLambdaParameter: false
isNoinline: false
isVararg: false
name: value
origin: SOURCE
receiverParameter: null
returnType: kotlin/String
symbolKind: LOCAL
typeParameters: []
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
]
visibility: Public
getContainingModule: Could not render due to kotlin.NotImplementedError: An operation is not implemented: org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.KtFe10PsiDefaultPropertySetterSymbol
deprecationStatus: null
symbolKind: TOP_LEVEL
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
getterDeprecationStatus: null
javaGetterName: getDelegatedProp
javaSetterName: setDelegatedProp
setterDeprecationStatus: null
analysis/analysis-api/testData/symbols/symbolByPsi/delegatedProp.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
// WITH_STDLIB
// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
var delegatedProp: String by Delegate()
analysis/analysis-api/testData/symbols/symbolByPsi/delegatedProp.pretty.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
var delegatedProp: kotlin.String
get()
set(delegatedProp: kotlin.String)
analysis/analysis-api/testData/symbols/symbolByPsi/delegatedProp.txt
Vendored
+109
View File
@@ -0,0 +1,109 @@
KtKotlinPropertySymbol:
annotationsList: []
callableIdIfNonLocal: /delegatedProp
contextReceivers: []
getter: KtPropertyGetterSymbol:
annotationsList: []
callableIdIfNonLocal: null
contextReceivers: []
hasBody: true
hasStableParameterNames: true
isDefault: false
isExtension: false
isInline: false
isOverride: false
modality: FINAL
origin: SOURCE
receiverParameter: null
returnType: kotlin/String
symbolKind: ACCESSOR
typeParameters: []
valueParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
hasBackingField: false
hasGetter: true
hasSetter: true
initializer: null
isConst: false
isDelegatedProperty: true
isExtension: false
isFromPrimaryConstructor: false
isLateInit: false
isOverride: false
isStatic: false
isVal: false
modality: FINAL
name: delegatedProp
origin: SOURCE
receiverParameter: null
returnType: kotlin/String
setter: KtPropertySetterSymbol:
annotationsList: []
callableIdIfNonLocal: null
contextReceivers: []
hasBody: true
hasStableParameterNames: true
isDefault: false
isExtension: false
isInline: false
isOverride: false
modality: FINAL
origin: SOURCE
parameter: KtValueParameterSymbol:
annotationsList: []
callableIdIfNonLocal: null
contextReceivers: []
generatedPrimaryConstructorProperty: null
hasDefaultValue: false
isCrossinline: false
isExtension: false
isImplicitLambdaParameter: false
isNoinline: false
isVararg: false
name: delegatedProp
origin: SOURCE
receiverParameter: null
returnType: kotlin/String
symbolKind: LOCAL
typeParameters: []
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
receiverParameter: null
returnType: kotlin/Unit
symbolKind: ACCESSOR
typeParameters: []
valueParameters: [
KtValueParameterSymbol:
annotationsList: []
callableIdIfNonLocal: null
contextReceivers: []
generatedPrimaryConstructorProperty: null
hasDefaultValue: false
isCrossinline: false
isExtension: false
isImplicitLambdaParameter: false
isNoinline: false
isVararg: false
name: delegatedProp
origin: SOURCE
receiverParameter: null
returnType: kotlin/String
symbolKind: LOCAL
typeParameters: []
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
]
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
symbolKind: TOP_LEVEL
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
getterDeprecationStatus: null
javaGetterName: getDelegatedProp
javaSetterName: setDelegatedProp
setterDeprecationStatus: null