[jvm-lang] JvmMetaLanguage cleanups (IDEA-CR-32321)

This commit is contained in:
Nicolay Mitropolsky
2018-05-07 18:09:06 +03:00
parent af9b0a4bfb
commit 771014b9b1
@@ -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<String> 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());
}
}