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

Simplified positioning strategy for unreachable code.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-12-04 19:34:05 +03:00
parent cd197b9ff9
commit 20ee59c1e5
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+1 -6
View File
@@ -473,12 +473,7 @@ public interface Errors {
// Control flow / Data flow // Control flow / Data flow
DiagnosticFactory1<JetElement, List<TextRange>> UNREACHABLE_CODE = DiagnosticFactory1.create( DiagnosticFactory1<JetElement, List<TextRange>> UNREACHABLE_CODE = DiagnosticFactory1.create(
WARNING, PositioningStrategies.markTextRangesFromDiagnostic(new Function1<Diagnostic, List<TextRange>>() { WARNING, PositioningStrategies.UNREACHABLE_CODE);
@Override
public List<TextRange> invoke(Diagnostic diagnostic) {
return UNREACHABLE_CODE.cast(diagnostic).getA();
}
}));
DiagnosticFactory0<JetVariableDeclaration> VARIABLE_WITH_NO_TYPE_NO_INITIALIZER = DiagnosticFactory0.create(ERROR, DECLARATION_NAME); DiagnosticFactory0<JetVariableDeclaration> VARIABLE_WITH_NO_TYPE_NO_INITIALIZER = DiagnosticFactory0.create(ERROR, DECLARATION_NAME);
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt
+3 -6
View File
@@ -360,12 +360,9 @@ public object PositioningStrategies {
} }
} }
[platformStatic] public val UNREACHABLE_CODE: PositioningStrategy<PsiElement> = object : PositioningStrategy<PsiElement>() {
public fun markTextRangesFromDiagnostic(getTextRanges: (Diagnostic) -> List<TextRange>): PositioningStrategy<PsiElement> { override fun markDiagnostic(diagnostic: ParametrizedDiagnostic<out PsiElement>): List<TextRange> {
return object : PositioningStrategy<PsiElement>() { return Errors.UNREACHABLE_CODE.cast(diagnostic).getA()
override fun markDiagnostic(diagnostic: ParametrizedDiagnostic<out PsiElement>): List<TextRange> {
return getTextRanges(diagnostic)
}
} }
} }
} }