ReadClassDataTest: read inner classes
(this commit is made on speed 250km/h somewhere between Moscow and Saint Petersburg)
This commit is contained in:
+2
@@ -83,6 +83,8 @@ public class JavaClassMembersScope implements JetScope {
|
|||||||
}
|
}
|
||||||
|
|
||||||
allDescriptors.addAll(semanticServices.getDescriptorResolver().resolveFieldGroup(containingDeclaration, psiClass, staticMembers));
|
allDescriptors.addAll(semanticServices.getDescriptorResolver().resolveFieldGroup(containingDeclaration, psiClass, staticMembers));
|
||||||
|
|
||||||
|
allDescriptors.addAll(semanticServices.getDescriptorResolver().resolveInnerClasses(containingDeclaration, psiClass, staticMembers));
|
||||||
}
|
}
|
||||||
return allDescriptors;
|
return allDescriptors;
|
||||||
}
|
}
|
||||||
|
|||||||
+9
@@ -1409,4 +1409,13 @@ public class JavaDescriptorResolver {
|
|||||||
public TypeParameterDescriptor resolveTypeParameter(PsiTypeParameter typeParameter) {
|
public TypeParameterDescriptor resolveTypeParameter(PsiTypeParameter typeParameter) {
|
||||||
return resolveTypeParameterInitialization(typeParameter).descriptor;
|
return resolveTypeParameterInitialization(typeParameter).descriptor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<ClassDescriptor> resolveInnerClasses(DeclarationDescriptor owner, PsiClass psiClass, boolean staticMembers) {
|
||||||
|
PsiClass[] innerPsiClasses = psiClass.getInnerClasses();
|
||||||
|
List<ClassDescriptor> r = new ArrayList<ClassDescriptor>(innerPsiClasses.length);
|
||||||
|
for (PsiClass innerPsiClass : innerPsiClasses) {
|
||||||
|
r.add(resolveClass(innerPsiClass));
|
||||||
|
}
|
||||||
|
return r;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
package test
|
||||||
|
|
||||||
|
class Outer {
|
||||||
|
class Inner {
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user