From a888bb59357a8f1f1fb8ec9ad55c443f9a8ed1fd Mon Sep 17 00:00:00 2001 From: Dmitry Semeniouta Date: Wed, 4 Dec 2013 20:43:22 +0400 Subject: [PATCH] PsiUtilsCore.findLanguageFromElement: result for empty and non-empty files should be the same +review CR-IC --- platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java index eaf72d5504f7..3a12a3311c2a 100644 --- a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java +++ b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java @@ -486,7 +486,7 @@ public class PsiUtilCore { @NotNull public static Language findLanguageFromElement(final PsiElement elt) { - if (elt.getFirstChild() == null) { //is leaf + if (!(elt instanceof PsiFile) && elt.getFirstChild() == null) { //is leaf final PsiElement parent = elt.getParent(); if (parent != null) { return parent.getLanguage();