From 771014b9b1151b108ebda6deacb98c2c1f87b482 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Mon, 7 May 2018 18:09:06 +0300 Subject: [PATCH] [jvm-lang] JvmMetaLanguage cleanups (IDEA-CR-32321) --- .../src/com/intellij/lang/jvm/JvmMetaLanguage.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java/java-psi-api/src/com/intellij/lang/jvm/JvmMetaLanguage.java b/java/java-psi-api/src/com/intellij/lang/jvm/JvmMetaLanguage.java index 4ff7fa8514b3..2748de804d24 100644 --- a/java/java-psi-api/src/com/intellij/lang/jvm/JvmMetaLanguage.java +++ b/java/java-psi-api/src/com/intellij/lang/jvm/JvmMetaLanguage.java @@ -5,6 +5,7 @@ import com.intellij.lang.Language; import com.intellij.lang.LanguageExtensionPoint; import com.intellij.lang.MetaLanguage; import com.intellij.lang.jvm.source.JvmDeclarationSearcher; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.ExtensionPoint; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.extensions.ExtensionsArea; @@ -20,6 +21,8 @@ import java.util.stream.Collectors; */ public class JvmMetaLanguage extends MetaLanguage { + private static final Logger LOG = Logger.getInstance(JvmMetaLanguage.class); + private final Set supportedLanguages; protected JvmMetaLanguage() { @@ -36,11 +39,12 @@ public class JvmMetaLanguage extends MetaLanguage { } else { supportedLanguages = Collections.emptySet(); + LOG.warn("'JvmMetaLanguage' requested but no implementations of 'JvmDeclarationSearcher' EP were found in the 'rootArea'"); } } @Override public boolean matchesLanguage(@NotNull Language language) { - return supportedLanguages.contains(language.getID()); + return language instanceof JvmLanguage || supportedLanguages.contains(language.getID()); } }