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] collect traits methods independently of AstTransformations

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2015-08-19 15:22:47 +03:00
parent 0fbb1674fa
commit 6b7acf113f
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionMembersCache.java
+30 -29
View File
@@ -135,6 +135,7 @@ public class GrTypeDefinitionMembersCache {
private List<GrField> getFieldsImpl() {
List<GrField> fields = ContainerUtil.newArrayList(myDefinition.getCodeFields());
fields.addAll(new TraitCollector().collectFields());
fields.addAll(getSyntheticFields());
return fields;
}
@@ -157,6 +158,7 @@ public class GrTypeDefinitionMembersCache {
Collection<PsiMethod> result = ContainerUtil.newLinkedHashSet();
GrClassImplUtil.collectMethodsFromBody(myDefinition, result);
result.addAll(new TraitCollector().collectMethods(result));
for (PsiMethod method : AstTransformContributor.runContributors(myDefinition).getMethods()) {
GrClassImplUtil.addExpandingReflectedMethods(result, method);
}
@@ -179,8 +181,8 @@ public class GrTypeDefinitionMembersCache {
myTreeChangeTracker.incModificationCount();
}
public static class TraitCollector extends AstTransformContributor {
private abstract static class TraitProcessor<T extends PsiElement> {
private class TraitCollector {
private abstract class TraitProcessor<T extends PsiElement> {
private final ArrayList<CandidateInfo> result = ContainerUtil.newArrayList();
private final Set<PsiClass> processed = ContainerUtil.newHashSet();
@@ -216,18 +218,17 @@ public class GrTypeDefinitionMembersCache {
}
}
@Override
public void collectMethods(@NotNull GrTypeDefinition clazz, Collection<PsiMethod> collector) {
if (clazz.isInterface() && !clazz.isTrait()) return;
@NotNull
public List<PsiMethod> collectMethods(@NotNull Collection<PsiMethod> codeMethods) {
if (myDefinition.isInterface() && !myDefinition.isTrait()) return Collections.emptyList();
GrImplementsClause clause = clazz.getImplementsClause();
if (clause == null) return;
GrImplementsClause clause = myDefinition.getImplementsClause();
if (clause == null) return Collections.emptyList();
PsiClassType[] types = clause.getReferencedTypes();
List<PsiClassType.ClassResolveResult> traits = getSuperTraitsByCorrectOrder(types);
if (traits.isEmpty()) return;
if (traits.isEmpty()) return Collections.emptyList();
PsiMethod[] codeMethods = clazz.getCodeMethods();
Set<MethodSignature> existingSignatures = ContainerUtil.newHashSet(ContainerUtil.map(codeMethods, new Function<PsiMethod, MethodSignature>() {
@Override
public MethodSignature fun(PsiMethod method) {
@@ -235,6 +236,8 @@ public class GrTypeDefinitionMembersCache {
}
}));
List<PsiMethod> result = ContainerUtil.newArrayList();
for (PsiClassType.ClassResolveResult resolveResult : traits) {
GrTypeDefinition trait = (GrTypeDefinition)resolveResult.getElement();
LOG.assertTrue(trait != null);
@@ -260,29 +263,31 @@ public class GrTypeDefinitionMembersCache {
}
}.getResult();
for (CandidateInfo candidateInfo : concreteTraitMethods) {
List<GrMethod> methodsToAdd = getExpandingMethods(clazz, candidateInfo);
List<GrMethod> methodsToAdd = getExpandingMethods(candidateInfo);
for (GrMethod impl : methodsToAdd) {
if (existingSignatures.add(impl.getSignature(PsiSubstitutor.EMPTY))) {
collector.add(impl);
result.add(impl);
}
}
}
}
return result;
}
@Override
public void collectFields(@NotNull GrTypeDefinition clazz, Collection<GrField> collector) {
if (clazz.isInterface() && !clazz.isTrait()) return;
@NotNull
public List<GrField> collectFields() {
if (myDefinition.isInterface() && !myDefinition.isTrait()) return Collections.emptyList();
if (clazz.isTrait()) {
for (GrField field : clazz.getCodeFields()) {
collector.add(new GrTraitField(field, clazz, PsiSubstitutor.EMPTY));
List<GrField> result = ContainerUtil.newArrayList();
if (myDefinition.isTrait()) {
for (GrField field : myDefinition.getCodeFields()) {
result.add(new GrTraitField(field, myDefinition, PsiSubstitutor.EMPTY));
}
}
GrImplementsClause clause = clazz.getImplementsClause();
if (clause == null) return;
GrImplementsClause clause = myDefinition.getImplementsClause();
if (clause == null) return result;
PsiClassType[] types = clause.getReferencedTypes();
List<PsiClassType.ClassResolveResult> traits = getSuperTraitsByCorrectOrder(types);
@@ -298,21 +303,17 @@ public class GrTypeDefinitionMembersCache {
}
}.getResult();
for (CandidateInfo candidateInfo : traitFields) {
collector.add(new GrTraitField(((PsiField)candidateInfo.getElement()), clazz, candidateInfo.getSubstitutor()));
result.add(new GrTraitField(((PsiField)candidateInfo.getElement()), myDefinition, candidateInfo.getSubstitutor()));
}
}
if (clazz.isTrait()) {
for (GrField field : clazz.getCodeFields()) {
collector.add(new GrTraitField(field, clazz, PsiSubstitutor.EMPTY));
}
}
return result;
}
@NotNull
private static List<GrMethod> getExpandingMethods(@NotNull GrTypeDefinition clazz, @NotNull CandidateInfo candidateInfo) {
private List<GrMethod> getExpandingMethods(@NotNull CandidateInfo candidateInfo) {
PsiMethod method = (PsiMethod)candidateInfo.getElement();
GrLightMethodBuilder implementation = GrTraitMethod.create(method, candidateInfo.getSubstitutor()).setContainingClass(clazz);
GrLightMethodBuilder implementation = GrTraitMethod.create(method, candidateInfo.getSubstitutor()).setContainingClass(myDefinition);
implementation.getModifierList().removeModifier(GrModifierFlags.ABSTRACT_MASK);
GrReflectedMethod[] reflectedMethods = implementation.getReflectedMethods();
@@ -320,7 +321,7 @@ public class GrTypeDefinitionMembersCache {
}
@NotNull
private static List<PsiClassType.ClassResolveResult> getSuperTraitsByCorrectOrder(@NotNull PsiClassType[] types) {
private List<PsiClassType.ClassResolveResult> getSuperTraitsByCorrectOrder(@NotNull PsiClassType[] types) {
List<PsiClassType.ClassResolveResult> traits = ContainerUtil.newArrayList();
for (int i = types.length - 1; i >= 0; i--) {
PsiClassType.ClassResolveResult resolveResult = types[i].resolveGenerics();
plugins/groovy/src/META-INF/plugin.xml
-1
View File
@@ -107,7 +107,6 @@
<closureMissingMethodContributor implementation="org.jetbrains.plugins.groovy.lang.resolve.PluginXmlClosureMemberContributor"/>
<astTransformContributor implementation="org.jetbrains.plugins.groovy.lang.psi.impl.statements.typedef.GrTypeDefinitionMembersCache$TraitCollector"/>
<astTransformContributor implementation="org.jetbrains.plugins.groovy.lang.resolve.ast.DelegatedMethodsContributor"/>
<astTransformContributor implementation="org.jetbrains.plugins.groovy.lang.resolve.ast.AutoExternalizeContributor"/>
<astTransformContributor implementation="org.jetbrains.plugins.groovy.lang.resolve.ast.AutoCloneContributor"/>