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

Use first text range for diagnostics with multiple ranges.

Browse Source 
Move TEXT_RANGE_COMPARATOR to DiagnosticUtils.
This commit is contained in:
Pavel V. Talanov
2012-08-01 16:13:58 +04:00
parent f58ba37d4f
commit d45145b3a7
5 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java
+3 -14
View File
@@ -45,17 +45,6 @@ import java.util.List;
*/
public final class AnalyzerWithCompilerReport {
@NotNull
private static final Comparator<TextRange> TEXT_RANGE_COMPARATOR = new Comparator<TextRange>() {
@Override
public int compare(TextRange o1, TextRange o2) {
if (o1.getStartOffset() != o2.getStartOffset()) {
return o1.getStartOffset() - o2.getStartOffset();
}
return o1.getEndOffset() - o2.getEndOffset();
}
};
@NotNull
private static CompilerMessageSeverity convertSeverity(@NotNull Severity severity) {
switch (severity) {
@@ -143,11 +132,11 @@ public final class AnalyzerWithCompilerReport {
String path2 = d2.getPsiFile().getViewProvider().getVirtualFile().getPath();
if (!path1.equals(path2)) return path1.compareTo(path2);
TextRange range1 = d1.getTextRanges().iterator().next();
TextRange range2 = d2.getTextRanges().iterator().next();
TextRange range1 = DiagnosticUtils.firstRange(d1.getTextRanges());
TextRange range2 = DiagnosticUtils.firstRange(d2.getTextRanges());
if (!range1.equals(range2)) {
return TEXT_RANGE_COMPARATOR.compare(range1, range2);
return DiagnosticUtils.TEXT_RANGE_COMPARATOR.compare(range1, range2);
}
return d1.getFactory().getName().compareTo(d2.getFactory().getName());