From 2bd262433bfae6d23b4d9b126b200a43f291ff6a Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Tue, 27 Sep 2011 13:12:11 +0200
Subject: [PATCH] missed substitutor in hash code (IDEA-74581)

---
 .../src/com/intellij/psi/util/MethodSignatureUtil.java          | 2 +-
 .../genericsHighlighting/MethodSignatureEquality.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureUtil.java b/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureUtil.java
index 2dfb175207b6..39c052bd18ac 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureUtil.java
@@ -51,7 +51,7 @@ public class MethodSignatureUtil {
         result += 37 * parameterTypes.length;
         PsiType firstParamType = parameterTypes.length == 0 ? null : parameterTypes[0];
         if (firstParamType != null) {
-          firstParamType = TypeConversionUtil.erasure(firstParamType);
+          firstParamType = TypeConversionUtil.erasure(firstParamType, signature.getSubstitutor());
           result = 31*result + firstParamType.hashCode();
         }
         return result;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/MethodSignatureEquality.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/MethodSignatureEquality.java
index 2473989a5dc7..54d29e778927 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/MethodSignatureEquality.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/MethodSignatureEquality.java
@@ -87,7 +87,7 @@ abstract class RunConfigurationExtension<T extends Ao> {
 
 class F extends RunConfigurationExtension<Bo> {
 
-    <error descr="Method does not override method from its superclass">@Override</error>
+    @Override
     protected <P extends Bo> SettingsEditor<P> createEditor(P configuration) {
         return null;
     }