From 19e525565c6a8bf5077f436e870227c020fd0cd6 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 4 Sep 2017 17:48:18 +0300 Subject: [PATCH] generate vars: don't generate this expr for java.lang classes compose text from names instead --- .../org/jetbrains/java/generate/GenerationUtil.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerationUtil.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerationUtil.java index f4375c7d15cd..8d55c3caec32 100644 --- a/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerationUtil.java +++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerationUtil.java @@ -23,11 +23,13 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.psi.*; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiField; +import com.intellij.psi.PsiMember; +import com.intellij.psi.PsiMethod; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.codeStyle.JavaCodeStyleSettings; import com.intellij.psi.codeStyle.NameUtil; -import com.intellij.refactoring.util.RefactoringChangeUtil; import com.intellij.util.containers.ContainerUtil; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; @@ -205,10 +207,7 @@ public class GenerationUtil { // information to keep as it is to avoid breaking compatibility with prior releases vc.put("classname", useFullyQualifiedName ? ce.getQualifiedName() : ce.getName()); vc.put("FQClassname", ce.getQualifiedName()); - PsiType type = RefactoringChangeUtil.createThisExpression(clazz.getManager(), clazz).getType(); - if (type != null) { - vc.put("classSignature", type.getPresentableText()); - } + vc.put("classSignature", ce.getName() + (clazz.hasTypeParameters() ? "<" + StringUtil.join(clazz.getTypeParameters(), param -> param.getName(),", ") + ">": "")); } if (member != null) {