From da86e536ad006c8f7540b04a78f8d1e8fab3a2f0 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Thu, 15 Sep 2022 14:17:45 +0200
Subject: [PATCH] Do not swallow exception throwing IOOBE

#KTIJ-22746
---
 .../expressions/ExpressionTypingVisitorDispatcher.java   | 9 ++++++++-
 .../jetbrains/kotlin/diagnostics/PsiDiagnosticUtils.java | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java
index 5e4c5993fbc..6a809208fef 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java
@@ -242,9 +242,16 @@ public abstract class ExpressionTypingVisitorDispatcher extends KtVisitor<Kotlin
 
     private static void logOrThrowException(@NotNull KtExpression expression, Throwable e) {
         try {
+            String location;
+            try {
+                location = " in " + PsiDiagnosticUtils.atLocation(expression);
+            }
+            catch (Exception ex) {
+                location = "";
+            }
             // This trows AssertionError in CLI and reports the error in the IDE
             LOG.error(
-                    new KotlinExceptionWithAttachments("Exception while analyzing expression at " + PsiDiagnosticUtils.atLocation(expression), e)
+                    new KotlinExceptionWithAttachments("Exception while analyzing expression" + location, e)
                         .withAttachment("expression.kt", expression.getText())
             );
         }
diff --git a/compiler/psi/src/org/jetbrains/kotlin/diagnostics/PsiDiagnosticUtils.java b/compiler/psi/src/org/jetbrains/kotlin/diagnostics/PsiDiagnosticUtils.java
index 2285e3bfe15..6ef7fd338a8 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/diagnostics/PsiDiagnosticUtils.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/diagnostics/PsiDiagnosticUtils.java
@@ -62,12 +62,12 @@ public class PsiDiagnosticUtils {
         int offset = textRange.getStartOffset();
         VirtualFile virtualFile = file.getVirtualFile();
         String pathSuffix = " in " + (virtualFile == null ? file.getName() : virtualFile.getPath());
-        return offsetToLineAndColumn(document, offset).toString() + pathSuffix;
+        return offsetToLineAndColumn(document, offset) + pathSuffix;
     }
 
     @NotNull
     public static LineAndColumn offsetToLineAndColumn(@Nullable Document document, int offset) {
-        if (document == null) {
+        if (document == null || document.getTextLength() == 0) {
             return new LineAndColumn(-1, offset, null);
         }
 
@@ -145,7 +145,7 @@ public class PsiDiagnosticUtils {
                 return "(" + start.line + "," + start.column + "-" + end.column + ")";
             }
 
-            return start.toString() + " - " + end.toString();
+            return start + " - " + end;
         }
     }
 }