MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

generate vars: don't generate this expr for java.lang classes

Browse Source 
compose text from names instead
This commit is contained in:
Anna Kozlova
2017-09-04 18:08:18 +03:00
parent fea4a22a74
commit 19e525565c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/generate-tostring/src/org/jetbrains/java/generate/GenerationUtil.java
+5 -6
View File
@@ -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) {