work with 2020.1

Author: Jinzhou Zhang

CodeGenerator.iml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

resources/META-INF/plugin.xml

@@ -1,10 +1,12 @@
 <idea-plugin>
   <id>me.lotabout.codegenerator</id>
   <name>Code Generator</name>
-  <version>1.3.3</version>
+  <version>1.4.0</version>
   <vendor email="lotabout@gmail.com" url="https://lotabout.me">Jinzhou Zhang</vendor>
 
   <description><![CDATA[
+  <p>Please backup your configurations before update!!!</p>
+
   <p>This plugin allows user to create customized velocity templates like <code>toString</code> or <code>builder</code></p>
   <p>As we know, Intellij had provided useful code generators such as constructors, getter/setters, equals, hashCode,
    overrides and delegates, etc. And Intellij allows us to apply customized velocity templates for each generator.
@@ -20,6 +22,7 @@
 
   <change-notes><![CDATA[
   <ul>
+  <li>version 1.4.0 <p>compatible with 2020.1</p></li>
   <li>version 1.3.3 <p>fix: pipeline settings could not be saved.</p></li>
   <li>version 1.3.2 <p>support idea 2016.3 and after</p></li>
   <li>version 1.3.1 <p>move Code Generator Menu to Generate menu</p></li>
@@ -32,7 +35,7 @@
   </change-notes>
 
   <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-  <idea-version since-build="163.0"/>
+  <idea-version since-build="201.0"/>
 
   <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
        on how to target different products -->
@@ -63,4 +66,4 @@
     </component>
   </application-components>
 
-</idea-plugin>
+</idea-plugin>

resources/template/getters-and-setters.xml

@@ -2,7 +2,7 @@
 <codeTemplateList>
     <templates>
         <templates version="1.3">
-            <id>1f752c8b-3601-42d1-a9e2-43c2e714f822</id>
+            <id>58a3b5d1-3621-43b8-9c17-e725ceaedbdd</id>
             <name>Getter and Setter</name>
             <fileNamePattern>.*\.java$</fileNamePattern>
             <type>body</type>
@@ -26,6 +26,7 @@ return $field.name;
 #if($field.modifierStatic)
 static ##
 #end
+#set($paramName = $helper.getParamName($field.element, $project))
 void ${setter}($field.type $paramName) {
 #if ($field.name == $paramName)
     #if (!$field.modifierStatic)
@@ -79,6 +80,7 @@ $availableMembers.add($field)
             <whenDuplicatesOption>ASK</whenDuplicatesOption>
             <jumpToMethod>true</jumpToMethod>
             <classNameVm>$class0.name</classNameVm>
+            <alwaysPromptForPackage>false</alwaysPromptForPackage>
         </templates>
     </templates>
 </codeTemplateList>

src/me/lotabout/codegenerator/CodeGeneratorSettings.java

@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Optional;
 
-@State(name = "CodeGeneratorSettings", storages = {@Storage(id = "app-default", file = "$APP_CONFIG$/CodeGenerator-settings.xml")})
+@State(name = "CodeGeneratorSettings", storages = {@Storage("$APP_CONFIG$/CodeGenerator-settings.xml")})
 public class CodeGeneratorSettings implements PersistentStateComponent<CodeGeneratorSettings> {
 
     private static final Logger LOGGER = Logger.getInstance(CodeGeneratorSettings.class);

src/me/lotabout/codegenerator/config/CodeTemplate.java

@@ -1,8 +1,8 @@
 package me.lotabout.codegenerator.config;
 
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.util.xmlb.annotations.AbstractCollection;
 
+import com.intellij.util.xmlb.annotations.AbstractCollection;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.jetbrains.java.generate.config.DuplicationPolicy;
@@ -122,4 +122,6 @@ public boolean isValid() {
                 .append(alwaysPromptForPackage)
                 .toHashCode();
     }
+
+
 }

src/me/lotabout/codegenerator/ui/CodeGeneratorConfig.form

@@ -64,9 +64,8 @@
                     <properties>
                       <borderPainted value="false"/>
                       <contentAreaFilled value="true"/>
-                      <icon value="toolbarDecorator/add.png"/>
-                      <opaque value="true"/>
-                      <text value=""/>
+                      <opaque value="false"/>
+                      <text value="Add"/>
                       <toolTipText value="Add a new template"/>
                       <visible value="true"/>
                     </properties>
@@ -77,9 +76,9 @@
                       <borderPainted value="false"/>
                       <enabled value="false"/>
                       <hideActionText value="false"/>
-                      <icon value="toolbarDecorator/remove.png"/>
                       <opaque value="false"/>
-                      <text value=""/>
+                      <text value="Remove"/>
+                      <toolTipText value="Remove template"/>
                     </properties>
                   </component>
                   <hspacer id="9474e">

src/me/lotabout/codegenerator/ui/CodeGeneratorConfig.java

@@ -5,11 +5,10 @@
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.ui.Messages;
+import java.util.concurrent.CompletableFuture;
 import me.lotabout.codegenerator.CodeGeneratorSettings;
 import me.lotabout.codegenerator.config.CodeTemplate;
 import me.lotabout.codegenerator.config.CodeTemplateList;
-import org.jetbrains.concurrency.AsyncPromise;
-import org.jetbrains.concurrency.Promise;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -108,7 +107,7 @@ public CodeGeneratorConfig(CodeGeneratorSettings settings) {
         });
 
         importButton.addActionListener(e -> {
-            readFromFile().done(xml -> {
+            readFromFile().thenAccept(xml -> {
                 try {
                     List<CodeTemplate> templates = CodeTemplateList.fromXML(xml);
                     List<CodeTemplate> currentTemplates = getTabTemplates();
@@ -160,13 +159,11 @@ private void saveToFile(String content) {
         });
     }
 
-    private Promise<String> readFromFile() {
+    private CompletableFuture<String> readFromFile() {
         final FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFileDescriptor("xml");
         descriptor.setTitle("Choose File to Import");
-        final AsyncPromise<String> result = new AsyncPromise<>();
-        FileChooser.chooseFile(descriptor, null, mainPane, null, virtualFile -> {
-            result.setResult(FileDocumentManager.getInstance().getDocument(virtualFile).getText());
-        });
+        final CompletableFuture<String> result = new CompletableFuture<>();
+        FileChooser.chooseFile(descriptor, null, mainPane, null, virtualFile -> result.complete(FileDocumentManager.getInstance().getDocument(virtualFile).getText()));
         return result;
     }
 

src/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java

@@ -43,6 +43,10 @@ public String getHelpTopic() {
     }
 
     @Override public boolean isModified() {
+        if (config == null) {
+            return false;
+        }
+
         List<CodeTemplate> templates = config.getTabTemplates();
         if (settings.getCodeTemplates().size() != templates.size()) {
             return true;

src/me/lotabout/codegenerator/util/ClassEntry.java

@@ -1,9 +1,8 @@
 package me.lotabout.codegenerator.util;
 
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiClassOwner;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiJavaFile;
+import com.intellij.psi.*;
+import java.util.Arrays;
+import java.util.stream.Collectors;
 import org.jetbrains.java.generate.element.ClassElement;
 
 import java.util.ArrayList;
@@ -19,8 +18,6 @@ public class ClassEntry {
     private List<FieldEntry> allFields = new ArrayList<>();
     private List<MethodEntry> methods = new ArrayList<>();
     private List<MethodEntry> allMethods = new ArrayList<>();
-    private List<ClassEntry> innerClasses = new ArrayList<>();
-    private List<ClassEntry> allInnerClasses = new ArrayList<>();
     private List<MemberEntry> members = new ArrayList<>();
     private List<MemberEntry> allMembers = new ArrayList<>();
     private List<String> typeParamList;
@@ -36,8 +33,6 @@ public static ClassEntry of(PsiClass clazz, ClassElement element) {
         entry.addAllFields(GenerationUtil.getAllFields(clazz));
         entry.addMethod(GenerationUtil.getMethods(clazz));
         entry.addAllMethods(GenerationUtil.getAllMethods(clazz));
-        entry.setInnerClasses(GenerationUtil.getInnerClasses(clazz));
-        entry.setAllInnerClasses(GenerationUtil.getAllInnerClasses(clazz));
         entry.setTypeParamList(GenerationUtil.getClassTypeParameters(clazz));
         return entry;
     }
@@ -74,10 +69,6 @@ public void setImportList(List<String> importList) {
         this.importList = importList;
     }
 
-    public List<FieldEntry> getFields() {
-        return fields;
-    }
-
     public void addFields(List<FieldEntry> fields) {
         this.fields.addAll(fields);
         this.members.addAll(fields);
@@ -111,7 +102,9 @@ public void addAllMethods(List<MethodEntry> allMethods) {
     }
 
     public List<ClassEntry> getInnerClasses() {
-        return innerClasses;
+        return Arrays.stream(raw.getInnerClasses())
+                .map(EntryFactory::of)
+                .collect(Collectors.toList());
     }
 
     public List<MemberEntry> getMembers() {
@@ -122,16 +115,11 @@ public List<MemberEntry> getAllMembers() {
         return allMembers;
     }
 
-    public void setInnerClasses(List<ClassEntry> innerClasses) {
-        this.innerClasses = innerClasses;
-    }
-
     public List<ClassEntry> getAllInnerClasses() {
-        return allInnerClasses;
-    }
-
-    public void setAllInnerClasses(List<ClassEntry> allInnerClasses) {
-        this.allInnerClasses = allInnerClasses;
+        // lazily turn all inner classes into class entry
+        return Arrays.stream(raw.getAllInnerClasses())
+                .map(EntryFactory::of)
+                .collect(Collectors.toList());
     }
 
     public List<String> getTypeParamList() {
@@ -249,11 +237,11 @@ public String toString() {
                 ", allFields=" + allFields +
                 ", methods=" + methods +
                 ", allMethods=" + allMethods +
-                ", innerClasses=" + innerClasses +
-                ", allInnerClasses=" + allInnerClasses +
                 ", members=" + members +
                 ", allMembers=" + allMembers +
                 ", typeParamList=" + typeParamList +
                 '}';
     }
+
+
 }

src/me/lotabout/codegenerator/util/GenerationUtil.java

@@ -199,17 +199,6 @@ static List<MethodEntry> getAllMethods(PsiClass clazz) {
                 .collect(Collectors.toList());
     }
 
-    static List<ClassEntry> getInnerClasses(PsiClass clazz) {
-        return Arrays.stream(clazz.getInnerClasses())
-                .map(EntryFactory::of)
-                .collect(Collectors.toList());
-    }
-    static List<ClassEntry> getAllInnerClasses(PsiClass clazz) {
-        return Arrays.stream(clazz.getAllInnerClasses())
-                .map(EntryFactory::of)
-                .collect(Collectors.toList());
-    }
-
     static List<String> getImportList(PsiJavaFile javaFile) {
         PsiImportList importList = javaFile.getImportList();
         if (importList == null) {