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

[FIR] Rename FirErrors.SYNTAX_ERROR to SYNTAX

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-11-12 14:51:13 +03:00
parent 2f5b231d50
commit a6cbae9719
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt
+1 -1
View File
@@ -93,7 +93,7 @@ class ErrorNodeDiagnosticCollectorComponent(collector: AbstractDiagnosticCollect
private fun ConeSimpleDiagnostic.getFactory(): FirDiagnosticFactory0<FirSourceElement, *> {
@Suppress("UNCHECKED_CAST")
return when (kind) {
Syntax -> FirErrors.SYNTAX_ERROR
Syntax -> FirErrors.SYNTAX
ReturnNotAllowed -> FirErrors.RETURN_NOT_ALLOWED
UnresolvedLabel -> FirErrors.UNRESOLVED_LABEL
NoThis -> FirErrors.NO_THIS
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
+2 -2
View File
@@ -100,7 +100,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPERTYPE_INITIAL
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPER_IS_NOT_AN_EXPRESSION
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPER_NOT_AVAILABLE
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SYNTAX_ERROR
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SYNTAX
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_ARGUMENTS_NOT_ALLOWED
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_MISMATCH
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETERS_IN_ENUM
@@ -138,7 +138,7 @@ class FirDefaultErrorMessages : DefaultErrorMessages.Extension {
// # - The new diagnostic differs from the old FE's one
val MAP = FirDiagnosticFactoryToRendererMap("FIR").also { map ->
// Miscellaneous
map.put(SYNTAX_ERROR, "Syntax error")
map.put(SYNTAX, "Syntax error")
map.put(OTHER_ERROR, "Unknown (other) error")
// General syntax
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.*
object FirErrors {
// Miscellaneous
val SYNTAX_ERROR by error0<FirSourceElement, PsiElement>()
val SYNTAX by error0<FirSourceElement, PsiElement>()
val OTHER_ERROR by error0<FirSourceElement, PsiElement>()
// General syntax
@@ -171,4 +171,4 @@ object FirErrors {
val VARIABLE_INITIALIZER_IS_REDUNDANT by warning0<FirSourceElement, PsiElement>()
val VARIABLE_NEVER_READ by warning0<FirSourceElement, PsiElement>()
val USELESS_CALL_ON_NOT_NULL by warning0<FirSourceElement, PsiElement>()
}
}
plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt
+2 -2
View File
@@ -16,7 +16,7 @@ object DummyNameChecker : FirMemberDeclarationChecker() {
override fun check(declaration: FirMemberDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
if (declaration !is FirSimpleFunction) return
if (declaration.name.asString() == "dummy") {
declaration.source?.let { reporter.report(FirErrors.SYNTAX_ERROR.on(it)) }
declaration.source?.let { reporter.report(FirErrors.SYNTAX.on(it)) }
}
}
}
}