From 6c973939270b7270cc116cfee08bec6af32f2fc7 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 22 Sep 2021 18:16:14 +0200 Subject: [PATCH] Analysis API: get rid of weak refs scheme for working with FIR internals for diagnostics --- .../rendererrs/KtDiagnosticClassImplementationRenderer.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt index 720cbac3755..75c0369d931 100644 --- a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt @@ -34,17 +34,14 @@ object KtDiagnosticClassImplementationRenderer : AbstractDiagnosticsDataClassRen } print(") : KtFirDiagnostic.${diagnostic.className}(), KtAbstractFirDiagnostic<") printTypeWithShortNames(diagnostic.original.psiType) - print(">") - inBracketsWithIndent { - println("override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)") - } + println(">") } private fun SmartPrinter.printParameters(diagnostic: HLDiagnostic, diagnosticList: HLDiagnosticList) { for (parameter in diagnostic.parameters) { printParameter(parameter, diagnosticList) } - println("firDiagnostic: FirPsiDiagnostic,") + println("override val firDiagnostic: FirPsiDiagnostic,") println("override val token: ValidityToken,") } @@ -62,7 +59,6 @@ object KtDiagnosticClassImplementationRenderer : AbstractDiagnosticsDataClassRen } override val defaultImports = listOf( - "org.jetbrains.kotlin.analysis.api.fir.utils.weakRef", "org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic", "org.jetbrains.kotlin.analysis.api.tokens.ValidityToken", )