From 33e98fefa099f2f73dac5a5b6763b35f6e8f46a0 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Thu, 5 Jan 2017 16:57:05 +0100 Subject: [PATCH] EA-93376 - NPE: CodeInsightUtil.positionCursor --- .../src/com/intellij/codeInsight/CodeInsightUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java b/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java index be0920c9ea97..d4fb28810d04 100644 --- a/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java @@ -21,6 +21,7 @@ import com.intellij.codeInsight.completion.JavaCompletionUtil; import com.intellij.codeInsight.completion.PrefixMatcher; import com.intellij.lang.Language; import com.intellij.lang.StdLanguages; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.OpenFileDescriptor; @@ -46,6 +47,8 @@ import org.jetbrains.annotations.Nullable; import java.util.*; public class CodeInsightUtil { + private static final Logger LOG = Logger.getInstance(CodeInsightUtil.class); + @Nullable public static PsiExpression findExpressionInRange(PsiFile file, int startOffset, int endOffset) { if (!file.getViewProvider().getLanguages().contains(StdLanguages.JAVA)) return null; @@ -256,6 +259,7 @@ public class CodeInsightUtil { public static Editor positionCursor(final Project project, PsiFile targetFile, @NotNull PsiElement element) { TextRange range = element.getTextRange(); + LOG.assertTrue(range != null, "element: " + element + "; valid: " + element.isValid()); int textOffset = range.getStartOffset(); OpenFileDescriptor descriptor = new OpenFileDescriptor(project, targetFile.getVirtualFile(), textOffset);