EA-122213 - assert: IndexAccessValidator.checkAccessingIndexDuringOtherIndexProcessing

This commit is contained in:
Dmitry Avdeev
2018-07-19 14:30:00 +03:00
parent f6ac326c0c
commit 7beb70e0cf
2 changed files with 9 additions and 1 deletions
@@ -34,6 +34,6 @@ public class JavaFilesSearchScope extends GlobalSearchScope {
if (file.isDirectory())
return false;
FileViewProvider viewProvider = myPsiManager.findViewProvider(file);
return viewProvider != null && viewProvider.getLanguages().contains(JavaLanguage.INSTANCE);
return viewProvider != null && viewProvider.hasLanguage(JavaLanguage.INSTANCE);
}
}
@@ -89,6 +89,14 @@ public interface FileViewProvider extends Cloneable, UserDataHolderEx {
@NotNull
Set<Language> getLanguages();
/**
* Check if given language is supported.
* Implementations may provide more effective way to check without getting all languages.
*/
default boolean hasLanguage(@NotNull Language language) {
return getLanguages().contains(language);
}
/**
* @param target target language
* @return PsiFile for given language, or {@code null} if the language not present