From b30e07ba07182dcaa0e2369baad9d70495d11710 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 27 Feb 2012 11:27:44 +0100 Subject: [PATCH] EA-31300 - assert: PsiReferenceExpressionImpl.multiResolve --- .../src/com/intellij/lang/java/JavaDocumentationProvider.java | 1 + .../com/intellij/codeInsight/navigation/CtrlMouseHandler.java | 1 + 2 files changed, 2 insertions(+) diff --git a/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java b/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java index 84a92d657add..5529ed6c5332 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java @@ -96,6 +96,7 @@ public class JavaDocumentationProvider implements CodeDocumentationProvider, Ext private static PsiSubstitutor calcSubstitutor(PsiElement originalElement) { PsiSubstitutor substitutor = PsiSubstitutor.EMPTY; if (originalElement instanceof PsiReferenceExpression) { + LOG.assertTrue(originalElement.isValid()); substitutor = ((PsiReferenceExpression)originalElement).advancedResolve(true).getSubstitutor(); } return substitutor; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java index 687237bff1a1..5679e3dd43ab 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java @@ -352,6 +352,7 @@ public class CtrlMouseHandler extends AbstractProjectComponent { public boolean isValid(Document document) { if (!myTargetElement.isValid()) return false; + if (!myElementAtPointer.isValid()) return false; if (myTargetElement == myElementAtPointer || myTargetElement == myElementAtPointer.getParent()) return false; return rangesAreCorrect(document);