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

[FIR] Validate generated member declarations

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-10-11 17:32:32 +03:00
committed by TeamCityServer
parent 7f836ee6c3
commit fce6efe412
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirGeneratedClassDeclaredMemberScope.kt
+8 -3
View File
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.caches.getValue
import org.jetbrains.kotlin.fir.declarations.FirClass import org.jetbrains.kotlin.fir.declarations.FirClass
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
import org.jetbrains.kotlin.fir.declarations.utils.classId import org.jetbrains.kotlin.fir.declarations.utils.classId
import org.jetbrains.kotlin.fir.declarations.validate
import org.jetbrains.kotlin.fir.extensions.FirDeclarationGenerationExtension import org.jetbrains.kotlin.fir.extensions.FirDeclarationGenerationExtension
import org.jetbrains.kotlin.fir.extensions.declarationGenerators import org.jetbrains.kotlin.fir.extensions.declarationGenerators
import org.jetbrains.kotlin.fir.extensions.extensionService import org.jetbrains.kotlin.fir.extensions.extensionService
@@ -56,11 +57,15 @@ class FirGeneratedClassDeclaredMemberScope(
// ------------------------------------------ generators ------------------------------------------ // ------------------------------------------ generators ------------------------------------------
private fun generateMemberFunctions(name: Name): List<FirNamedFunctionSymbol> { private fun generateMemberFunctions(name: Name): List<FirNamedFunctionSymbol> {
return extensions.flatMap { it.generateFunctions(CallableId(firClass.classId, name), firClass.symbol) } return extensions
.flatMap { it.generateFunctions(CallableId(firClass.classId, name), firClass.symbol) }
.onEach { it.fir.validate() }
} }
private fun generateMemberProperties(name: Name): List<FirPropertySymbol> { private fun generateMemberProperties(name: Name): List<FirPropertySymbol> {
return extensions.flatMap { it.generateProperties(CallableId(firClass.classId, name), firClass.symbol) } return extensions
.flatMap { it.generateProperties(CallableId(firClass.classId, name), firClass.symbol) }
.onEach { it.fir.validate() }
} }
private fun generateConstructors(): List<FirConstructorSymbol> { private fun generateConstructors(): List<FirConstructorSymbol> {
@@ -70,7 +75,7 @@ class FirGeneratedClassDeclaredMemberScope(
} else { } else {
CallableId(classId.asSingleFqName().parent(), classId.shortClassName) CallableId(classId.asSingleFqName().parent(), classId.shortClassName)
} }
return extensions.flatMap { it.generateConstructors(callableId) } return extensions.flatMap { it.generateConstructors(callableId) }.onEach { }
} }
// ------------------------------------------ scope methods ------------------------------------------ // ------------------------------------------ scope methods ------------------------------------------