Merge commit 'e7e91bf86117e09bb40e53461f818e0ec9645ee5'

GitOrigin-RevId: 4310e333a4b326022001786485e451ad8ae439e5
This commit is contained in:
Yan Zhulanow
2023-09-06 15:37:20 +09:00
committed by intellij-monorepo-bot
120 changed files with 2254 additions and 550 deletions

View File

@@ -2,6 +2,7 @@
package com.intellij.psi.impl.search;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.lang.Language;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.fileTypes.FileTypeRegistry;
@@ -146,6 +147,15 @@ public class JavaOverridingMethodsSearcher implements QueryExecutor<PsiMethod, O
public OverridingMethodsSearch.SearchParameters getOriginalParameters() {
return myOriginalParameters;
}
@Override
public boolean shouldSearchInLanguage(@NotNull Language language) {
PsiClass aClass = getClassToProcess();
if (ReadAction.compute(() -> aClass.isEnum())) {
return language == aClass.getLanguage();
}
return super.shouldSearchInLanguage(language);
}
}
@Nullable