From 5120aa9835cb459dc1eca0a75e446c1c5c5aa137 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 22 Nov 2011 09:53:29 +0100 Subject: [PATCH] Ctrl-Q: detect acceptable method with respect to assignability (IDEA-77139) --- .../src/com/intellij/codeInsight/javadoc/JavaDocUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java index 6cbce8c1ba28..f5de67ebd889 100644 --- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java @@ -157,10 +157,12 @@ public class JavaDocUtil { for (int k = 0; k < parms.length; k++) { PsiParameter parm = parms[k]; + final PsiType parmType = parm.getType(); if ( types[k] != null && - !TypeConversionUtil.erasure(parm.getType()).getCanonicalText().equals(types[k].getCanonicalText()) && - !parm.getType().getCanonicalText().equals(types[k].getCanonicalText()) + !TypeConversionUtil.erasure(parmType).getCanonicalText().equals(types[k].getCanonicalText()) && + !parmType.getCanonicalText().equals(types[k].getCanonicalText()) && + !TypeConversionUtil.isAssignable(parmType, types[k]) ) { continue MethodsLoop; }