[FE] Clean up positioning strategies
diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/model/RegularDiagnosticData.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/model/RegularDiagnosticData.kt
index 2365ce7..b0a14c6 100644
--- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/model/RegularDiagnosticData.kt
+++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/model/RegularDiagnosticData.kt
@@ -41,7 +41,7 @@
val type: KType
)
-enum class PositioningStrategy(private val strategy: String? = null) {
+enum class PositioningStrategy {
DEFAULT,
VAL_OR_VAR_NODE,
SECONDARY_CONSTRUCTOR_DELEGATION_CALL,
@@ -98,7 +98,6 @@
SPREAD_OPERATOR,
DECLARATION_WITH_BODY,
NOT_SUPPORTED_IN_INLINE_MOST_RELEVANT,
- INCOMPATIBLE_DECLARATION,
ACTUAL_DECLARATION_NAME,
UNREACHABLE_CODE,
CONTEXT_KEYWORD,
@@ -128,13 +127,9 @@
CALLABLE_DECLARATION_SIGNATURE_NO_MODIFIERS,
;
- val expressionToCreate get() = "SourceElementPositioningStrategies.${strategy ?: name}"
+ val expressionToCreate get() = "SourceElementPositioningStrategies.$name"
companion object {
const val importToAdd = "org.jetbrains.kotlin.diagnostics.SourceElementPositioningStrategies"
}
}
-
-
-fun DiagnosticData.hasDefaultPositioningStrategy(): Boolean =
- positioningStrategy == PositioningStrategy.DEFAULT
diff --git a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/SourceElementPositioningStrategies.kt b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/SourceElementPositioningStrategies.kt
index 531dfff..d7ef680 100644
--- a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/SourceElementPositioningStrategies.kt
+++ b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/SourceElementPositioningStrategies.kt
@@ -335,9 +335,6 @@
PositioningStrategies.LABEL
)
- // TODO
- val INCOMPATIBLE_DECLARATION = DEFAULT
-
val NOT_SUPPORTED_IN_INLINE_MOST_RELEVANT = SourceElementPositioningStrategy(
LightTreePositioningStrategies.NOT_SUPPORTED_IN_INLINE_MOST_RELEVANT,
PositioningStrategies.NOT_SUPPORTED_IN_INLINE_MOST_RELEVANT
