Add info about the end of range in scripting REPL compiler messages

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.kt

@@ -22,6 +22,8 @@ interface CompilerMessageSourceLocation : Serializable {
     val path: String
     val line: Int
     val column: Int
+    val lineEnd: Int get() = -1
+    val columnEnd: Int get() = -1
     val lineContent: String?
 }
 
@@ -46,3 +48,31 @@ data class CompilerMessageLocation private constructor(
         private val serialVersionUID: Long = 8228357578L
     }
 }
+
+data class CompilerMessageLocationWithRange private constructor(
+    override val path: String,
+    override val line: Int,
+    override val column: Int,
+    override val lineEnd: Int,
+    override val columnEnd: Int,
+    override val lineContent: String?
+) : CompilerMessageSourceLocation {
+    override fun toString(): String =
+        path + (if (line != -1 || column != -1) " ($line:$column)" else "")
+
+    companion object {
+        @JvmStatic
+        fun create(
+            path: String?,
+            lineStart: Int,
+            columnStart: Int,
+            lineEnd: Int?,
+            columnEnd: Int?,
+            lineContent: String?
+        ): CompilerMessageLocationWithRange? =
+            if (path == null) null else CompilerMessageLocationWithRange(path, lineStart, columnStart, lineEnd ?: -1, columnEnd ?: -1, lineContent)
+
+        private val serialVersionUID: Long = 8228357578L
+    }
+}
+

compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/DefaultDiagnosticReporter.kt

@@ -31,6 +31,6 @@ interface MessageCollectorBasedReporter : DiagnosticMessageReporter {
     override fun report(diagnostic: Diagnostic, file: PsiFile, render: String) = messageCollector.report(
         AnalyzerWithCompilerReport.convertSeverity(diagnostic.severity),
         render,
-        MessageUtil.psiFileToMessageLocation(file, file.name, DiagnosticUtils.getLineAndColumn(diagnostic))
+        MessageUtil.psiFileToMessageLocation(file, file.name, DiagnosticUtils.getLineAndColumnRange(diagnostic))
     )
 }

compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java

@@ -32,21 +32,23 @@ public class MessageUtil {
     private MessageUtil() {}
 
     @Nullable
-    public static CompilerMessageLocation psiElementToMessageLocation(@Nullable PsiElement element) {
+    public static CompilerMessageSourceLocation psiElementToMessageLocation(@Nullable PsiElement element) {
         if (element == null) return null;
         PsiFile file = element.getContainingFile();
-        return psiFileToMessageLocation(file, "<no path>", DiagnosticUtils.getLineAndColumnInPsiFile(file, element.getTextRange()));
+        return psiFileToMessageLocation(file, "<no path>", DiagnosticUtils.getLineAndColumnRangeInPsiFile(file, element.getTextRange()));
     }
 
     @Nullable
-    public static CompilerMessageLocation psiFileToMessageLocation(
+    public static CompilerMessageSourceLocation psiFileToMessageLocation(
             @NotNull PsiFile file,
             @Nullable String defaultValue,
-            @NotNull PsiDiagnosticUtils.LineAndColumn lineAndColumn
+            @NotNull PsiDiagnosticUtils.LineAndColumnRange range
     ) {
         VirtualFile virtualFile = file.getVirtualFile();
         String path = virtualFile != null ? virtualFileToPath(virtualFile) : defaultValue;
-        return CompilerMessageLocation.create(path, lineAndColumn.getLine(), lineAndColumn.getColumn(), lineAndColumn.getLineContent());
+        PsiDiagnosticUtils.LineAndColumn start = range.getStart();
+        PsiDiagnosticUtils.LineAndColumn end = range.getEnd();
+        return CompilerMessageLocationWithRange.create(path, start.getLine(), start.getColumn(), end.getLine(), end.getColumn(), start.getLineContent());
     }
 
     @NotNull

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticUtils.java

@@ -84,6 +84,24 @@ public class DiagnosticUtils {
         return PsiDiagnosticUtils.offsetToLineAndColumn(document, range.getStartOffset());
     }
 
+    @NotNull
+    public static PsiDiagnosticUtils.LineAndColumnRange getLineAndColumnRange(@NotNull Diagnostic diagnostic) {
+        PsiFile file = diagnostic.getPsiFile();
+        List<TextRange> textRanges = diagnostic.getTextRanges();
+        if (textRanges.isEmpty()) return PsiDiagnosticUtils.LineAndColumnRange.NONE;
+        TextRange firstRange = firstRange(textRanges);
+        return getLineAndColumnRangeInPsiFile(file, firstRange);
+    }
+
+    @NotNull
+    public static PsiDiagnosticUtils.LineAndColumnRange getLineAndColumnRangeInPsiFile(PsiFile file, TextRange range) {
+        Document document = file.getViewProvider().getDocument();
+        return new PsiDiagnosticUtils.LineAndColumnRange(
+                PsiDiagnosticUtils.offsetToLineAndColumn(document, range.getStartOffset()),
+                PsiDiagnosticUtils.offsetToLineAndColumn(document, range.getEndOffset())
+        );
+    }
+
     public static void throwIfRunningOnServer(Throwable e) {
         // This is needed for the Web Demo server to log the exceptions coming from the analyzer instead of showing them in the editor.
         if (System.getProperty("kotlin.running.in.server.mode", "false").equals("true") || ApplicationManager.getApplication().isUnitTestMode()) {

compiler/psi/src/org/jetbrains/kotlin/diagnostics/PsiDiagnosticUtils.java

@@ -116,4 +116,35 @@ public class PsiDiagnosticUtils {
             return "(" + line + "," + column + ")";
         }
     }
+
+    public static final class LineAndColumnRange {
+
+        public static final LineAndColumnRange NONE = new LineAndColumnRange(LineAndColumn.NONE, LineAndColumn.NONE);
+
+        private final LineAndColumn start;
+        private final LineAndColumn end;
+
+        public LineAndColumnRange(LineAndColumn start, LineAndColumn end) {
+            this.start = start;
+            this.end = end;
+        }
+
+        public LineAndColumn getStart() {
+            return start;
+        }
+
+        public LineAndColumn getEnd() {
+            return end;
+        }
+
+        // NOTE: This method is used for presenting positions to the user
+        @Override
+        public String toString() {
+            if (start.line == end.line) {
+                return "(" + start.line + "," + start.column + "-" + end.column + ")";
+            }
+
+            return start.toString() + " - " + end.toString();
+        }
+    }
 }