From 57433608480b1fbb808cef9e07f22730bc980eaa Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 24 Jun 2010 19:40:44 +0400 Subject: [PATCH] don't expose LightElement.navigationElement, allow to override it --- .../src/com/intellij/psi/impl/light/LightElement.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/psi/impl/light/LightElement.java b/platform/lang-impl/src/com/intellij/psi/impl/light/LightElement.java index 2dadb49516a1..7d3ab21db6a0 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/light/LightElement.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/light/LightElement.java @@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull; public abstract class LightElement extends PsiElementBase { protected final PsiManager myManager; private final Language myLanguage; - protected volatile PsiElement myNavigationElement = this; + private volatile PsiElement myNavigationElement = this; protected LightElement(PsiManager manager, final Language language) { myManager = manager; @@ -97,8 +97,9 @@ public abstract class LightElement extends PsiElementBase { } public boolean isValid() { - if (myNavigationElement != this) { - return myNavigationElement.isValid(); + final PsiElement navElement = getNavigationElement(); + if (navElement != this) { + return navElement.isValid(); } return true;