Skip to content

Fix #130 by using isReferenceToReference helper method #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alshain wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #130 by using isReferenceToReference helper method #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/com/intellij/advancedExpressionFolding/AdvancedExpressionFoldingBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,8 @@ && startsWith(((PsiMethodCallExpression) qualifier).getMethodExpression().getRef
.filter(e ->
e instanceof PsiReferenceExpression
&& !(e.getParent() instanceof PsiMethodCallExpression)
&& ((PsiReferenceExpression) e).isReferenceTo(r.resolve())
|| e instanceof PsiMethodCallExpression && ((PsiMethodCallExpression) e).getMethodExpression().isReferenceTo(r.resolve())
&& isReferenceToReference((PsiReferenceExpression) e, r)
|| e instanceof PsiMethodCallExpression && isReferenceToReference(((PsiMethodCallExpression) e).getMethodExpression(), r)
).toList();
if (references.size() > 0) {
return new ElvisExpression(element, element.getTextRange(),
Expand All @@ -756,7 +756,7 @@ private static boolean equal(@Nullable PsiElement e1, @Nullable PsiElement e2) {
// TODO: Use a cache for the resolved instance
if (e2 instanceof PsiReferenceExpression && e1 instanceof PsiReferenceExpression) {
return Objects.equals(((PsiReferenceExpression) e2).getReferenceName(), ((PsiReferenceExpression) e1).getReferenceName())
&& ((PsiReferenceExpression) e2).isReferenceTo(((PsiReferenceExpression) e1).resolve());
&& isReferenceToReference((PsiReferenceExpression) e2, (PsiReferenceExpression) e1);
} else if (e2 instanceof PsiMethodCallExpression && e1 instanceof PsiMethodCallExpression) {
return equal(((PsiMethodCallExpression) e2).getMethodExpression(),
((PsiMethodCallExpression) e1).getMethodExpression())
Expand Down