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

[FIR] Fix reporting diagnostics in CLI which was broken in previous commit

Browse Source 
Note: reporting properly works only for PSI
This commit is contained in:
Dmitriy Novozhilov
2021-06-08 19:17:46 +03:00
parent d807ac2f05
commit 399b7aceef
5 changed files with 101 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticUtils.java
+6 -1
View File
@@ -36,7 +36,7 @@ import java.util.List;
public class DiagnosticUtils {
@NotNull
private static final Comparator<TextRange> TEXT_RANGE_COMPARATOR = (o1, o2) -> {
public static final Comparator<TextRange> TEXT_RANGE_COMPARATOR = (o1, o2) -> {
if (o1.getStartOffset() != o2.getStartOffset()) {
return o1.getStartOffset() - o2.getStartOffset();
}
@@ -87,6 +87,11 @@ public class DiagnosticUtils {
public static PsiDiagnosticUtils.LineAndColumnRange getLineAndColumnRange(@NotNull Diagnostic diagnostic) {
PsiFile file = diagnostic.getPsiFile();
List<TextRange> textRanges = diagnostic.getTextRanges();
return getLineAndColumnRange(file, textRanges);
}
@NotNull
public static PsiDiagnosticUtils.LineAndColumnRange getLineAndColumnRange(PsiFile file, List<TextRange> textRanges) {
if (textRanges.isEmpty()) return PsiDiagnosticUtils.LineAndColumnRange.NONE;
TextRange firstRange = firstRange(textRanges);
return getLineAndColumnRangeInPsiFile(file, firstRange);