MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[groovy] use InheritanceUtil.processSupers()

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2016-09-06 01:10:55 +03:00
parent cd385e6c46
commit ae57ed8e7e
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrTraitUtil.java
+7 -9
View File
@@ -27,6 +27,7 @@ import com.intellij.psi.impl.java.stubs.impl.PsiJavaFileStubImpl;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.indexing.FileBasedIndex;
@@ -42,7 +43,9 @@ import org.jetbrains.plugins.groovy.lang.resolve.GroovyTraitFieldsFileIndex;
import org.jetbrains.plugins.groovy.lang.resolve.GroovyTraitFieldsFileIndex.TraitFieldDescriptor;
import org.jetbrains.plugins.groovy.lang.resolve.GroovyTraitMethodsFileIndex;
import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import static com.intellij.psi.PsiModifier.ABSTRACT;
import static org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifierFlags.*;
@@ -74,13 +77,7 @@ public class GrTraitUtil {
public static List<PsiClass> getSelfTypeClasses(@NotNull PsiClass trait) {
return CachedValuesManager.getCachedValue(trait, () -> {
List<PsiClass> result = ContainerUtil.newArrayList();
Queue<PsiClass> queue = new ArrayDeque<>();
Set<PsiClass> visited = ContainerUtil.newHashSet();
queue.offer(trait);
while (!queue.isEmpty()) {
PsiClass clazz = queue.poll();
if (!visited.add(clazz)) continue;
ContainerUtil.addAll(queue, clazz.getSupers());
InheritanceUtil.processSupers(trait, true, clazz -> {
if (isTrait(clazz)) {
PsiAnnotation annotation = AnnotationUtil.findAnnotation(clazz, "groovy.transform.SelfType");
if (annotation != null) {
@@ -89,7 +86,8 @@ public class GrTraitUtil {
);
}
}
}
return true;
});
return CachedValueProvider.Result.create(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
});
}