[FIR IDE] Properly support loop variables in KtFirSymbolProvider

This commit is contained in:
Roman Golyshev
2021-10-07 15:57:13 +03:00
committed by TeamCityServer
parent 58831eacca
commit 9113ccb8fc
5 changed files with 68 additions and 9 deletions
@@ -35,12 +35,19 @@ internal class KtFirSymbolProvider(
) : KtSymbolProvider(), ValidityTokenOwner {
private val firSymbolProvider by weakRef(firSymbolProvider)
override fun getParameterSymbol(psi: KtParameter): KtValueParameterSymbol = withValidityAssertion {
if (psi.isFunctionTypeParameter) {
error("Creating KtValueParameterSymbol for function type parameter is not possible. Please see the KDoc of getParameterSymbol")
}
psi.withFirDeclarationOfType<FirValueParameter, KtValueParameterSymbol>(resolveState) {
firSymbolBuilder.variableLikeBuilder.buildValueParameterSymbol(it)
override fun getParameterSymbol(psi: KtParameter): KtVariableLikeSymbol = withValidityAssertion {
when {
psi.isFunctionTypeParameter -> error(
"Creating KtValueParameterSymbol for function type parameter is not possible. Please see the KDoc of getParameterSymbol"
)
psi.isLoopParameter -> psi.withFirDeclarationOfType<FirProperty, KtLocalVariableSymbol>(resolveState) {
firSymbolBuilder.variableLikeBuilder.buildLocalVariableSymbol(it)
}
else -> psi.withFirDeclarationOfType<FirValueParameter, KtValueParameterSymbol>(resolveState) {
firSymbolBuilder.variableLikeBuilder.buildValueParameterSymbol(it)
}
}
}
@@ -102,6 +102,12 @@ public class SymbolByPsiTestGenerated extends AbstractSymbolByPsiTest {
runTest("analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.kt");
}
@Test
@TestMetadata("forLoopVariable.kt")
public void testForLoopVariable() throws Exception {
runTest("analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.kt");
}
@Test
@TestMetadata("function.kt")
public void testFunction() throws Exception {