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

Fix fir analysis api after refactorings

Browse Source
This commit is contained in:
Ilya Chernikov
2021-09-20 10:01:23 +02:00
parent 31c58767cf
commit f1d0ead652
18 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLDiagnosticConverter.kt
+6 -6
View File
@@ -182,7 +182,7 @@ private object FirToKtConversionCreator {
KtExpression::class.createType(nullable = true),
importsToAdd = listOf(
"org.jetbrains.kotlin.psi.KtExpression",
"org.jetbrains.kotlin.fir.psi"
"org.jetbrains.kotlin.psi"
)
),
)
@@ -214,7 +214,7 @@ private object FirToKtConversionCreator {
KtExpression::class.createType(),
importsToAdd = listOf(
"org.jetbrains.kotlin.psi.KtExpression",
"org.jetbrains.kotlin.fir.psi"
"org.jetbrains.kotlin.psi"
)
),
FirQualifiedAccess::class to HLFunctionCallConversion(
@@ -222,7 +222,7 @@ private object FirToKtConversionCreator {
KtExpression::class.createType(),
importsToAdd = listOf(
"org.jetbrains.kotlin.psi.KtExpression",
"org.jetbrains.kotlin.fir.psi"
"org.jetbrains.kotlin.psi"
)
),
FirValueParameter::class to HLFunctionCallConversion(
@@ -313,11 +313,11 @@ private object FirToKtConversionCreator {
importsToAdd = listOf("org.jetbrains.kotlin.fir.declarations.FirSimpleFunction")
),
KtSourceElement::class to HLFunctionCallConversion(
"({0} as FirPsiSourceElement).psi",
"({0} as KtPsiSourceElement).psi",
PsiElement::class.createType(),
importsToAdd = listOf(
"org.jetbrains.kotlin.fir.psi",
"org.jetbrains.kotlin.FirPsiSourceElement"
"org.jetbrains.kotlin.psi",
"org.jetbrains.kotlin.KtPsiSourceElement"
)
)
)
analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt
+3 -3
View File
@@ -5,11 +5,11 @@
package org.jetbrains.kotlin.analysis.api.fir.generator.rendererrs
import org.jetbrains.kotlin.fir.checkers.generator.inBracketsWithIndent
import org.jetbrains.kotlin.analysis.api.fir.generator.ConversionContext
import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnostic
import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticList
import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticParameter
import org.jetbrains.kotlin.fir.checkers.generator.inBracketsWithIndent
import org.jetbrains.kotlin.util.SmartPrinter
import org.jetbrains.kotlin.util.withIndent
@@ -45,7 +45,7 @@ object FirDiagnosticToKtDiagnosticConverterRenderer : AbstractDiagnosticsDataCla
private fun SmartPrinter.printDiagnosticParameters(diagnostic: HLDiagnostic) {
printCustomParameters(diagnostic)
println("firDiagnostic as FirPsiDiagnostic,")
println("firDiagnostic as KtPsiDiagnostic,")
println("token,")
}
@@ -68,7 +68,7 @@ object FirDiagnosticToKtDiagnosticConverterRenderer : AbstractDiagnosticsDataCla
diagnosticParameter.importsToAdd
override val defaultImports = listOf(
"org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic",
"org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic",
"org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors",
"org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors",
)
analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt
+4 -4
View File
@@ -5,12 +5,12 @@
package org.jetbrains.kotlin.analysis.api.fir.generator.rendererrs
import org.jetbrains.kotlin.fir.checkers.generator.collectClassNamesTo
import org.jetbrains.kotlin.fir.checkers.generator.inBracketsWithIndent
import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnostic
import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticList
import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticParameter
import org.jetbrains.kotlin.analysis.api.fir.generator.printTypeWithShortNames
import org.jetbrains.kotlin.fir.checkers.generator.collectClassNamesTo
import org.jetbrains.kotlin.fir.checkers.generator.inBracketsWithIndent
import org.jetbrains.kotlin.util.SmartPrinter
import org.jetbrains.kotlin.util.withIndent
@@ -41,7 +41,7 @@ object KtDiagnosticClassImplementationRenderer : AbstractDiagnosticsDataClassRen
for (parameter in diagnostic.parameters) {
printParameter(parameter, diagnosticList)
}
println("override val firDiagnostic: FirPsiDiagnostic,")
println("override val firDiagnostic: KtPsiDiagnostic,")
println("override val token: ValidityToken,")
}
@@ -59,7 +59,7 @@ object KtDiagnosticClassImplementationRenderer : AbstractDiagnosticsDataClassRen
}
override val defaultImports = listOf(
"org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic",
"org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic",
"org.jetbrains.kotlin.analysis.api.tokens.ValidityToken",
)
}