From 2d6bb54d9f86c66780a7ddc2194c3b2a11afc5c3 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 15 Nov 2011 12:02:03 +0100 Subject: [PATCH] New home for PsiWhiteSpace --- .../intellij/psi/impl/source/tree/PsiWhiteSpaceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/PsiWhiteSpaceImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/PsiWhiteSpaceImpl.java index a13ccd96802b..a482ac2deb17 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/PsiWhiteSpaceImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/PsiWhiteSpaceImpl.java @@ -21,7 +21,6 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.TokenType; -import com.intellij.psi.templateLanguages.OuterLanguageElement; import org.jetbrains.annotations.NotNull; public class PsiWhiteSpaceImpl extends LeafPsiElement implements PsiWhiteSpace { @@ -41,8 +40,7 @@ public class PsiWhiteSpaceImpl extends LeafPsiElement implements PsiWhiteSpace { @Override @NotNull public Language getLanguage() { - PsiElement master = getNextSibling(); - if (master == null || master instanceof OuterLanguageElement) master = getParent(); - return master.getLanguage(); + final PsiElement master = getParent(); + return master != null ? master.getLanguage() : Language.ANY; } }