diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
| commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
| download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java')
| -rw-r--r-- | java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java b/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java index 445a8aab14a2..93b9737bdfe3 100644 --- a/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java +++ b/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java @@ -70,7 +70,8 @@ public class JavaUsageTypeProvider implements UsageTypeProviderEx { return UsageType.RECURSION; } if (qualifier != null && !(qualifier instanceof PsiThisExpression) && calledMethod != null) { - if (haveCommonSuperMethod(containerMethod, calledMethod)) { + if (Comparing.equal(containerMethod.getName(), calledMethod.getName()) && + haveCommonSuperMethod(containerMethod, calledMethod)) { boolean parametersDelegated = parametersDelegated(containerMethod, callExpression); if (qualifier instanceof PsiSuperExpression) { |