diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index d35b79228a1..245c707c559 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -473,12 +473,7 @@ public interface Errors { // Control flow / Data flow DiagnosticFactory1> UNREACHABLE_CODE = DiagnosticFactory1.create( - WARNING, PositioningStrategies.markTextRangesFromDiagnostic(new Function1>() { - @Override - public List invoke(Diagnostic diagnostic) { - return UNREACHABLE_CODE.cast(diagnostic).getA(); - } - })); + WARNING, PositioningStrategies.UNREACHABLE_CODE); DiagnosticFactory0 VARIABLE_WITH_NO_TYPE_NO_INITIALIZER = DiagnosticFactory0.create(ERROR, DECLARATION_NAME); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt index 6d8f28f32a0..6cdc5d46b39 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt @@ -360,12 +360,9 @@ public object PositioningStrategies { } } - [platformStatic] - public fun markTextRangesFromDiagnostic(getTextRanges: (Diagnostic) -> List): PositioningStrategy { - return object : PositioningStrategy() { - override fun markDiagnostic(diagnostic: ParametrizedDiagnostic): List { - return getTextRanges(diagnostic) - } + public val UNREACHABLE_CODE: PositioningStrategy = object : PositioningStrategy() { + override fun markDiagnostic(diagnostic: ParametrizedDiagnostic): List { + return Errors.UNREACHABLE_CODE.cast(diagnostic).getA() } } } \ No newline at end of file