From bd632e61f4042b89f6a487556cc5ad968894514c Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 7 Oct 2016 16:18:12 +0700 Subject: [PATCH] PsiReference.isReferenceTo() used (IDEA-CR-14288) --- .../codeInspection/OptionalIsPresentInspection.java | 2 +- .../java18api/Java8CollectionRemoveIfInspection.java | 2 +- .../java18api/Java8ReplaceMapGetInspection.java | 2 +- .../streamMigration/ReplaceWithFindFirstFix.java | 2 +- .../streamMigration/StreamApiMigrationInspection.java | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java index 73d43330d3b8..93f360530609 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java @@ -134,7 +134,7 @@ public class OptionalIsPresentInspection extends BaseJavaBatchLocalInspectionToo if(!"get".equals(call.getMethodExpression().getReferenceName())) return false; PsiExpression qualifier = call.getMethodExpression().getQualifierExpression(); if(!(qualifier instanceof PsiReferenceExpression)) return false; - return ((PsiReferenceExpression)qualifier).resolve() == variable; + return ((PsiReferenceExpression)qualifier).isReferenceTo(variable); } @Contract("null, _ -> false") diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionRemoveIfInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionRemoveIfInspection.java index 682ed7749a31..2060327bd3dd 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionRemoveIfInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionRemoveIfInspection.java @@ -239,7 +239,7 @@ public class Java8CollectionRemoveIfInspection extends BaseJavaBatchLocalInspect if(!method.equals(expression.getReferenceName())) return false; PsiExpression qualifier = expression.getQualifierExpression(); if(!(qualifier instanceof PsiReferenceExpression)) return false; - return ((PsiReferenceExpression)qualifier).resolve() == myIterator; + return ((PsiReferenceExpression)qualifier).isReferenceTo(myIterator); } public PsiVariable getNextElementVariable(PsiStatement statement) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8ReplaceMapGetInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8ReplaceMapGetInspection.java index 030ce25d8654..ef8f4986aa16 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8ReplaceMapGetInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8ReplaceMapGetInspection.java @@ -159,7 +159,7 @@ public class Java8ReplaceMapGetInspection extends BaseJavaBatchLocalInspectionTo PsiElement[] elements = declaration.getDeclaredElements(); if(elements.length > 0) { PsiElement lastDeclaration = elements[elements.length - 1]; - if(lastDeclaration instanceof PsiLocalVariable && lastDeclaration == target.resolve()) { + if(lastDeclaration instanceof PsiLocalVariable && target.isReferenceTo(lastDeclaration)) { PsiLocalVariable var = (PsiLocalVariable)lastDeclaration; PsiExpression initializer = PsiUtil.skipParenthesizedExprDown(var.getInitializer()); if (initializer instanceof PsiMethodCallExpression && diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/ReplaceWithFindFirstFix.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/ReplaceWithFindFirstFix.java index 2a60250cc194..cca1d5ce74ee 100644 --- a/java/java-impl/src/com/intellij/codeInspection/streamMigration/ReplaceWithFindFirstFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/ReplaceWithFindFirstFix.java @@ -92,7 +92,7 @@ class ReplaceWithFindFirstFix extends MigrateToStreamFix { if(previousAssignment != null) { PsiExpression prevRValue = previousAssignment.getRExpression(); PsiExpression prevLValue = previousAssignment.getLExpression(); - if(prevRValue != null && prevLValue instanceof PsiReferenceExpression && ((PsiReferenceExpression)prevLValue).resolve() == var) { + if(prevRValue != null && prevLValue instanceof PsiReferenceExpression && ((PsiReferenceExpression)prevLValue).isReferenceTo(var)) { previousAssignment.delete(); return loopStatement.replace(elementFactory.createStatementFromText( var.getName() + " = " + generateOptionalUnwrap(stream, tb, value, prevRValue, var.getType()) + ";", loopStatement)); diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java index d84181e06202..13281bd34db4 100644 --- a/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java @@ -380,7 +380,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo @Contract("_, null -> false") static boolean isIdentityMapping(PsiVariable variable, PsiExpression mapperCall) { - return mapperCall instanceof PsiReferenceExpression && ((PsiReferenceExpression)mapperCall).resolve() == variable; + return mapperCall instanceof PsiReferenceExpression && ((PsiReferenceExpression)mapperCall).isReferenceTo(variable); } @Nullable @@ -724,7 +724,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo if(args.length != 1) return null; comparatorExpression = args[0]; } - if(!(listExpression instanceof PsiReferenceExpression) || ((PsiReferenceExpression)listExpression).resolve() != list) return null; + if(!(listExpression instanceof PsiReferenceExpression) || !((PsiReferenceExpression)listExpression).isReferenceTo(list)) return null; if(comparatorExpression == null || ExpressionUtils.isNullLiteral(comparatorExpression)) return ""; return comparatorExpression.getText(); } @@ -762,7 +762,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); if (!(qualifierExpression instanceof PsiReferenceExpression)) return null; PsiLocalVariable collectionVariable = extractCollectionVariable(expression.getMethodExpression().getQualifierExpression()); - if (collectionVariable == null || ((PsiReferenceExpression)qualifierExpression).resolve() != collectionVariable) return null; + if (collectionVariable == null || !((PsiReferenceExpression)qualifierExpression).isReferenceTo(collectionVariable)) return null; PsiExpression initializer = collectionVariable.getInitializer(); if (initializer == null) return null; PsiType type = initializer.getType(); @@ -1080,7 +1080,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo // check that increment is like for(...;...;i++) if(!(forStatement.getUpdate() instanceof PsiExpressionStatement)) return null; PsiExpression lValue = extractIncrementedLValue(((PsiExpressionStatement)forStatement.getUpdate()).getExpression()); - if(!(lValue instanceof PsiReferenceExpression) || ((PsiReferenceExpression)lValue).resolve() != counter) return null; + if(!(lValue instanceof PsiReferenceExpression) || !((PsiReferenceExpression)lValue).isReferenceTo(counter)) return null; // check that condition is like for(...;i