From bbeff80f1f21443c959d3635c6b1a67427cebfa2 Mon Sep 17 00:00:00 2001 From: "Maxim.Medvedev" Date: Fri, 23 Mar 2012 19:27:46 +0400 Subject: [PATCH] don't add parameter type by override-implement action if there is no parameter type in base method --- .../overrideImplement/GroovyOverrideImplementUtil.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyOverrideImplementUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyOverrideImplementUtil.java index 0767cedcaf18..d725c411e807 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyOverrideImplementUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyOverrideImplementUtil.java @@ -30,6 +30,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.GrReferenceAdjuster; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory; import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrCodeBlock; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod; import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement; @@ -133,9 +134,11 @@ public class GroovyOverrideImplementUtil { for (int i = 0; i < parameters.length; i++) { if (i > 0) buffer.append(", "); PsiParameter parameter = parameters[i]; - final PsiType parameterType = substitutor.substitute(parameter.getType()); - buffer.append(parameterType.getCanonicalText()); - buffer.append(" "); + if (!(parameter instanceof GrParameter && parameter.getTypeElement() == null)) { + final PsiType parameterType = substitutor.substitute(parameter.getType()); + buffer.append(parameterType.getCanonicalText()); + buffer.append(" "); + } final String paramName = parameter.getName(); if (paramName != null) { buffer.append(paramName);