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

FIR: rename Diagnostic to DiagnosticData in checkers generators to avoid conflict with existing Diagnostic class

Browse Source
This commit is contained in:
Ilya Kirillov
2021-02-04 15:11:02 +01:00
parent cf56c59ca2
commit 21ac83aba0
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnostic.kt
+2 -2
View File
@@ -5,12 +5,12 @@
package org.jetbrains.kotlin.idea.frontend.api.fir.generator
import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.Diagnostic
import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.DiagnosticData
import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.DiagnosticParameter
import kotlin.reflect.KType
data class HLDiagnostic(
val original: Diagnostic,
val original: DiagnosticData,
val className: String,
val implClassName: String,
val parameters: List<HLDiagnosticParameter>,
idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt
+4 -4
View File
@@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.fir.FirEffectiveVisibility
import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.Diagnostic
import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.DiagnosticData
import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.DiagnosticList
import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.DiagnosticParameter
import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration
@@ -35,7 +35,7 @@ object HLDiagnosticConverter {
fun convert(diagnosticList: DiagnosticList): HLDiagnosticList =
HLDiagnosticList(diagnosticList.diagnostics.map(::convertDiagnostic))
private fun convertDiagnostic(diagnostic: Diagnostic): HLDiagnostic =
private fun convertDiagnostic(diagnostic: DiagnosticData): HLDiagnostic =
HLDiagnostic(
original = diagnostic,
className = diagnostic.getHLDiagnosticClassName(),
@@ -56,14 +56,14 @@ object HLDiagnosticConverter {
)
}
private fun Diagnostic.getHLDiagnosticClassName() =
private fun DiagnosticData.getHLDiagnosticClassName() =
name.toLowerCase()
.split('_')
.joinToString(separator = "") {
it.capitalize()
}
private fun Diagnostic.getHLDiagnosticImplClassName() =
private fun DiagnosticData.getHLDiagnosticImplClassName() =
"${getHLDiagnosticClassName()}Impl"
}