Support finding descriptors for java statics #171
Conversation
This PR fixes a bug where static java declarations were not being resolved properly because we would only look at the main scope of the class declaration but we also need to check the static scope. I've also refactored resolveJavaDeclaration to move common code to helpers. Fixes: google#170
|
ugh i was passing jdk 11 path for jdk 9 and seems like it made the function visible after this fix. |
| .resolveClass(JavaMethodImpl(psi).containingClass) | ||
| ?.findEnclosedDescriptor( | ||
| kindFilter = DescriptorKindFilter.FUNCTIONS, | ||
| psi = psi |
There was a problem hiding this comment.
It looks no difference from just pass the filter lambda at this call site.
There was a problem hiding this comment.
yea you are right, i first had the psi version then added the filter version hence this unnecessary duplication.
removed the psi version to always require the lambda.
| kindFilter: DescriptorKindFilter, | ||
| psi: PsiElement | ||
| ): DeclarationDescriptor? { | ||
| return this.unsubstitutedMemberScope.findEnclosedDescriptor( |
There was a problem hiding this comment.
Since you are using firstOrNull it should make no performance impact if we just combine 2 lists together and call the filter.
There was a problem hiding this comment.
this method is going away (and it was wrong by not delegating to the ClassDescriptor filter version) so i'm assuming this comment applies to the other one as well?
in that case though i have member scopes that i cannot combine.
I can combine the results of getContributedDescriptors but that would have two unnecessary things:
- it would query staticScope regardless even when we find the result in member scope
- it would create another list to combine the two.
hence, i think it is better to keep the ClassDescriptor.findEnclosedDescriptor above as is? (this function is going away)
* Handle statics in resolveJavaDeclaration This PR fixes a bug where static java declarations were not being resolved properly because we would only look at the main scope of the class declaration but we also need to check the static scope.
No description provided.