From 39bb64c3c15409cf4f80702e606b26066786c9e5 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 2 Sep 2014 16:19:43 +0400 Subject: [PATCH] debugger: don't try to find PsiElement after file end (CR-IC-6167) --- .../openapi/src/com/intellij/debugger/SourcePosition.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java index 45f50d34b922..86bdbde18201 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java +++ b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java @@ -233,7 +233,7 @@ public abstract class SourcePosition implements Navigatable{ } } - PsiElement element; + PsiElement element = null; int offset = startOffset; while (true) { final CharSequence charsSequence = document.getCharsSequence(); @@ -243,6 +243,8 @@ public abstract class SourcePosition implements Navigatable{ break; } } + if (offset >= charsSequence.length()) break; + element = rootElement.findElementAt(offset); if (element instanceof PsiComment) {